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:
#	home/src/main/code/com/wdkl/ncs/android/component/home/helper/AppUpdateHelper.java

.gradle/buildOutputCleanup/cache.properties

@@ -1,2 +0,0 @@
-#Mon Jun 28 17:31:38 CST 2021
-gradle.version=4.6

.idea/gradle.xml

@@ -28,6 +28,5 @@
         <option name="useQualifiedModuleNames" value="true" />
       </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">

common/src/main/code/com/wdkl/ncs/android/lib/utils/ConnectionObserver.kt

@@ -9,6 +9,7 @@ import io.reactivex.Observer
 import io.reactivex.disposables.Disposable
 import org.json.JSONObject
 import retrofit2.HttpException
+import java.lang.Exception
 
 /**
  * @author  LDD
@@ -95,14 +96,20 @@ abstract class ConnectionObserver<T> : BaseObserver<T>(BaseApplication.appContex
 abstract class BaseObserver<T>(private val context: Context) : Observer<T> {
 
     override fun onSubscribe(disposable: Disposable) {
-        if (VoiNetTool.getAPNType(this.context) == VoiNetTool.netType.noneNet) {
-            disposable.dispose()
-            this.onNoneNet()
-        } else {
+        try {
+            if (VoiNetTool.getAPNType(this.context) == VoiNetTool.netType.noneNet) {
+                disposable.dispose()
+                this.onNoneNet()
+            } else {
+                this.onStart()
+                this.attachSubscribe(disposable)
+            }
+        } catch (e:Exception){
+            System.err.println(e.message)
+        } finally {
             this.onStart()
             this.attachSubscribe(disposable)
         }
-
     }
 
     override fun onError(e: Throwable) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Fri Jan 22 17:49:32 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/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() {
@@ -557,14 +586,14 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
 
     @Subscribe(threadMode = ThreadMode.MAIN)
     fun onMoonEvent(messageEvent: MessageEvent) {
-//        Log.e(TAG,""+messageEvent.tag)
+        Log.e(TAG,""+messageEvent.tag)
 //        var tcpModels = messageEvent.getMessage() as TcpModel
 //        Log.e(TAG,""+tcpModels.getAction())
         if (messageEvent.tag == 14) {
             //唤醒屏幕并解锁屏幕
             Util().wakeUpAndUnlock(this)
 
-        } else if (messageEvent.tag == 13) {
+        } else if (messageEvent.tag == Constants.EVENT_TCP_APP_UPDATE) {
             //更新APP
             checkAppVersion()
         } else if (messageEvent.tag == Constants.EVENT_SIP_REGISTER_STATUS) {

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

@@ -73,9 +73,6 @@ public class AppUpdateHelper {
 //                callBack.onSuccess();
 //            }
 //        }
-        Uri uri = Uri.fromParts("package", "com.wdkl.app.ncs", null);
-        Intent intent = new Intent(Intent.ACTION_DELETE, uri);
-        startActivity(intent);
 
         if (installAPP(path)) {
             Log.d(TAG, "安装成功");

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";