Merge branch 'yz_watch_wdklwebrtc_1.0.0' of http://git.wdklian.com/allen/ncs_android_frame into yz_watch_wdklwebrtc_1.0.0

# Conflicts:
#	gradle/wrapper/gradle-wrapper.properties
#	rtc-chat/src/main/java/com/wdkl/skywebrtc/engine/webrtc/WebRTCEngine.java

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Mon Mar 08 20:44:19 CST 2021
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+
+#Mon Mar 08 20:44:19 CST 2021
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

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

@@ -2,11 +2,13 @@ package com.wdkl.ncs.android.component.home.util
 
 import android.annotation.SuppressLint
 import android.app.KeyguardManager
+import android.app.Service
 import android.content.Context
+import android.content.Context.KEYGUARD_SERVICE
+import android.os.Build
 import android.os.PowerManager
 import android.telephony.TelephonyManager
-import android.content.Context.KEYGUARD_SERVICE
-
+import com.umeng.socialize.utils.DeviceConfig
 
 
 class Util {
@@ -18,7 +20,12 @@ class Util {
     */
     @SuppressLint("MissingPermission")
     fun getIMEI(context: Context): String {
-        IMEI = (context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager).deviceId
+        val tm = (context.getSystemService(Context.TELEPHONY_SERVICE) as TelephonyManager)
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            IMEI = tm.imei
+        } else {
+            IMEI = tm.deviceId
+        }
         return IMEI
     }
 

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

@@ -92,7 +92,6 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
             IdleStateEvent event = (IdleStateEvent)evt;
             if (event.state()== IdleState.WRITER_IDLE){
                 ctx.writeAndFlush("0");
-              //读心跳包超时执行
             }else if (event.state() == IdleState.READER_IDLE){
                 Log.i(TAG,"TcpClientHandler ===> pong from server failed");
                 ctx.close();

rtc-chat/src/main/java/com/wdkl/skywebrtc/engine/webrtc/WebRTCEngine.java

@@ -66,8 +66,9 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
 
     // 服务器实例列表
     private String serverIP = "120.76.246.253";
-    private String turnUser = "dsg";
-    private String turnUserPwd = "123456";
+    private String turnUser = "wdkl";
+    private String turnUserPwd = "Wdkl2021$";
+
 
     private static final String VIDEO_TRACK_ID = "ARDAMSv0";
     private static final String AUDIO_TRACK_ID = "ARDAMSa0";
@@ -501,19 +502,25 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
 
     private void initIceServer() {
         // 初始化一些stun和turn的地址
-        PeerConnection.IceServer var1 = PeerConnection.IceServer.builder("stun:stun.l.google.com:19302")
-                .createIceServer();
-        iceServers.add(var1);
+//        PeerConnection.IceServer var1 = PeerConnection.IceServer.builder("stun:stun.l.google.com:19302")
+//                .createIceServer();
+//        iceServers.add(var1);
 
-        PeerConnection.IceServer var11 = PeerConnection.IceServer.builder("stun:"+serverIP+":3478?transport=udp")
+        PeerConnection.IceServer var11 = PeerConnection.IceServer
+                .builder("stun:"+serverIP+":3478?transport=udp")
+                .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
                 .createIceServer();
-        PeerConnection.IceServer var12 = PeerConnection.IceServer.builder("turn:"+serverIP+":3478?transport=udp")
+        PeerConnection.IceServer var12 = PeerConnection.IceServer
+                .builder("turn:"+serverIP+":3478?transport=udp")
                 .setUsername(turnUser)
                 .setPassword(turnUserPwd)
+                .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
                 .createIceServer();
-        PeerConnection.IceServer var13 = PeerConnection.IceServer.builder("turn:"+serverIP+":3478?transport=tcp")
+        PeerConnection.IceServer var13 = PeerConnection.IceServer
+                .builder("turn:"+serverIP+":3478?transport=tcp")
                 .setUsername(turnUser)
                 .setPassword(turnUserPwd)
+                .setTlsCertPolicy(PeerConnection.TlsCertPolicy.TLS_CERT_POLICY_INSECURE_NO_CHECK)
                 .createIceServer();
         iceServers.add(var11);
         iceServers.add(var12);