1.修复切换模块时没有关闭串口，导致上电失败的bug。

.gitignore

+# Default ignored files
+
+!/.idea/

app/src/main/java/com/phlx/anchorcollect/rfid/ModuleManager.java

@@ -12,6 +12,7 @@ import java.util.List;
 
 import me.goldze.mvvmhabit.utils.SPUtils;
 import me.goldze.mvvmhabit.utils.StringUtils;
+import me.goldze.mvvmhabit.utils.ToastUtils;
 
 public class ModuleManager {
 
@@ -69,6 +70,7 @@ public class ModuleManager {
             }
             powerOnStatus = openCom(powerOnType);
         }
+        Log.e("rfid","serialPort:"+serialPort+"|"+powerOnStatus);
         return powerOnStatus;
     }
 
@@ -80,7 +82,6 @@ public class ModuleManager {
         int moduleType = SPUtils.getInstance().getInt(Configs.SP_MODULE_TYPE, -1);
         if (moduleType == -1) {//没有存就便利所有
 
-
             rf = new Rfid_Value();
             App.getInstance().getLinkage().setRFModuleType(1);//R2000 0,MagicRF 1,RM70xx 2, R2000plus 3
             App.getInstance().getLinkage().getVersion(rf);
@@ -89,6 +90,8 @@ public class ModuleManager {
                 SPUtils.getInstance().put(Configs.SP_POWER_ON_TYPE, powerOnType);
                 return true;
             }
+            Log.e("rfid","getVersion:MagicRF｜"+rf.value);
+
             App.getInstance().getLinkage().setRFModuleType(0);//R2000 0,MagicRF 1,RM70xx 2, R2000plus 3
             App.getInstance().getLinkage().getVersion(rf);
             if (rf.value == 0) {
@@ -96,6 +99,7 @@ public class ModuleManager {
                 SPUtils.getInstance().put(Configs.SP_POWER_ON_TYPE, powerOnType);
                 return true;
             }
+            Log.e("rfid","getVersion:R2000｜"+rf.value);
 
             rf = new Rfid_Value();
             App.getInstance().getLinkage().setRFModuleType(3);//R2000 0,MagicRF 1,RM70xx 2, R2000plus 3
@@ -105,6 +109,9 @@ public class ModuleManager {
                 SPUtils.getInstance().put(Configs.SP_POWER_ON_TYPE, powerOnType);
                 return true;
             }
+            Log.e("rfid","getVersion:R2000plus｜"+rf.value);
+            //失败后要关闭串口
+            App.getInstance().getLinkage().close_serial();
 
         } else {
             App.getInstance().getLinkage().setRFModuleType(moduleType);//R2000 0,MagicRF 1,RM70xx 2, R2000plus 3
@@ -116,9 +123,9 @@ public class ModuleManager {
 
 
     public static void destroyLibSO() {
-        App.getInstance().getLinkage().deinitRFID();
         App.getInstance().getLinkage().close_serial();
         powerOff();
+        App.getInstance().getLinkage().deinitRFID();
     }
 
 

app/src/main/java/com/phlx/anchorcollect/ui/main/MainActivity.java

@@ -149,7 +149,7 @@ public class MainActivity extends BaseActivity<ActivityMainBinding, MainVM> {
 
         App.getInstance().getLinkage().setRFConnectMode(0);
         if (!ModuleManager.initPower()) {
-            new MaterialDialog.Builder(this).title("系统提示").content("串口打开失败，无法工作，请检查设备").cancelable(false).canceledOnTouchOutside(false).positiveText("退出").onAny(new MaterialDialog.SingleButtonCallback() {
+            new MaterialDialog.Builder(this).title("系统提示").content("上电失败，无法工作，请检查设备").cancelable(false).canceledOnTouchOutside(false).positiveText("退出").onAny(new MaterialDialog.SingleButtonCallback() {
                 @Override
                 public void onClick(@NonNull MaterialDialog dialog, @NonNull DialogAction which) {
                     if (which == DialogAction.POSITIVE) {