Bladeren bron

3128分机的优化

weizhengliang 2 weken geleden
bovenliggende
commit
e4ba9250cb

+ 16 - 6
android_bed/src/main/java/com/wdkl/app/ncs/callingbed/activity/SystemActivity.kt

@@ -11,6 +11,7 @@ import com.wdkl.app.ncs.callingbed.BuildConfig
 import com.wdkl.app.ncs.callingbed.R
 import com.wdkl.app.ncs.callingbed.databinding.CallingbedSettingMainBinding
 import com.wdkl.app.ncs.callingbed.dialog.*
+import com.wdkl.app.ncs.callingbed.helper.AppUtil
 import com.wdkl.app.ncs.callingbed.helper.NetHelper
 import com.wdkl.app.ncs.callingbed.helper.UpdateTipsDialogHelper
 import com.wdkl.app.ncs.callingbed.helper.Utils
@@ -124,13 +125,22 @@ class SystemActivity : BaseActivity<SystemActivityPresenter, CallingbedSettingMa
             }
 
             if (clickTimes > 15) {
-                showMessage("enable status bar")
-                Utils.hideStatusBar(activity, false)
-                clickTimes = 1
+                if ("rk3128".equals(Build.MODEL)) {
+                    //打开调试
+                    if (AppUtil.openNetworkDebug()) {
+                        showMessage(R.string.enable_debug)
+                    } else {
+                        showMessage("open debug failed.")
+                    }
+                } else {
+                    showMessage("enable status bar")
+                    Utils.hideStatusBar(activity, false)
+                    clickTimes = 1
 
-                if (BuildConfig.flag == Constant.DEV_W_A133) {
-                    //关闭守护进程
-                    ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("", 15000, false)
+                    if (BuildConfig.flag == Constant.DEV_W_A133) {
+                        //关闭守护进程
+                        ZhylManager.getInstance(BaseApplication.appContext).sys_setDaemonsActivity("", 15000, false)
+                    }
                 }
             }
             clickTime = time

+ 3 - 1
bedlib/src/main/java/serialporttest/utils/SerialPortUtil.java

@@ -1,5 +1,6 @@
 package serialporttest.utils;
 
+import android.os.Build;
 import android.text.TextUtils;
 import android.util.Log;
 
@@ -397,7 +398,8 @@ public class SerialPortUtil {
                     }
                 }
             } else {
-                if (BuildConfig.feature_type.equals("0")){
+                //rk3128主板使用老的功能板
+                if (BuildConfig.feature_type.equals("0") || "rk3128".equals(Build.MODEL)){
                     if (data.contains("$") && data.contains("#")) {
                         if (null != onDataReceiveStringListener) {//add by waderson 20190708
                             onDataReceiveStringListener.serialPortBedOnclickString(data);