增加本机设备IP上传到服务端

android_host/src/main/h10_wke_1h/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -344,8 +344,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
             }
         }.start()
 
-        //val macAddr = NetHelper.getInstance().macAddress
-        val ipAddr = NetHelper.getInstance().localIP
+        Constants.local_ip = NetHelper.getInstance().localIP
         val buildUrl = UrlManager.build()
         serverIp =  buildUrl.buyer.substringAfterLast("//").substringBefore(":")
         val str = ("App name: " + getString(R.string.wdkl_app_name)
@@ -353,12 +352,9 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                 + "\r\nRelease Date:" + BuildConfig.BUILD_TIME
                 + "\r\nSDK: " + Build.VERSION.SDK_INT + "_" + Build.MODEL)
 
-        home_view_local_ip.text = "IP: " + ipAddr + ", server: " + serverIp
-        //home_view_local_mac.text = "MAC: " + macAddr
+        home_view_local_ip.text = "IP: " + Constants.local_ip + ", server: " + serverIp
         home_view_app_version.text = str
 
-        //presenter.loadDeviceData(Constants.device_serial_id!!)
-
         SpeechUtil.getInstance().init(BaseApplication.appContext) {
             //如果tts启用失败或者不支持中文则将语音播报切换到音乐模式
             if (!it) {

android_host/src/main/h10_wke_1h_chile/java/com/wdkl/ncs/android/component/nursehome/activity/NurseHomeActivity.kt

@@ -270,7 +270,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
         }.start()
 
         val macAddr = NetHelper.getInstance().macAddress
-        val ipAddr = NetHelper.getInstance().localIP
+        Constants.local_ip = NetHelper.getInstance().localIP
         val buildUrl = UrlManager.build()
         serverIp =  buildUrl.buyer.substringAfterLast("//").substringBefore(":")
         val str = ("App name: " + getString(R.string.wdkl_app_name)
@@ -278,7 +278,7 @@ class NurseHomeActivity  : BaseActivity<NurseHomeActivityPresenter, ActivityNurs
                 + "\r\nRelease Date:" + BuildConfig.BUILD_TIME
                 + "\r\nSDK: " + Build.VERSION.SDK_INT + "_" + Build.MODEL)
 
-        home_view_local_ip.text = "IP: " + ipAddr + ", server: " + serverIp
+        home_view_local_ip.text = "IP: " + Constants.local_ip + ", server: " + serverIp
         home_view_local_mac.text = "MAC: " + macAddr
         home_view_app_version.text = str
 

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

@@ -195,12 +195,12 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
                 view_qr_code?.setImageBitmap(code)
             }
         }.start()
-        //val macAddr = NetHelper.getInstance().macAddress
-        val ipAddr = NetHelper.getInstance().localIP
+
+        Constants.local_ip = NetHelper.getInstance().localIP
         val buildUrl = UrlManager.build()
         serverIp =  buildUrl.buyer.substringAfterLast("//").substringBefore(":")
 
-        tv_local_ip.text = "IP: " + ipAddr + ", server: " + serverIp
+        tv_local_ip.text = "IP: " + Constants.local_ip + ", server: " + serverIp
         tv_local_mac.text = "MAC: " + Constants.device_serial_id
         val str = ("App name: " + getString(R.string.wdkl_app_name)
                 + "\r\nAPP version: V" + BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE

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

@@ -127,11 +127,11 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
             }
         }.start()
         val macAddr = NetHelper.getInstance().macAddress
-        val ipAddr = NetHelper.getInstance().localIP
+        Constants.local_ip = NetHelper.getInstance().localIP
         val buildUrl = UrlManager.build()
         serverIp =  buildUrl.buyer.substringAfterLast("//").substringBefore(":")
 
-        tv_local_ip.text = "IP: " + ipAddr + ", server: " + serverIp
+        tv_local_ip.text = "IP: " + Constants.local_ip + ", server: " + serverIp
         tv_local_mac.text = "MAC: " + macAddr
         val str = ("App name: " + getString(R.string.wdkl_app_name)
                 + "\r\nAPP version: V" + BuildConfig.VERSION_NAME + "_" + BuildConfig.VERSION_CODE

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

@@ -181,6 +181,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
         }
 
         Log.i(TAG,"device_serial_id: "+ Constants.device_serial_id)
