修改跳过移动检测值的设置和获取
authorTrillGates <williamtrillgates@gmail.com>
Wed, 24 Nov 2021 06:38:32 +0000 (14:38 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Wed, 24 Nov 2021 06:38:32 +0000 (14:38 +0800)
app/src/main/java/com/enqualcomm/support/Config.java
app/src/main/java/com/ic/protocols/protocol_beehome.java

index 5eb7bb6..ee45798 100644 (file)
@@ -1,7 +1,9 @@
 package com.enqualcomm.support;
 
 import android.content.Context;
+import android.os.SystemProperties;
 import android.provider.Settings;
+import android.text.TextUtils;
 import android.util.JsonReader;
 
 import com.enqualcomm.support.bean.ICLocation;
@@ -238,11 +240,18 @@ public class Config {
 
 
     public static void setSkipMoveCheckFlagGlobal(Context context, boolean en) {
+        //修改的时候把prop的也修改掉
+        SystemProperties.set("persist.sys.skip_move", String.valueOf(en));
         SharePreferenceUtil.setPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, en);
     }
 
     public static boolean getSkipMoveCheckFlagGlobal(Context context) {
-        return SharePreferenceUtil.getPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, true);
+        boolean prefBoolean = SharePreferenceUtil.getPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, true);
+        String isSkipMoveStr = SystemProperties.get("persist.sys.skip_move");
+        if (TextUtils.isEmpty(isSkipMoveStr)) {
+            return prefBoolean;
+        }
+        return "true".equals(isSkipMoveStr);
     }
 
     public static void setDurationOfVibration(Context context, int cycle) {
@@ -383,7 +392,6 @@ public class Config {
         int duration = getDurationOfVibration(context);
         VibrateUtil.setVibPattern(duration * 1000);
 
-
     }
 
     public static void loadHearBeatSetting(Runtime runtime) {
index e6744d9..ec70a1b 100644 (file)
@@ -1172,18 +1172,17 @@ public class protocol_beehome {
         //080835 :指令流水号
         //XXXXXXXXXXXX : 表示文字内容GB2312编码
 
-        String[] cmdlist = cmd.split(",");
-        if (cmdlist.length == 4) {
-            String cmdindex = cmdlist[2];
-            String txtmsg = cmdlist[3];
-
-            txtmsg = Util.UrlGB2312ToUTF8(txtmsg);
-            StringMessage msg = AP40(cmdindex, 1);
+        String[] cmdList = cmd.split(",");
+        if (cmdList.length == 4) {
+            String cmdIndex = cmdList[2];
+            String txtMsg = cmdList[3];
+            txtMsg = Util.UrlGB2312ToUTF8(txtMsg);
+            StringMessage msg = AP40(cmdIndex, 1);
             //设定当前工作模式及循环频率
             connection.send(msg);
-            ICLogger.i("received Txt Msg " + txtmsg);
-            runtime.getContextProxy().sendMsgBroadcast(txtmsg, 0);
-            runtime.getContextProxy().saveMstToSMSDB(txtmsg);
+            ICLogger.i("received Txt Msg " + txtMsg);
+            runtime.getContextProxy().sendMsgBroadcast(txtMsg, 0);
+            runtime.getContextProxy().saveMstToSMSDB(txtMsg);
         } else {
             ICLogger.i("BP40 format error!");
         }
@@ -1259,22 +1258,22 @@ public class protocol_beehome {
 
     //立即定位反馈
     public static StringMessage AP16(String cmdindex) {
-//IWAP16,080835#
-//080835:指令流水号
+    //IWAP16,080835#
+    //080835:指令流水号
         return genStringMessage(cmdMap.get(CMD_TYPE.AP16), new StringBuffer(CMDHEADER).append(cmdMap.get(CMD_TYPE.AP16))
                 .append(CMDSPLIT).append(cmdindex)
                 .append(CMDEND).toString());
     }
 
-    //    立即定位指令(长链接有效)
+    //立即定位指令(长链接有效)
     public void handleBP16(Connection connection, Runtime runtime, String cmd) {
         //示例数据:IWBP16,867155030001063,335386
-//        IWBP16,353456789012345,080835#
-//        说明:
-//        IW:标识符
-//        BP16 : 命令字符
-//        353456789012345:IMEI号,设备唯一ID
-//        080835 :指令流水号
+        //IWBP16,353456789012345,080835#
+        //说明:
+        //IW:标识符
+        //BP16 : 命令字符
+        //353456789012345:IMEI号,设备唯一ID
+        //080835 :指令流水号
         String[] cmdlist = cmd.split(",");
         if (cmdlist.length == 3) {
             log("imei " + cmdlist[1] + ", cmdindex " + cmdlist[2]);