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

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +1,2 @@
-#Mon Jun 28 17:31:38 CST 2021
-gradle.version=4.6
+#Thu Jul 01 16:18:06 CST 2021
+gradle.version=4.4

.idea/gradle.xml

@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -25,9 +23,8 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="true" />
+        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
-    <option name="offlineMode" value="true" />
   </component>
 </project>

.idea/misc.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <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">

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

@@ -8,6 +8,8 @@ import android.content.IntentFilter
 import android.content.pm.PackageManager
 import android.graphics.Color
 import android.net.wifi.WifiManager
+import android.os.Handler
+import android.os.Looper
 import android.provider.Settings
 import android.support.v4.app.ActivityCompat
 import android.support.v4.content.ContextCompat
@@ -97,6 +99,9 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
     private val WRITE_EXTERNAL_STORAGE_REQUEST_CODE = 127//这个值是自定义的一个int值，在申请多个权限时要
 
+    private var  time = 0L
+
+
     override fun getLayId(): Int {
         return R.layout.watch_activity_home2
     }
@@ -181,7 +186,12 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
     override fun userLogin() {
         Log.i(TAG, "webrtc 注册完成")
-        sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
+        runOnUiThread(Runnable {
+            sip_state_tv.setBackgroundColor(Color.parseColor("#00FFFF"))
+        })
+
+
+
         // webRTC呼叫测试
 //        var room = UUID.randomUUID().toString() + System.currentTimeMillis()
 //        var gEngineKit:SkyEngineKit? = null
@@ -200,11 +210,30 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
     }
 
     override fun userLogout() {
-        sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
+        runOnUiThread(Runnable {
+            sip_state_tv.setBackgroundColor(Color.parseColor("#FF0000"))
+        })
         Log.i(TAG, "webrtc 注册失败")
-        var intent = Intent(this,WatchRegisterActivity::class.java)
-        startActivity(intent)
-        finish()
+        Log.i(TAG, "webrtc 注册失败,,,, "+(System.currentTimeMillis()-time))
+        if(System.currentTimeMillis()-time >800){
+            time = System.currentTimeMillis()
+            Log.i(TAG, "webrtc 注册失败//// "+(System.currentTimeMillis()-time))
+
+//
+//     Log.i(TAG, "webrtc 注册失败... "+(System.currentTimeMillis()-time))
+//            var intent = Intent(this,WatchRegisterActivity::class.java)
+//            startActivity(intent)
+//            finish()
+            //注销webRTC
+            SocketManager.getInstance().unConnect()
+            Looper.prepare()
+            Handler().postDelayed(Runnable {
+                SocketManager.getInstance().connect(Urls.WS, Constants.sip_id, 0)
+            },700)
+            Looper.loop()
+
+        }
+
     }
 
     private fun unRegReceiver() {

home/src/main/code/com/wdkl/ncs/android/component/home/helper/AppUpdateHelper.java

@@ -53,31 +53,31 @@ public class AppUpdateHelper {
 
 
 //        if (installApp(context.getPackageName(), path)) {
-        if (rootSilenceInstall(path)) {
-            Log.d(TAG, "安装成功");
-            if (callBack != null) {
-                callBack.onSuccess();
-            }
-        } else {
-            Log.d(TAG, "安装失败");
-            if (callBack != null) {
-                callBack.onFailed();
-            }
-        }
-
-//        if (silentInstall(context, path)) {
-//            Log.d(TAG, "app 安装成功");
+//        if (rootSilenceInstall(path)) {
+//            Log.d(TAG, "安装成功");
 //            if (callBack != null) {
 //                callBack.onSuccess();
 //            }
+//        } else {
+//            Log.d(TAG, "安装失败");
+//            if (callBack != null) {
+//                callBack.onFailed();
+//            }
 //        }
 
-//        if (installAPP(path)) {
-//            Log.d(TAG, "安装成功");
+//        if (silentInstall(context, path)) {
+//            Log.d(TAG, "app 安装成功");
 //            if (callBack != null) {
 //                callBack.onSuccess();
 //            }
 //        }
+
+        if (installAPP(path)) {
+            Log.d(TAG, "安装成功");
+            if (callBack != null) {
+                callBack.onSuccess();
+            }
+        }
     }
 
 

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

@@ -65,7 +65,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
 
 
     // 服务器实例列表
-    private String serverIP = "120.76.246.253";
+    private String serverIP = "8.129.220.143";
     private String turnUser = "dsg";
     private String turnUserPwd = "123456";