tcp连接上时上传本机电话号码

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 115
+    ext.app_version_code = 116
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.3.33"
+    ext.app_version = "1.3.34"
 
     /**
      * 项目依赖库

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

@@ -42,7 +42,6 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         super.channelActive(ctx);
-        Log.i(TAG,"tcp连接成功");
         this.ctx = ctx;
         connected = true;
         retryTimes = 0;
@@ -51,6 +50,7 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         EventBus.getDefault().post(new MessageEvent("net on",Constants.EVENT_TCP_CONNECTED));
 
         TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
+        Log.e(TAG, "tcp连接成功: " + tcpModel.toJson());
         ctx.writeAndFlush(tcpModel.toJson());
     }
 

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

@@ -8,6 +8,7 @@ import com.wdkl.ncs.android.middleware.tcp.dto.DeviceConnectDTO;
 import com.wdkl.ncs.android.middleware.tcp.dto.TcpModel;
 import com.wdkl.ncs.android.middleware.tcp.enums.TcpAction;
 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){
@@ -17,6 +18,7 @@ public class DeviceUtil {
         deviceConnectDTO.setSoftware_version("V"+BuildConfig.VERSION_NAME);
         deviceConnectDTO.setHardware_version(Build.HARDWARE);
         deviceConnectDTO.setCode(Constants.Companion.getImei());
+        deviceConnectDTO.setPhoneNumber(ContactHelper.getPhoneNumber());
         TcpModel tcpModel = new TcpModel();
         tcpModel.setType(TcpType.DEVICE);
         tcpModel.setAction(TcpAction.DeviceAction.CONNECT);

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

@@ -31,6 +31,7 @@ public class DeviceConnectDTO implements Serializable {
      */
     private String code;
 
+    private String phoneNumber;
 
     public String getIdentification() {
         return identification;
@@ -71,4 +72,12 @@ public class DeviceConnectDTO implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
-}
+
+    public String getPhoneNumber() {
+        return phoneNumber;
+    }
+
+    public void setPhoneNumber(String phoneNumber) {
+        this.phoneNumber = phoneNumber;
+    }
+}

middleware/src/main/code/com/wdkl/ncs/android/middleware/utils/ContactHelper.java

@@ -1,5 +1,6 @@
 package com.wdkl.ncs.android.middleware.utils;
 
+import android.annotation.SuppressLint;
 import android.content.ContentProviderOperation;
 import android.content.ContentResolver;
 import android.content.ContentValues;
@@ -7,8 +8,11 @@ import android.content.Context;
 import android.database.Cursor;
 import android.net.Uri;
 import android.provider.ContactsContract;
+import android.telephony.TelephonyManager;
 import android.util.Log;
 
+import com.wdkl.ncs.android.lib.base.BaseApplication;
+
 import java.util.ArrayList;
 
 public class ContactHelper {
@@ -216,5 +220,9 @@ public class ContactHelper {
 
     }
 
-
+    public static String getPhoneNumber(){
+        TelephonyManager tm = (TelephonyManager) BaseApplication.appContext.getApplicationContext().getSystemService(Context.TELEPHONY_SERVICE);
+        @SuppressLint("MissingPermission") String te1  = tm.getLine1Number();//获取本机号码
+        return te1;
+    }
 }