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 +0,0 @@
-#Thu Jul 01 16:18:06 CST 2021
-gradle.version=4.4

.idea/gradle.xml

@@ -1,8 +1,10 @@
 <?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">
@@ -23,7 +25,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>

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

@@ -126,7 +126,7 @@ class WatchHome2Activity : BaseActivity<WatchHomeActivityPresenter, WatchActivit
         Constants.imei = Util().getIMEI(this)
         Log.i(TAG, "IMEI " + Util().getIMEI(this))
 
-        Constants.mac = NetHelper.getInstance().macAddress
+//        Constants.mac = NetHelper.getInstance().macAddress
         //Constants.mac = "4C:C0:0A:8E:D6:BB"
         Log.i(TAG, "mac " + Constants.mac)
         tv_mac_addr.text = "MAC地址: " + Constants.mac + "\n" + "IMEI号：" + Constants.imei
@@ -586,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

@@ -18,6 +18,8 @@ import java.io.PrintWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
 
+import static com.blankj.utilcode.util.ActivityUtils.startActivity;
+
 public class AppUpdateHelper {
     private final static String TAG = "AppUpdate";