Parcourir la source

设备启动时若未注册则启动二维码界面

weizhengliang il y a 3 ans
Parent
commit
acf73ac8b0

+ 11 - 2
callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -174,7 +174,11 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         timeThread.start()
 
         //启动主fragment
-        switchToMainFragment()
+        //switchToMainFragment()
+
+        //先显示二维码界面,若设备已注册并启用了再切换到主界面
+        hideRightMenu(false)
+        switchToFragment(R.id.callingbed_main_frame, QrCodeFragment(), qrCodeFragment)
 
         //打开网络调试
         AppTool.Time.delay(120000) {
@@ -384,6 +388,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         }
         if (Constant.DEVICE_STATUS == 0) {
             showMessage("设备未启用")
+        } else if (Constant.DEVICE_STATUS == 1) {
+            //启动主fragment
+            switchToMainFragment()
         }
 
         //加载分机所绑定紧急按钮设备信息
@@ -1213,7 +1220,9 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         if (backTimeout >= Constant.CALL_TIMEOUT) {
             //费用、二维码界面超时返回主界面
             if (costFragment.equals(curFragment) || qrCodeFragment.equals(curFragment)) {
-                switchToMainFragment()
+                if (Constant.DEVICE_STATUS == 1) {
+                    switchToMainFragment()
+                }
             }
             //超时隐藏右侧菜单栏
             if (isVisible(right_menu)) {