+        Constants.local_ip = NetHelper.getInstance().localIP
 
         showQRCode()
 
@@ -190,7 +191,7 @@ class RegisterActivity : BaseActivity<DevicePresenter, ActivityRegisterBinding>(
             "App名称: ${getString(R.string.wdkl_app_name)}"+
                     "\r\n服务器地址: " + str_ip +
                     "\r\n当前设备MAC: ${Constants.device_serial_id}"+
-                    "\r\n当前设备IP: ${NetHelper.getInstance().localIP}"+
+                    "\r\n当前设备IP: ${Constants.local_ip}"+
                     "\r\nAPP版本号: V${BuildConfig.VERSION_NAME}_${BuildConfig.VERSION_CODE}"+
                     "\r\n发布日期:${BuildConfig.BUILD_TIME}"+
                     "\r\nSDK版本: ${Build.VERSION.SDK_INT}_${Build.MODEL}"

common/src/main/code/com/wdkl/ncs/android/lib/utils/ExtendMethods.kt

@@ -616,7 +616,7 @@ fun <T> Intent.getObjectForGson(key: String, cls: Class<T>): T? {
     return if (hasExtra(key)) {
         val json = getStringExtra(key)
         try {
-            JsonTranforHelper.toObject(json, cls)
+            JsonTranforHelper.toObject(json!!, cls)
         } catch (e: Exception) {
             null
         }

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

@@ -20,6 +20,7 @@ class Constants {
         var imei: String? = ""  //设备标识符
         var device_serial_id: String? = ""  //设备注册唯一id
         var eth_ip: String? = ""  //当前设备的IP
+        var local_ip: String? = ""  //本机IP
         var ids: Int = 0  //当前设备的ID
         var sip_id: String? = ""  //sip
         var sip_ip: String? = ""  //sip

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

@@ -46,7 +46,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         super.channelActive(ctx);
         Log.i(TAG, "连接成功");
         this.ctx = ctx;
-        TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getDevice_serial_id());
+        TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getDevice_serial_id(), Constants.Companion.getLocal_ip());
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
 
         Constants.Companion.setTcp_connected(true);

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

@@ -11,7 +11,7 @@ import com.wdkl.ncs.android.middleware.tcp.enums.TcpType;
 import com.wdkl.ncs.android.middleware.utils.ContactHelper;
 
 public class DeviceUtil {
-    public static TcpModel deviceConnect(String mac){
+    public static TcpModel deviceConnect(String mac, String ip){
         TcpModel tcpModel = new TcpModel(null);
         DeviceConnectDTO connectDTO = new DeviceConnectDTO();
         connectDTO.setIdentification(mac);
@@ -19,11 +19,12 @@ public class DeviceUtil {
         connectDTO.setSoftware_version("V"+ BuildConfig.VERSION_NAME);
         connectDTO.setModel(Build.MODEL);
         connectDTO.setCode(Build.SERIAL);
-        tcpModel.setType(TcpType.DEVICE);
+        connectDTO.setClientIp(ip);
         String number = ContactHelper.getPhoneNumber();
         if (!TextUtils.isEmpty(number)) {
             connectDTO.setPhoneNumber(number);
         }
+        tcpModel.setType(TcpType.DEVICE);
         tcpModel.setAction(TcpAction.DeviceAction.CONNECT);
         tcpModel.setData(connectDTO);
         return tcpModel;

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

@@ -33,6 +33,9 @@ public class DeviceConnectDTO implements Serializable {
 
     private String phoneNumber;
 
+    /** 客户端Ip **/
+    private String clientIp;
+
     public String getIdentification() {
         return identification;
     }
@@ -80,4 +83,12 @@ public class DeviceConnectDTO implements Serializable {
     public void setPhoneNumber(String phoneNumber) {
         this.phoneNumber = phoneNumber;
     }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
 }