Kaynağa Gözat

7寸分机修改为设备未注册时显示二维码界面,已注册则显示主界面

weizhengliang 2 yıl önce
ebeveyn
işleme
f12e9079db

+ 5 - 1
android_bed/src/main/h7_3128/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -208,7 +208,10 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
         updateNetState()
 
         //启动主fragment
-        switchFragment(R.id.callingbed2_main_frame, MainFragment(), mainFragment)
+        //switchFragment(R.id.callingbed2_main_frame, MainFragment(), mainFragment)
+
+        //先显示二维码界面,若设备已注册并启用了再切换到主界面
+        switchFragment(R.id.callingbed2_main_frame, QrCodeFragment(), qrFragment)
 
         //禁止下拉状态栏
         Utils.setStatusBarDisable(activity, Utils.STATUS_BAR_DISABLE_EXPAND)
@@ -692,6 +695,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, Callingbed2M
             showMessage(R.string.device_disable)
             disableFuns()
         } else {
+            switchFragment(R.id.callingbed2_main_frame, MainFragment(), mainFragment)
             enableFuns()
         }