修改设备数据异常问题

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 7
+    ext.app_version_code = 8
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.0.7"
+    ext.app_version = "1.0.8"
 
     /**
      * 项目依赖库

home/src/main/code/com/wdkl/ncs/android/component/home/activity/HomeActivity.kt

@@ -282,41 +282,45 @@ class HomeActivity : BaseActivity<HomeActivityPresenter, ActivityHomeBinding>(),
      */
     override fun setDeviceDo(data: DeviceWatchInfoVO) {
         Log.i(TAG, "收到返回的设备信息 ")
-        Constants.partId = data.partId
-        Constants.deviceId = data.id
-        Constants.sipId = data.sipId
-        Constants.ethIp = data.ethIp
-        Constants.sipIp = data.sipIp
-        Constants.sipId = data.sipId
-        Constants.sipPassword = data.sipPassword
-        Constants.userName = data.memberName
-        Constants.userRoleName = data.roleName
-
-        if (Constants.deviceId==-1 || TextUtils.isEmpty(Constants.sipId)) {
-            showMessage("初始化数据不全，请联系管理员")
-            tv_status.text = "初始化数据不全，请联系管理员"
-            return
-        } else if (TextUtils.isEmpty(Constants.tcpServer)) {
-            showMessage("初始化tcp连接数据为null")
-            tv_status.text = "初始化tcp连接数据为null"
-            return
-        } else if (data.status != null && data.status == 0) {
-            showMessage("设备未启用")
-            tv_status.text = "设备未启用"
-            return
-        }
+        try {
+            Constants.partId = data.partId
+            Constants.deviceId = data.id
+            Constants.sipId = data.sipId
+            Constants.ethIp = data.ethIp
+            Constants.sipIp = data.sipIp
+            Constants.sipId = data.sipId
+            Constants.sipPassword = data.sipPassword
+            Constants.userName = data.memberName
+            Constants.userRoleName = data.roleName
+
+            if (Constants.deviceId == -1 || TextUtils.isEmpty(Constants.sipId)) {
+                showMessage("初始化数据不全，请联系管理员")
+                tv_status.text = "初始化数据不全，请联系管理员"
+                return
+            } else if (TextUtils.isEmpty(Constants.tcpServer)) {
+                showMessage("初始化tcp连接数据为null")
+                tv_status.text = "初始化tcp连接数据为null"
+                return
+            } else if (data.status != null && data.status == 0) {
+                showMessage("设备未启用")
+                tv_status.text = "设备未启用"
+                return
+            }
 
-        inited = true
-        activity_register_layout.visibility = View.GONE
-        watch_activity_home_linyout.visibility = View.VISIBLE
+            inited = true
+            activity_register_layout.visibility = View.GONE
+            watch_activity_home_linyout.visibility = View.VISIBLE
 
 
-        initSDK()
-        presenter.getDeviceSettingData(""+Constants.partId)
+            initSDK()
+            presenter.getDeviceSettingData("" + Constants.partId)
 
-        tv_part_name.setText(data.hospitalName + data.partName)
+            tv_part_name.setText(data.hospitalName + data.partName)
 
-        showMessage("初始化完成")
+            showMessage("初始化完成")
+        } catch (e: java.lang.Exception) {
+            showMessage("设备数据异常：" + e.message)
+        }
     }
 
     private fun initSDK() {

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constants.kt

@@ -7,7 +7,7 @@ class Constants {
         var mac: String =""//设备Mac
         var partId : Int =-1//科室ID
         var frameId: String =""//医院结构ID
-        var ethIp: String ="" //当前设备的IP
+        var ethIp: String? ="" //当前设备的IP
         var deviceId: Int =-1//当前设备的ID
         var sipIp: String? =""//sipip
         var sipId: String? =""//sipid