修改了开启移动定位开关的逻辑
authorTrillGates <williamtrillgates@gmail.com>
Thu, 28 Oct 2021 09:53:12 +0000 (17:53 +0800)
committerTrillGates <williamtrillgates@gmail.com>
Thu, 28 Oct 2021 09:53:12 +0000 (17:53 +0800)
app/release/ICSer_V915_2110281750_release.apk [moved from app/release/ICSer_V914_2110201057_release.apk with 77% similarity]
app/release/output.json
app/src/main/java/com/enqualcomm/support/LocationClient.java
app/version_code.properties

similarity index 77%
rename from app/release/ICSer_V914_2110201057_release.apk
rename to app/release/ICSer_V915_2110281750_release.apk
index 9340992..a218be1 100644 (file)
Binary files a/app/release/ICSer_V914_2110201057_release.apk and b/app/release/ICSer_V915_2110281750_release.apk differ
index e683cbc..b1a044e 100644 (file)
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":914,"versionName":"2110201057","enabled":true,"outputFile":"ICSer_V914_2110201057_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V914_2110201057_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":915,"versionName":"2110281750","enabled":true,"outputFile":"ICSer_V915_2110281750_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V915_2110281750_release.apk","properties":{}}]
\ No newline at end of file
index fe192bf..93ece6a 100644 (file)
@@ -682,7 +682,6 @@ public class LocationClient {
                     stopCheckLocationResult();
 
 
-
                     String msg = "Location Fixed Type " + runtime.getLocationInstance().getLocationType() + " at " + runtime.getLocationInstance().getLocationTime() + " timeout " + timeout;
                     ICLogger.i(msg);
 
@@ -960,15 +959,16 @@ public class LocationClient {
     private boolean needLocationForBT() {
         updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。
         //如果没有动,且超时。则跳过定位
-        NoMoveTimeout = checkNoMoveTimeoutForBT();
+        if (skipMoveCheck || Config.GpsForceMoveCheck) {
+            NoMoveTimeout = true;
+        } else {
+            NoMoveTimeout = checkNoMoveTimeoutForBT();
+        }
         ICLogger.i("BT NoMoveTimeout " + NoMoveTimeout + ", forceLocation=" + forceLocation + ", Config.forceMoveCheck=" + Config.GpsForceMoveCheck + ", skipMoveCheck=" + skipMoveCheck);
 
         // 不强制定位 且 (WorkingMod 不是紧急模式 或者 强制进行移动检测),且 没有移动过
-        if ((forceLocation != 1) &&
-                (Config.GpsForceMoveCheck == true) &&
-                (NoMoveTimeout) && (skipMoveCheck == false)) {
+        if ((forceLocation != 1) && NoMoveTimeout) {
             ICLogger.i("No Move ,skip BT location!");
-
             return false;
         }
         //以目前逻辑,每次检测必然跟随蓝牙扫描,因此可以在此直接更新上一次的计步次数,配合下次的运动检测
@@ -979,13 +979,15 @@ public class LocationClient {
     private boolean needLocation() {
         updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。
         //如果没有动,且超时。则跳过定位
-        NoMoveTimeout = checkNoMoveTimeout();
+        if (skipMoveCheck || Config.GpsForceMoveCheck) {
+            NoMoveTimeout = false;
+        } else {
+            NoMoveTimeout = checkNoMoveTimeout();
+        }
         ICLogger.i(" NoMoveTimeout " + NoMoveTimeout + ", forceLocation=" + forceLocation + ", Config.forceMoveCheck=" + Config.GpsForceMoveCheck + ", skipMoveCheck=" + skipMoveCheck);
 
         // 不强制定位 且 (WorkingMod 不是紧急模式 或者 强制进行移动检测),且 没有移动过
-        if ((forceLocation != 1) &&
-                (Config.GpsForceMoveCheck == true) &&
-                (NoMoveTimeout) && (skipMoveCheck == false)) {
+        if ((forceLocation != 1) && NoMoveTimeout) {
             ICLogger.i("No Move ,skip BT location2!");
 
             return false;
@@ -1002,7 +1004,11 @@ public class LocationClient {
             return;
         }
         //如果没有动,且超时。则跳过定位
-        NoMoveTimeout = checkNoMoveTimeout();
+        if (skipMoveCheck || Config.GpsForceMoveCheck) {
+            NoMoveTimeout = false;
+        } else {
+            NoMoveTimeout = checkNoMoveTimeout();
+        }
           /*
         不强制定位(一次性强制取消移动检测用,定位后会恢复) &&
          (( NORMAL_MOD , LOWPOWER_MOD, CUSTOM_MODE_WIFI  任意一种) || 强制移动检测(其它协议需GPS要强制移动检测用) ) &&
@@ -1010,8 +1016,8 @@ public class LocationClient {
          都满足才检测
          */
         if ((forceLocation != 1) &&
-                (((mod == ICLocation.NORMAL_MOD) || (mod == ICLocation.LOWPOWER_MOD) || (mod == ICLocation.CUSTOM_MOD8_WIFI)) || Config.GpsForceMoveCheck == true) &&
-                (NoMoveTimeout) && (skipMoveCheck == false)) {
+                ((mod == ICLocation.NORMAL_MOD) || (mod == ICLocation.LOWPOWER_MOD) ||
+                        (mod == ICLocation.CUSTOM_MOD8_WIFI)) && NoMoveTimeout) {
             ICLogger.i("No Move ,skip location!");
             return;
         }
index e2462cd..f21f2ff 100644 (file)
@@ -1,2 +1,2 @@
-#Wed Oct 20 10:57:06 CST 2021\r
-VERSION_CODE=914\r
+#Thu Oct 28 17:50:50 CST 2021\r
+VERSION_CODE=915\r