兼容另一款A20

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

@@ -89,7 +89,7 @@ class Application : BaseApplication() {
         NetHelper.getInstance().init()
 
         //open serial port
-        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
             SerialPortUtil.getInstance().openSerialPort()
         }
 

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

@@ -161,7 +161,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         //更新状态图标
         updateNetState()
 
-        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
             //串口监听
             setSerialListener()
             SerialPortHelper.startHeartBeat()
@@ -451,7 +451,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
             if (Constant.inNursing) {
                 Constant.inNursing = false
-                if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+                if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
                     SerialPortHelper.setDoorLight(1, "111") //白色
                 }
                 //room_action_nurse.text = "进入护理"
@@ -463,7 +463,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 }
             } else {
                 Constant.inNursing = true
-                if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+                if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
                     SerialPortHelper.setDoorLight(1, Constant.nursingColor) //绿色
                 }
                 //room_action_nurse.text = "退出护理"
@@ -652,7 +652,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         }
         MediaPlayHelper.getInstance().stopMusic()
 
-        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
             SerialPortUtil.getInstance().closeHeart()
             SerialPortUtil.getInstance().closeSerialPort()
         }
@@ -1095,7 +1095,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                             val interactionVO = Gson().fromJson(tcpModel.data.toString(), InteractionVO::class.java)
                             nursingInteId = interactionVO.id
                         } else {
-                            if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+                            if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
                                 DoorLightHelper.handleDoorLight(tcpModel)
                             }
                         }

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/fragment/SipCallFragment.kt

@@ -180,7 +180,7 @@ class SipCallFragment: BaseCallFragment() {
         RingPlayHelper.stopRingTone()
 
         //如果当前在护理中则不操作门灯，如果不在护理中则重置门灯
-        if (("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL))
+        if (("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL))
             && !Constant.inNursing) {
             SerialPortHelper.setDoorLight(1, "111") //白色
         }

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

@@ -205,7 +205,7 @@ public class AnrFcExceptionUtil implements Thread.UncaughtExceptionHandler {
                 }*/
 
                 Log.d("anr", "Anr restart app...");
-                if ("rk3128".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+                if ("rk3128".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
                     AppUpdateHelper.reboot(application);
                 } else {
                     restartApp();

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/AppUpdateHelper.java

@@ -238,7 +238,7 @@ public class AppUpdateHelper {
                 context.sendBroadcast(intent);
 
                 SerialPortHelper.resetDevice();
-            } else if ("WDMK_I".equals(Build.MODEL)){
+            } else if ("WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)){
                 //A20
                 Process process = Runtime.getRuntime().exec(new String[]{"su", "-c", "reboot"});
                 process.waitFor();

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/SOSHelper.java

@@ -22,7 +22,7 @@ public class SOSHelper {
     };
 
     public static void sosStart() {
-        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
             SerialPortHelper.setSosLight("2");
             OtherUtil.sendSosCall(Constant.DEVICE_ID);
 
@@ -32,7 +32,7 @@ public class SOSHelper {
     }
 
     public static void sosStop() {
-        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
             handler.removeCallbacksAndMessages(null);
             if (Constant.day_state == 1) {
                 SerialPortHelper.setSosLight("1");

callingdoor/src/main/java/com/wdkl/app/ncs/callingdoor/helper/XCrashUtils.java

@@ -95,7 +95,7 @@ public class XCrashUtils {
                 debug(logPath, null);
             }*/
 
-            if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL)) {
+            if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL) || "WDMK_I".equals(Build.MODEL) || "WDMKI".equals(Build.MODEL)) {
                 AppUpdateHelper.reboot(app);
             } else {
                 restartApp();

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

@@ -286,7 +286,7 @@ object AppTool {
         @JvmStatic
         fun setScreenOffTimeOut(context: Context, timeout: Int) {
             try {
-                if (!"rk3128".equals(Build.MODEL) && !"rk3368".equals(Build.MODEL) && !"WDMK_I".equals(Build.MODEL)) {
+                if (!"rk3128".equals(Build.MODEL) && !"rk3368".equals(Build.MODEL) && !"WDMK_I".equals(Build.MODEL) && !"WDMKI".equals(Build.MODEL)) {
                     Settings.System.putInt(
                         context.contentResolver,
                         Settings.System.SCREEN_OFF_TIMEOUT, timeout