邦德威修改读取序列号

app/src/main/java/com/zy/bvvm/ui/launcher/guide/GuideActivity.java

@@ -18,6 +18,7 @@ import com.zy.bvvm.ui.home.FactorAdminActivity;
 import com.zy.bvvm.ui.home.FactoryOperatorActivity;
 import com.zy.bvvm.ui.home.HomeActivity;
 import com.zy.bvvm.ui.vaccination.ReadingActivity;
+import com.zy.bvvm.ui.vaccination.ReadingActivity02;
 
 import me.jessyan.autosize.utils.ScreenUtils;
 
@@ -115,7 +116,7 @@ public class GuideActivity extends MyActivity {
     private void gohome() {
         switch (guideRoleId) {   //根据不同角色 跳转进入不同的页面 只有厂家管理员不需要判断nfc
             case 2: //医生
-                startActivityFinish(ReadingActivity.class);
+                startActivityFinish(ReadingActivity02.class);
                 SPUtils.put("GUIDE_DOCTOR", 1);
                 break;
             case 3: //医药企业管理员

app/src/main/java/com/zy/bvvm/ui/login/LoginActivity.java

@@ -310,7 +310,7 @@ public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginC
                         startActivityFinish(FactoryOperatorActivity.class);
                         break;
                     default:
-                        startActivityFinish(ReadingActivity.class);
+                        startActivityFinish(ReadingActivity02.class);
                         break;
                 }
             }
@@ -474,8 +474,8 @@ public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginC
                     default:
                         int guide_doctor = (int) SPUtils.get("GUIDE_DOCTOR", 0);
                         if (guide_doctor == 1) {        //判断是否首次登陆
-                        startActivityFinish(HomeActivity.class);
-//                            startActivityFinish(ReadingActivity02.class);
+//                        startActivityFinish(HomeActivity.class);
+                            startActivityFinish(ReadingActivity02.class);
                         } else {
                             goToGuide(roleId);
                         }
@@ -514,8 +514,8 @@ public class LoginActivity extends MvpActivity<LoginPresenter> implements LoginC
                 default:
                     int guide_doctor = (int) SPUtils.get("GUIDE_DOCTOR", 0);
                     if (guide_doctor == 1) {        //判断是否首次登陆
-                        startActivityFinish(HomeActivity.class);
-//                        startActivityFinish(ReadingActivity02.class);
+//                        startActivityFinish(HomeActivity.class);
+                        startActivityFinish(ReadingActivity02.class);
                     } else {
                         goToGuide(roleId);
                     }

app/src/main/java/com/zy/bvvm/ui/login/LoginPasswordActivity.java

@@ -50,6 +50,7 @@ import com.zy.bvvm.ui.launcher.guide.GuideActivity;
 import com.zy.bvvm.ui.login.login.LoginContract;
 import com.zy.bvvm.ui.login.login.LoginPresenter;
 import com.zy.bvvm.ui.vaccination.ReadingActivity;
+import com.zy.bvvm.ui.vaccination.ReadingActivity02;
 
 import java.util.HashMap;
 import java.util.List;
@@ -292,7 +293,7 @@ public class LoginPasswordActivity extends MvpActivity<LoginPresenter> implement
                         startActivityFinish(FactoryOperatorActivity.class);
                         break;
                     default:
-                        startActivityFinish(ReadingActivity.class);
+                        startActivityFinish(ReadingActivity02.class);
                         break;
                 }
             }
@@ -412,7 +413,7 @@ public class LoginPasswordActivity extends MvpActivity<LoginPresenter> implement
             default:
                 int guide_doctor = (int) SPUtils.get("GUIDE_DOCTOR", 0);
                 if (guide_doctor == 1) {
-                    startActivityFinish(ReadingActivity.class);
+                    startActivityFinish(ReadingActivity02.class);
                 } else {
                     goToGuide(roleId);
                 }

app/src/main/java/com/zy/bvvm/ui/login/newPassword/NewPassword.java

@@ -18,6 +18,7 @@ import com.zy.bvvm.ui.home.FactoryOperatorActivity;
 import com.zy.bvvm.ui.home.HomeActivity;
 import com.zy.bvvm.ui.launcher.guide.GuideActivity;
 import com.zy.bvvm.ui.vaccination.ReadingActivity;
+import com.zy.bvvm.ui.vaccination.ReadingActivity02;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
@@ -140,7 +141,7 @@ public class NewPassword extends MvpActivity<NewPasswordPresenter> implements Ne
             default:
                 int guide_doctor = (int) SPUtils.get("GUIDE_DOCTOR", 0);
                 if (guide_doctor == 1) {        //判断是否首次登陆
-                    startActivityFinish(ReadingActivity.class);
+                    startActivityFinish(ReadingActivity02.class);
                 } else {
                     goToGuide(roleId);
                 }

app/src/main/java/com/zy/bvvm/ui/vaccination/FirstFragment.java

@@ -208,7 +208,7 @@ public class FirstFragment extends MvpLazyFragment<CategoryTimesPresenter> imple
                             if (SPUtils.get("switch_state", "close").equals("open")) {
                                 startActivity(QrCodeActivity.class);        //扫描页面
                             } else {
-                                startActivity(ReadingActivity.class); //NFC页面
+                                startActivity(ReadingActivity02.class); //NFC页面
                             }
                         } else {
                             toast("获取权限成功，部分权限未正常授予");

app/src/main/java/com/zy/bvvm/ui/vaccination/InoculationRegistActivity.java

@@ -79,7 +79,7 @@ public class InoculationRegistActivity extends MvpActivity<IctregisterPresenter>
                 inoculatorArr.put(result);
                 SPUtils.put("INOCULATOR_LIST", inoculatorArr.toString());
 //                toast("注册成功,请进行扫描");
-                startActivityFinish(ReadingActivity.class);
+                startActivityFinish(ReadingActivity02.class);
             } catch (Exception e) {
                 e.printStackTrace();
             }

app/src/main/java/com/zy/bvvm/ui/vaccination/NoNetReportActivity.java

@@ -262,7 +262,7 @@ public class NoNetReportActivity extends MyActivity implements MyClickListener.M
                     finish();
                 } else {
                     //startActivityFinish(HomeActivity.class);
-                    ActivityStackManager.getInstance().finishAllActivities(ReadingActivity.class);
+                    ActivityStackManager.getInstance().finishAllActivities(ReadingActivity02.class);
                 }
 
                 break;

app/src/main/java/com/zy/bvvm/ui/vaccination/QrCodeActivity.java

@@ -95,7 +95,7 @@ public class QrCodeActivity extends MyActivity implements QRCodeView.Delegate {
                     return;
                 }
                 SPUtils.remove("INOCULATOR_LIST");
-                startActivityFinish(ReadingActivity.class);
+                startActivityFinish(ReadingActivity02.class);
                 break;
             case R.id.img_flashlight:
                 if (flashlightIsOpen) {
@@ -128,7 +128,7 @@ public class QrCodeActivity extends MyActivity implements QRCodeView.Delegate {
                 inoculatorArr.put(result);
                 //  Log.e("onScanQRCodeSuccess",""+inoculatorArr.toString());
                 SPUtils.put("INOCULATOR_LIST", inoculatorArr.toString());
-                startActivityFinish(ReadingActivity.class);
+                startActivityFinish(ReadingActivity02.class);
 
             } else {
                 toast("未能识别二维码");