增加云派新的主机兼容

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

@@ -11,6 +11,7 @@ class Constants {
         var part_id: Int = -1//科室ID
         var mac: String? = ""//设备Mac
         var imei: String? = "" //设备标识符
+        var device_serial_id: String? = "" //设备注册唯一id
         var eth_ip: String? = "" //当前设备的IP
         var ids: Int = 0//当前设备的ID
         var sip_id: String? = ""//sip

middleware/src/main/code/com/wdkl/ncs/android/middleware/tcp/TcpClientHandler.java

@@ -44,13 +44,9 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         this.ctx = ctx;
         connected = true;
         retryTimes = 0;
-        if ("YUNPAI_H6".equals(Build.MODEL)) {
-            TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
-            TcpClient.getInstance().sendMsg(tcpModel.toJson());
-        } else {
-            TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getMac());
-            TcpClient.getInstance().sendMsg(tcpModel.toJson());
-        }
+
+        TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getDevice_serial_id());
+        TcpClient.getInstance().sendMsg(tcpModel.toJson());
 
         Constants.Companion.setTcp_connected(true);
         EventBus.getDefault().post(new MessageEvent(1, Constants.Companion.getEVENT_TCP_STATE()));

nursehome/src/main/java/com/wdkl/ncs/android/component/nursehome/activity/RegisterActivity.kt

@@ -69,6 +69,13 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         Log.e(TAG,"mac: "+Constants.mac + ", imei: " + Constants.imei)
         tv_local_mac.text = "本机MAC："+Constants.mac
         tv_local_imei.text = "IMEI或序列号: " + Constants.imei
+        tv_device_model.text = "设备型号: " + Build.MODEL
+
+        if ("YUNPAI_H6".equals(Build.MODEL) || "YUNPAI_H6B".equals(Build.MODEL)) {
+            Constants.device_serial_id = Constants.imei
+        } else {
+            Constants.device_serial_id = Constants.mac
+        }
 
         Thread{
             //val logoBitmap = BitmapFactory.decodeResource(resources, R.mipmap.erlogo)
@@ -77,11 +84,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
             builder.append("&code=")
             builder.append(Constants.DEVICE_CODE)
             builder.append("&mac=")
-            if ("YUNPAI_H6".equals(Build.MODEL)) {
-                builder.append(Constants.imei)
-            } else {
-                builder.append(Constants.mac)
-            }
+            builder.append(Constants.device_serial_id)
             builder.append("&model=")
             builder.append(Constants.DEVICE_MODEL)
             builder.append("&hard_ver=")
@@ -114,19 +117,11 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         btn_reload.isEnabled = false
         btn_reload.setOnClickListener {
             btn_reload.isEnabled = false
-            if ("YUNPAI_H6".equals(Build.MODEL)) {
-                presenter.loadData(Constants.imei!!)
-            } else {
-                presenter.loadData(Constants.mac!!)
-            }
+            presenter.loadData(Constants.device_serial_id!!)
         }
 
         if (permissionGrant) {
-            if ("YUNPAI_H6".equals(Build.MODEL)) {
-                presenter.loadData(Constants.imei!!)
-            } else {
-                presenter.loadData(Constants.mac!!)
-            }
+            presenter.loadData(Constants.device_serial_id!!)
         } else {
             reload()
         }
@@ -136,11 +131,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         handler.postDelayed({
             if (permissionGrant) {
                 btn_reload.isEnabled = false
-                if ("YUNPAI_H6".equals(Build.MODEL)) {
-                    presenter.loadData(Constants.imei!!)
-                } else {
-                    presenter.loadData(Constants.mac!!)
-                }
+                presenter.loadData(Constants.device_serial_id!!)
             } else {
                 reload()
             }

nursehome/src/main/res/layout/activity_register.xml

@@ -17,6 +17,15 @@
             android:layout_gravity="center_horizontal" />
 
         <TextView
+            android:id="@+id/tv_device_model"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="10dp"
+            android:text="设备型号:"
+            android:textColor="@color/black"
+            android:textSize="20sp" />
+
+        <TextView
             android:id="@+id/tv_local_ip"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"