|
@@ -69,10 +69,10 @@ public class MainActivity extends BaseActivity {
|
|
|
private RelativeLayout mainActivity_bg;
|
|
|
private ImageView iv_internetStatus;//internet的连接状态
|
|
|
private ImageView iv_networkType;//网络类型
|
|
|
- private static ImageView hardwareIcon_IDCard;//硬件连接状态-身份证阅读器
|
|
|
- private static ImageView hardwareIcon_QRCode;//硬件连接状态-二维码读头
|
|
|
- private static ImageView hardwareIcon_Passport;//硬件连接状态-护照机
|
|
|
- private static ImageView hardwareIcon_IcCard;//硬件连接状态-IC卡
|
|
|
+ private ImageView hardwareIcon_IDCard;//硬件连接状态-身份证阅读器
|
|
|
+ private ImageView hardwareIcon_QRCode;//硬件连接状态-二维码读头
|
|
|
+ private ImageView hardwareIcon_Passport;//硬件连接状态-护照机
|
|
|
+ private ImageView hardwareIcon_IcCard;//硬件连接状态-IC卡
|
|
|
|
|
|
private IDeviceUI iDeviceUI;
|
|
|
private boolean networkStatus = true;//网络状态
|
|
@@ -294,7 +294,7 @@ public class MainActivity extends BaseActivity {
|
|
|
/**
|
|
|
* 硬件初始化结果展示在底部文字显示
|
|
|
*/
|
|
|
- public static Runnable startHardwareRunnable = new Runnable() {
|
|
|
+ Runnable startHardwareRunnable = new Runnable() {
|
|
|
@Override
|
|
|
public void run() {
|
|
|
if (DeviceInitManager.getInstance().totalOpenHardwareNum == DeviceInitManager.getInstance().getAlreadyInitHardwareNum()){
|
|
@@ -340,7 +340,10 @@ public class MainActivity extends BaseActivity {
|
|
|
private DeviceInitManager.DeviceInitCallback deviceInitCallback = new DeviceInitManager.DeviceInitCallback() {
|
|
|
@Override
|
|
|
public void updateView(int code, String msg) {
|
|
|
-
|
|
|
+ int alreadyInitHardwareNumber = DeviceInitManager.getInstance().getAlreadyInitHardwareNum();
|
|
|
+ AppHandler.getHandler().postDelayed(startHardwareRunnable,alreadyInitHardwareNumber * 2000);
|
|
|
+ alreadyInitHardwareNumber++;
|
|
|
+ DeviceInitManager.getInstance().setAlreadyInitHardwareNum(alreadyInitHardwareNumber);
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -406,6 +409,7 @@ public class MainActivity extends BaseActivity {
|
|
|
HttpRequest.getInstance().setHttpResponseCallback(httpResponseCallback);
|
|
|
PassportController.getInstance().setPassportCallback(passportCallback);
|
|
|
SerialController.getInstance().setSerialPortCallback(serialPortCallback);
|
|
|
+ DeviceInitManager.getInstance().setDeviceInitCallback(deviceInitCallback);
|
|
|
//点击按钮是否显示
|
|
|
ClickButtonFloatView.getInstance().setShowView(true);
|
|
|
//请求在线配置接口
|
|
@@ -417,8 +421,6 @@ public class MainActivity extends BaseActivity {
|
|
|
|
|
|
LiJiangIDCardController.isMainActivityDestroyed = false;
|
|
|
|
|
|
- DeviceInitManager.getInstance().setDeviceInitCallback(deviceInitCallback);
|
|
|
-
|
|
|
initLog();
|
|
|
}
|
|
|
|