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