optimize

app/src/main/java/com/hanghui/senic/activity/MainActivity.java

@@ -188,19 +188,19 @@ public class MainActivity extends BaseActivity {
         @Override
         public void updateView(int code, String msg) {
             switch (code){
-                case Constants.Code_USBroadcastCallback_USBIDCardSucceed://身份证USB连接成功
+                case Constants.Code_USBroadcastCallback_IDCardSucceed://身份证USB连接成功
                     hardwareIcon_IDCard.setImageResource(R.mipmap.hardware_icon_idcard_succeed);
                     break;
-                case Constants.Code_USBroadcastCallback_USBIDCardFail://身份证USB连接断开
+                case Constants.Code_USBroadcastCallback_IDCardFail://身份证USB连接断开
                     hardwareIcon_IDCard.setImageResource(R.mipmap.hardware_icon_idcard_fail);
                     break;
-                case Constants.Code_USBroadcastCallback_USBQRCodeSucceed://二维码USB连接成功
+                case Constants.Code_USBroadcastCallback_QRCodeSucceed://二维码USB连接成功
                     hardwareIcon_QRCode.setImageResource(R.mipmap.hardware_icon_qrcode_succeed);
                     break;
-                case Constants.Code_USBroadcastCallback_USBQRCodeFail://二维码USB连接断开
+                case Constants.Code_USBroadcastCallback_QRCodeFail://二维码USB连接断开
                     hardwareIcon_QRCode.setImageResource(R.mipmap.hardware_icon_qrcode_fail);
                     break;
-                case Constants.Code_USBroadcastCallback_USBAllInOneIDCardSucceed://东信多合一USB连接成功
+                case Constants.Code_USBroadcastCallback_DXAllInOneIDCardSucceed://东信多合一USB连接成功
                     if (ConfigManager.getAuthenticationBeanListBean().isUseIdcard() && ConfigManager.getAuthenticationBeanListBean().getIdCardReaderBrand() == 9){
                         hardwareIcon_IDCard.setImageResource(R.mipmap.hardware_icon_idcard_succeed);
                     }
@@ -211,7 +211,7 @@ public class MainActivity extends BaseActivity {
                         hardwareIcon_IcCard.setImageResource(R.mipmap.hardware_icon_iccard_succeed);
                     }
                     break;
-                case Constants.Code_USBroadcastCallback_USBAllInOneIDCardFail://东信多合一USB连接断开
+                case Constants.Code_USBroadcastCallback_DXAllInOneIDCardFail://东信多合一USB连接断开
                     if (ConfigManager.getAuthenticationBeanListBean().isUseIdcard() && ConfigManager.getAuthenticationBeanListBean().getIdCardReaderBrand() == 9){
                         hardwareIcon_IDCard.setImageResource(R.mipmap.hardware_icon_idcard_fail);
                     }

app/src/main/java/com/hanghui/senic/common/Constants.java

@@ -49,12 +49,12 @@ public class Constants {
     public static final int Code_HttpResponseCallback_ShowPassportIcon = 8;////护照机开启，显示顶部护照机图标
     public static final int Code_HttpResponseCallback_ShowICCardIcon = 9;////IC卡开启，显示顶部IC卡开启图标
 
-    public static final int Code_USBroadcastCallback_USBIDCardSucceed = 0;//身份证USB连接成功
-    public static final int Code_USBroadcastCallback_USBIDCardFail = 1;//身份证USB连接断开
-    public static final int Code_USBroadcastCallback_USBQRCodeSucceed = 2;//二维码USB连接成功
-    public static final int Code_USBroadcastCallback_USBQRCodeFail = 3;//二维码USB连接断开
-    public static final int Code_USBroadcastCallback_USBAllInOneIDCardSucceed = 4;//东信多合一USB连接成功
-    public static final int Code_USBroadcastCallback_USBAllInOneIDCardFail = 5;//东信多合一USB连接断开
+    public static final int Code_USBroadcastCallback_IDCardSucceed = 0;//身份证USB连接成功
+    public static final int Code_USBroadcastCallback_IDCardFail = 1;//身份证USB连接断开
+    public static final int Code_USBroadcastCallback_QRCodeSucceed = 2;//二维码USB连接成功
+    public static final int Code_USBroadcastCallback_QRCodeFail = 3;//二维码USB连接断开
+    public static final int Code_USBroadcastCallback_DXAllInOneIDCardSucceed = 4;//东信多合一USB连接成功
+    public static final int Code_USBroadcastCallback_DXAllInOneIDCardFail = 5;//东信多合一USB连接断开
     public static final int Code_internetAvailable = 0;//internet正常
     public static final int Code_internetUnAvailable = 1;//internet异常
 

app/src/main/java/com/hanghui/senic/receiver/USBroadcastReceiver.java

@@ -36,12 +36,12 @@ public class USBroadcastReceiver extends BroadcastReceiver {
                     QRCodeController.getInstance().init();
                 }
                 if (usBroadcastCallback != null){
-                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_USBQRCodeSucceed,"二维码USB连接成功");
+                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_QRCodeSucceed,"二维码USB连接成功");
                 }
             }else if (ConfigManager.isDeviceQRCode(usbDevice) == 1){//东信多合一插入特殊处理
                 IDCardControllerManager.init(9);
                 if (usBroadcastCallback != null){
-                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_USBAllInOneIDCardSucceed,"东信多合一身份证USB连接成功");
+                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_DXAllInOneIDCardSucceed,"东信多合一身份证USB连接成功");
                 }
             }else {
                 // 丽江阅读器特殊处理，调用refreshState()刷新状态之后再调用initIDCard()才有用
@@ -62,7 +62,7 @@ public class USBroadcastReceiver extends BroadcastReceiver {
                     IDCardControllerManager.init(9);
                 }
                 if (usBroadcastCallback != null){
-                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_USBIDCardSucceed,"身份证USB连接成功");
+                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_IDCardSucceed,"身份证USB连接成功");
                 }
             }
 
@@ -78,19 +78,19 @@ public class USBroadcastReceiver extends BroadcastReceiver {
                     QRCodeController.getInstance().destroy();
                 }
                 if (usBroadcastCallback != null){
-                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_USBQRCodeFail,"二维码USB连接断开");
+                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_QRCodeFail,"二维码USB连接断开");
                 }
 
             }else if (ConfigManager.isDeviceQRCode(usbDevice) == 1){//东信多合一拔出特殊处理
                 IDCardControllerManager.destroy();
                 if (usBroadcastCallback != null){
-                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_USBAllInOneIDCardFail,"东信多合一身份证USB连接断开");
+                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_DXAllInOneIDCardFail,"东信多合一身份证USB连接断开");
                 }
             }else {
                 AppLogUtils.e(true, "USB广播信号", "USB拔出广播信号已接收，监测到该类型为身份证阅读器USB");
                 IDCardControllerManager.destroy();
                 if (usBroadcastCallback != null){
-                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_USBIDCardFail,"身份证USB连接断开");
+                    usBroadcastCallback.updateView(Constants.Code_USBroadcastCallback_IDCardFail,"身份证USB连接断开");
                 }
             }
         }