Browse Source

修改月子中心门口机按键板默认接串口0

weizhengliang 1 year ago
parent
commit
3de166fc6a
1 changed files with 12 additions and 9 deletions
  1. 12 9
      app/src/main/code/com/wdkl/app/ncs/application/Application.kt

+ 12 - 9
app/src/main/code/com/wdkl/app/ncs/application/Application.kt

@@ -10,13 +10,11 @@ import com.enation.javashop.net.engine.config.NetEngineConfig
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.net.engine.plugin.exception.RestfulExceptionInterceptor
 import com.enation.javashop.utils.base.config.BaseConfig
 import com.enation.javashop.utils.base.config.BaseConfig
 import com.hjq.toast.Toaster
 import com.hjq.toast.Toaster
+import com.wdkl.app.ncs.callingdoor.BuildConfig
 import com.wdkl.app.ncs.callingdoor.helper.LocaleMangerUtils
 import com.wdkl.app.ncs.callingdoor.helper.LocaleMangerUtils
-//import com.enation.javashop.utils.base.config.BaseConfig
-//import com.wdkl.app.ncs.callingdoor.helper.AnrFcExceptionUtil
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper
 import com.wdkl.app.ncs.callingdoor.helper.NetHelper
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.helper.Utils
 import com.wdkl.app.ncs.callingdoor.helper.XCrashUtils
 import com.wdkl.app.ncs.callingdoor.helper.XCrashUtils
-import com.wdkl.ncs.android.lib.BuildConfig
 import com.wdkl.ncs.android.lib.settings.SettingConfig
 import com.wdkl.ncs.android.lib.settings.SettingConfig
 import serialporttest.utils.SerialPortUtil
 import serialporttest.utils.SerialPortUtil
 import serialporttest.utils.SerialPortUtil433
 import serialporttest.utils.SerialPortUtil433
@@ -92,7 +90,7 @@ class Application : BaseApplication() {
         NetHelper.getInstance().init()
         NetHelper.getInstance().init()
 
 
         //open serial port
         //open serial port
-        if ("rk3128".equals(Build.MODEL) || "rk3368".equals(Build.MODEL)) {
+        if ("rk3128" == Build.MODEL || "rk3368" == Build.MODEL) {
             if ("rk3368".equals(Build.MODEL)) {
             if ("rk3368".equals(Build.MODEL)) {
                 SerialPortUtil.getInstance().openSerialPort("/dev/ttyS4")
                 SerialPortUtil.getInstance().openSerialPort("/dev/ttyS4")
             } else {
             } else {
@@ -110,12 +108,17 @@ class Application : BaseApplication() {
                     }
                     }
                 }.start()
                 }.start()
             }
             }
-        } else if ("mk_h10_w_a133_1_chile".equals(BuildConfig.APP_DEVICE_TYPE) || "mk_h10_a133_1".equals(BuildConfig.APP_DEVICE_TYPE)) {
-            //志合A133主板
-            SerialPortUtil.getInstance().openSerialPort("/dev/ttyS2")
+        } else if ("mk_h10_w_a133_1_chile" == BuildConfig.APP_DEVICE_TYPE || "mk_h10_a133_1" == BuildConfig.APP_DEVICE_TYPE) {
+            if (BuildConfig.UI_TYPE == "mom") {
+                //月子中心版,用的新主板,按键板接串口0
+                SerialPortUtil.getInstance().openSerialPort("/dev/ttyS0")
+            } else {
+                //志合A133主板
+                SerialPortUtil.getInstance().openSerialPort("/dev/ttyS2")
 
 
-            //打开433串口0
-            SerialPortUtil433.getInstance().openSerialPort()
+                //打开433串口0
+                SerialPortUtil433.getInstance().openSerialPort()
+            }
         }
         }
 
 
         // 初始化 Toast 框架
         // 初始化 Toast 框架