优化初始化数据显示

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/activity/CallingbedActivity.kt

@@ -160,8 +160,6 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
         //添加webrtc登录回调
         SocketManager.getInstance().addUserStateCallback(this)
 
-        initDevice()
-
         //启动时间线程
         timeThread = TimeThread()
         timeThread.start()
@@ -268,6 +266,7 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
             Constant.DEVICE_STATUS = deviceInfo.status
         }
 
+        initialized = true
         view_title_layout_tv_hospital_name.text = deviceInfo.hospitalName + deviceInfo.partName
 
         if (deviceInfo.customerId != null) {
@@ -277,10 +276,8 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
 
         if (TextUtils.isEmpty(Constant.SIP_ID)) {
             showMessage("SIP ID为空")
-            return
         } else if (Constant.DEVICE_STATUS == 0) {
             showMessage("设备未启用")
-            return
         }
 
         //加载分机所绑定紧急按钮设备信息
@@ -288,7 +285,6 @@ class CallingbedActivity :BaseActivity<CallingbedActivityPresenter, CallingbedMa
             presenter.getEmergencyDeviceInfo(deviceInfo.frameId)
         }
 
-        initialized = true
         presenter.loadPartSettings(Constant.PART_ID)
 
         connectRtcWebSocket()

callingbed/src/main/java/com/wdkl/app/ncs/callingbed/fragment/MainFragment.kt

@@ -39,11 +39,6 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     }
 
     override fun init() {
-        if (!TextUtils.isEmpty(Constant.BED_NAME)) {
-            //床位名称
-            tv_bed_name.text = Constant.BED_NAME
-        }
-
         updateInfo()
     }
 
@@ -69,8 +64,6 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
         //隐藏空页面并展示入住信息
         ll_empty.visibility = View.GONE
         ll_custom_view.visibility = View.VISIBLE
-        //床位名称
-        tv_bed_name.text = Constant.BED_NAME
 
         //显示入住信息
         tv_custom_name.text = customInfo.named
@@ -126,6 +119,14 @@ class MainFragment: BaseFragment<MainFragmentPresenter, MainViewLayoutBinding>()
     }
 
     fun updateInfo() {
+        if (Constant.DEVICE_STATUS == 0) {
+            tv_bed_name.text = "设备未启用"
+            tv_bed_name.setTextColor(resources.getColor(R.color.red_color))
+        } else {
+            tv_bed_name.text = Constant.BED_NAME
+            tv_bed_name.setTextColor(resources.getColor(R.color.main_color))
+        }
+
         if (Constant.CUSTOM_ID != -1) {
             ll_empty.visibility = View.GONE
             presenter.loadCustomInfo(Constant.CUSTOM_ID)