绑定方式由Mac改为imei 因为有些设备的Mac开机和重启之后会变

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

@@ -99,7 +99,6 @@ class WatchEventDetailActivity: BaseActivity<WatchHomeActivityPresenter, WatchAc
                         var mediaPlayer = MediaPlayer()
 //                    mediaPlayer.startMediaPlayer( Constants.eth_ip +interactionVO!!.data)
 //                    mediaPlayer.setVolume(0.3f)
-                        //MediaPlayHelper.getInstance().playUrlMusic(Constants.eth_ip +interactionVO!!.data,1f,false)
                         MediaPlayHelper.getInstance().playUrlMusic(ApiManager.urlManager.device_url +interactionVO!!.data,1f,false)
                     }else{
                         MediaPlayHelper.getInstance().playUrlMusic(ApiManager.urlManager.device_url +interactionVO!!.data,1f,false)

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

@@ -15,6 +15,7 @@ import com.wdkl.ncs.android.component.home.databinding.WatchContactsLayBinding
 import com.wdkl.ncs.android.component.home.launch.HomeLaunch
 import com.wdkl.ncs.android.component.home.service.TcpHandleService
 import com.wdkl.ncs.android.component.home.util.NetHelper
+import com.wdkl.ncs.android.component.home.util.Util
 import com.wdkl.ncs.android.component.nursehome.common.Constants
 import com.wdkl.ncs.android.lib.base.BaseActivity
 import com.wdkl.ncs.android.lib.utils.AppTool
@@ -49,10 +50,13 @@ class WatchRegisterActivity: BaseActivity<WatchDevicePresenter, WatchActivityReg
     }
 
     override fun init() {
+        Constants.imei = Util().getIMEI(this)
+        Log.e(TAG,"IMEI "+ Util().getIMEI(this))
+
         Constants.mac = NetHelper.getInstance().macAddress
         //Constants.mac = "4C:C0:0A:8E:D6:BB"
         Log.e(TAG,"mac "+Constants.mac)
-        tv_mac_addr.text = "MAC地址: " + Constants.mac
+        tv_mac_addr.text = "MAC地址: " + Constants.mac+"\n" +"IMEI号："+Constants.imei
 
         presenter.loadTcpServerHost()
 
@@ -120,7 +124,8 @@ class WatchRegisterActivity: BaseActivity<WatchDevicePresenter, WatchActivityReg
                 Manifest.permission.BLUETOOTH,
                 Manifest.permission.RECORD_AUDIO)).subscribe {
             if (it){
-                presenter.loadData(Constants.mac)
+//                presenter.loadData(Constants.mac)//传Mac
+                presenter.loadData(Constants.imei)// 传imei
             }else{
                 showMessage("请重新授权，进入App")
                 requestPermissions()

home/src/main/code/com/wdkl/ncs/android/component/home/util/Util.kt

@@ -0,0 +1,21 @@
+package com.wdkl.ncs.android.component.home.util
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.telephony.TelephonyManager
+
+class Util {
+
+    var IMEI = ""
+
+    /*
+      激活获取IMEI用
+    */
+    @SuppressLint("MissingPermission")
+    fun getIMEI(context: Context): String {
+        IMEI = (context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager).deviceId
+        return IMEI
+    }
+
+
+}

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

@@ -2,6 +2,7 @@ package com.wdkl.ncs.android.component.nursehome.common
 
 class Constants {
     companion object {
+        var imei: String =""//设备的IMEI号
         var mac: String =""//设备Mac
         var frame_id: String =""//医院结构ID
         var eth_ip: String ="" //当前设备的IP
@@ -9,8 +10,8 @@ class Constants {
         var sip_id: String =""//sip
         var user_name: String? = "" //当前用户
         var tcp_server: String? = "192.168.1.138"
-        var tcp_port: Int = 5080
-        var heart_beat: Int = 9
+        var tcp_port: Int = 5080   //tcp端口
+        var heart_beat: Int = 9    //tcp心跳
         var tts_state: Int = 0
     }