增加设备上传本机IP

middleware/src/main/code/com/wdkl/ncs/android/middleware/common/Constant.java

@@ -195,6 +195,9 @@ public class Constant {
     //设备序列号
     public static String DEVICE_SN = "";
 
+    //设备自己的IP
+    public static String DEVICE_LOCAL_IP = "";
+
     //设备注册号
     public static String DEVICE_REGISTER_ID = "";
 
@@ -644,4 +647,5 @@ public class Constant {
     public static final int EVENT_DORM_CALLING = 0x220;
 
     public static final int EVENT_WIFI_ENABLE = 0x221;
+    public static final int EVENT_NETWORK_CHANGE = 0x222;
 }

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

@@ -63,10 +63,10 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         Constant.TCP_CONNECTED = true;
         EventBus.getDefault().post(new MessageEvent(1, Constant.EVENT_TCP_STATE));
          if (Boolean.valueOf(BuildConfig.isandroid_mobile)){
-             TcpModel tcpModel = DeviceUtil.deviceConnect3(Constant.DEVICE_REGISTER_ID);
+             TcpModel tcpModel = DeviceUtil.deviceConnect3(Constant.DEVICE_REGISTER_ID, Constant.DEVICE_LOCAL_IP);
              TcpClient.getInstance().sendMsg(tcpModel.toJson());
          }else {
-             TcpModel tcpModel = DeviceUtil.deviceConnect(Constant.DEVICE_REGISTER_ID);
+             TcpModel tcpModel = DeviceUtil.deviceConnect(Constant.DEVICE_REGISTER_ID, Constant.DEVICE_LOCAL_IP);
              TcpClient.getInstance().sendMsg(tcpModel.toJson());
          }
     }

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

@@ -1,6 +1,7 @@
 package com.wdkl.ncs.android.middleware.tcp.channel;
 
 import android.os.Build;
+import android.text.TextUtils;
 
 import com.wdkl.ncs.android.lib.base.BaseApplication;
 import com.wdkl.ncs.android.middleware.BuildConfig;
@@ -17,7 +18,7 @@ import java.util.Map;
 
 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);
@@ -25,13 +26,17 @@ public class DeviceUtil {
         connectDTO.setSoftware_version("V"+ CommonUtils.getAppVersionName(BaseApplication.appContext));
         connectDTO.setModel(Build.MODEL);
         connectDTO.setCode(Build.SERIAL);
+        if (!TextUtils.isEmpty(ip)) {
+            connectDTO.setClientIp(ip);
+        }
+
         tcpModel.setType(TcpType.DEVICE);
         tcpModel.setAction(TcpAction.DeviceAction.CONNECT);
         tcpModel.setData(connectDTO);
         return tcpModel;
     }
 
-    public static TcpModel deviceConnect3(String mac){
+    public static TcpModel deviceConnect3(String mac, String ip){
         DeviceConnectDTO deviceConnectDTO = new DeviceConnectDTO();
         deviceConnectDTO.setIdentification(mac);
         deviceConnectDTO.setModel(Build.MODEL);
@@ -40,6 +45,9 @@ public class DeviceUtil {
         deviceConnectDTO.setCode(Constant.imei);
         deviceConnectDTO.setPhoneNumber(ContactHelper.getPhoneNumber());
         deviceConnectDTO.setDevice_type(Constant.deviceType);
+        if (!TextUtils.isEmpty(ip)) {
+            deviceConnectDTO.setClientIp(ip);
+        }
 
         TcpModel tcpModel = new TcpModel(null);
         tcpModel.setType(TcpType.DEVICE);

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

@@ -35,6 +35,9 @@ public class DeviceConnectDTO implements Serializable {
 
     private int device_type;
 
+    /** 客户端Ip **/
+    private String clientIp;
+
     public String getPhoneNumber() {
         return phoneNumber;
     }
@@ -90,4 +93,12 @@ public class DeviceConnectDTO implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
+    public String getClientIp() {
+        return clientIp;
+    }
+
+    public void setClientIp(String clientIp) {
+        this.clientIp = clientIp;
+    }
 }