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

.idea/misc.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
-#Fri Jan 22 17:49:32 CST 2021
+
+#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.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

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

@@ -307,7 +307,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Constants.sip_id = data.sipId
         Constants.sip_password = data.sipPassword
         Constants.user_name = data.memberName
-        Constants.user_role_name = data.name
+        Constants.user_role_name = data.roleName
 
         if (TextUtils.isEmpty(Constants.ids) || TextUtils.isEmpty(Constants.sip_id)
 //                || TextUtils.isEmpty(Constants.user_name)

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

@@ -47,6 +47,9 @@ public class TcpClientHandler extends SimpleChannelInboundHandler<String> {
         connected = true;
         connecteds = true;
         retryTimes = 0;
+//        TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
+//        TcpClient.getInstance().sendMsg(tcpModel.toJson());
+
         TcpModel tcpModel = DeviceUtil.deviceConnect(Constants.Companion.getImei());
         TcpClient.getInstance().sendMsg(tcpModel.toJson());
 //        EventBus.getDefault().register(this);

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

@@ -69,6 +69,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
     private String turnUser = "wdkl";
     private String turnUserPwd = "Wdkl2021";
 
+
     private static final String VIDEO_TRACK_ID = "ARDAMSv0";
     private static final String AUDIO_TRACK_ID = "ARDAMSa0";
     public static final String VIDEO_CODEC_H264 = "H264";