增加异常重启功能，其他优化

app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -6,6 +6,7 @@ import com.wdkl.ncs.android.lib.base.BaseApplication
 import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
+import com.wdkl.app.ncs.callingdoor.helper.AnrFcExceptionUtil
 //import com.enation.javashop.utils.base.config.BaseConfig
 //import com.wdkl.app.ncs.callingdoor.helper.AnrFcExceptionUtil
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper
@@ -105,7 +106,7 @@ class Application : BaseApplication() {
 
 
         //anr catcher
-        //AnrFcExceptionUtil.getInstance(this).initFCException()
+        AnrFcExceptionUtil.getInstance(this).initFCException()
 
         //xCrash catcher
         //XCrashUtils().init(this)

build.gradle

@@ -47,12 +47,12 @@ buildscript {
     /**
      * APP版本码
      */
-    ext.app_version_code = 1
+    ext.app_version_code = 2
 
     /**
      * APP版本号
      */
-    ext.app_version = "1.1.1"
+    ext.app_version = "1.1.2"
 
     /**
      * 项目依赖库

callingdoor/build.gradle

@@ -117,7 +117,7 @@ dependencies {
      */
     compile 'com.android.support.constraint:constraint-layout:1.1.0-beta5'
 
-    //compile 'com.github.anrwatchdog:anrwatchdog:1.3.0'
+    compile 'com.github.anrwatchdog:anrwatchdog:1.3.0'
 
     //使用xCrash捕获异常
     implementation 'com.iqiyi.xcrash:xcrash-android-lib:3.0.0'

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/activity/CallingdoorActivity.kt

@@ -233,7 +233,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 break
             }
         }
-        Log.e("callingbed", "callingbed app exist: " + appExist)
+        Log.e(TAG, "old calling app exist: $appExist")
         return appExist
     }
 
@@ -243,7 +243,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         try {
             process = Runtime.getRuntime().exec("su")
             printWriter = PrintWriter(process.outputStream)
-            printWriter.println("pm uninstall com.wdkl.callingbed")
+            printWriter.println("pm uninstall com.wdkl.callingdoor")
             printWriter.flush()
             printWriter.close()
             Log.e("uninstall", "uninstall end")

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/AnrFcExceptionUtil.java.bak

@@ -12,10 +12,6 @@ import android.util.Log;
 import com.github.anrwatchdog.ANRError;
 import com.github.anrwatchdog.ANRWatchDog;
 import com.wdkl.ncs.android.component.welcome.activity.WelcomeActivity;
-import com.wdkl.ncs.android.middleware.tcp.channel.DeviceChannel;
-import com.wdkl.skywebrtc.CallSession;
-import com.wdkl.skywebrtc.EnumType;
-import com.wdkl.skywebrtc.SkyEngineKit;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -78,8 +74,6 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
             }
 
             restartApp();
-            //android.os.Process.killProcess(android.os.Process.myPid());
-            //System.exit(0);
         }
     }
 
@@ -157,11 +151,6 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
     }
 
     private void restartApp() {
-        CallSession session= SkyEngineKit.Instance().getCurrentSession();
-        if(session!=null&&session.getState()!= EnumType.CallState.Idle){
-            SkyEngineKit.Instance().endCall();
-        }
-
         //重新启动app
         Intent mStartActivity = new Intent(application.getApplicationContext(), WelcomeActivity.class);
         mStartActivity.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
@@ -216,7 +205,7 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
                 }*/
 
                 Log.d("anr", "Anr restart app...");
-                if ("rk3128".equals(Build.MODEL)) {
+                if ("rk3128".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
                     AppUpdateHelper.reboot(application);
                 } else {
                     restartApp();

callingdoor/src/main/res/layout/view_title_layout.xml

@@ -32,7 +32,7 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_centerVertical="true"
-        android:format12Hour="yyyy-MM-dd aah:mm EEEE"
+        android:format12Hour="yyyy-MM-dd kk:mm EEEE"
         android:format24Hour="yyyy-MM-dd kk:mm EEEE"
         android:timeZone="GMT+8"
         android:textColor="@color/main_color"

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/dos/DeviceDO.java

@@ -499,7 +499,7 @@ public class DeviceDO implements Serializable {
         this.transAudioId = transAudioId;
     }
 
-    @Override
+    /*@Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
@@ -540,5 +540,5 @@ public class DeviceDO implements Serializable {
     @Override
     public int hashCode() {
         return Objects.hash(id, unionId, createTime, updateTime, partId, syncTime, frameId, deviceType, code, model, softVer, hardVer, name, ethMac, ethIp, ethIpPort, wifiMac, wifiIp, wifiHostname, wifiPassword, status, sipIp, sipId, sipPassword, sipStatus, memberId, boolBackup, backupId, priority, config, roleId);
-    }
+    }*/
 }