兼容3368主机

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

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

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

@@ -145,7 +145,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
         //更新状态图标
         updateNetState()
 
-        if ("rk3128".equals(Build.MODEL)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
             //串口监听
             setSerialListner()
             //打开MIC
@@ -222,7 +222,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
 
             if (Constant.inNursing) {
                 Constant.inNursing = false
-                if ("rk3128".equals(Build.MODEL)) {
+                if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
                     SerialPortHelper.setDoorLight(1, "111") //白色
                 }
                 room_action_nurse.text = "进入护理"
@@ -234,7 +234,7 @@ class CallingdoorActivity :BaseActivity<CallingdoorActivityPresenter, Callingdoo
                 }
             } else {
                 Constant.inNursing = true
-                if ("rk3128".equals(Build.MODEL)) {
+                if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
                     SerialPortHelper.setDoorLight(1, "010") //绿色
                 }
                 room_action_nurse.text = "退出护理"
@@ -721,7 +721,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)) {
+                            if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
                                 DoorLightHelper.handleDoorLight(tcpModel)
                             }
                         }

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

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

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)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".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)) {
+        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
             handler.removeCallbacksAndMessages(null);
             SerialPortHelper.setSosLight("0");
         }

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

@@ -99,7 +99,7 @@ public class XCrashUtils {
                 debug(logPath, null);
             }*/
 
-            if ("rk3128".equals(Build.MODEL)) {
+            if ("rk3128".equals(Build.MODEL) || "rk3368".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)) {
+                if (!"rk3128".equals(Build.MODEL) && !"rk3368".equals(Build.MODEL)) {
                     Settings.System.putInt(
                         context.contentResolver,
                         Settings.System.SCREEN_OFF_TIMEOUT, timeout

middleware/src/main/code/com/wdkl/ncs/android/middleware/api/UrlManager.kt

@@ -75,7 +75,8 @@ private class ProUrlManager : UrlManager{
 
     override val base: String
         //get() = "http://api.%s.wdklian.com/"
-        get() = "http://172.28.100.100:8006"
+        //get() = "http://172.28.100.100:8006/"
+        get() = "http://8.129.220.143:8006/"
         //get() = "http://dev.base.wdklian.com:6005/"
         //get() = "http://47.106.200.55:8006"
 

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

@@ -598,7 +598,7 @@ public class WebRTCEngine implements IEngine, Peer.IPeerEvent {
             return createScreenCapturer();
         }
 
-        if (Build.MODEL.equals("rk3128")) {
+        if (Build.MODEL.equals("rk3128") || "rk3368".equals(Build.MODEL)) {
             return createCameraCapture(new Camera1Enumerator(true));
         } else {
             if (Camera2Enumerator.isSupported(mContext)) {