From: TrillGates <williamtrillgates@gmail.com>
Date: Thu, 28 Oct 2021 06:50:41 +0000 (+0800)
Subject: 修改了是否跳过移动检查的逻辑
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=f84ef396cd502c3db6f05aa714873054f35c38fe;p=icsupport.git

修改了是否跳过移动检查的逻辑
---

diff --git a/app/release/ICSer_V1000_2110281007_release.apk b/app/release/ICSer_V1001_2110281156_release.apk
similarity index 77%
rename from app/release/ICSer_V1000_2110281007_release.apk
rename to app/release/ICSer_V1001_2110281156_release.apk
index 8da5bbe8..c29ae6a6 100644
Binary files a/app/release/ICSer_V1000_2110281007_release.apk and b/app/release/ICSer_V1001_2110281156_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index a954683f..60227e5e 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1000,"versionName":"2110281007","enabled":true,"outputFile":"ICSer_V1000_2110281007_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1000_2110281007_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1001,"versionName":"2110281156","enabled":true,"outputFile":"ICSer_V1001_2110281156_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1001_2110281156_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index 56729461..ed5c2f0b 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -966,15 +966,20 @@ public class LocationClient {
         //如果没有动，且超时。则跳过定位
         //如果超时，返回true，表示静止
         //如果是false表示移动了
-
-        mNoMoveTimeout = checkNoMoveTimeout();
+        if (skipMoveCheck || Config.GpsForceMoveCheck) {
+            //进这里，表示跳过位置移动检查
+            //也就是表示移动了
+            mNoMoveTimeout = false;
+        } else {
+            mNoMoveTimeout = checkNoMoveTimeout();
+        }
 
 
         // 不强制定位 且 （WorkingMod 不是紧急模式 或者 强制进行移动检测），且 没有移动过
         if ((forceLocation != 1) &&
-                (((mod == ICLocation.NORMAL_MOD) || (mod == ICLocation.LOWPOWER_MOD) ||
-                        (mod == ICLocation.CUSTOM_MOD8_WIFI)) || Config.GpsForceMoveCheck == true) &&
-                (mNoMoveTimeout) && (skipMoveCheck == false)) {
+                ((mod == ICLocation.NORMAL_MOD) || (mod == ICLocation.LOWPOWER_MOD) ||
+                        (mod == ICLocation.CUSTOM_MOD8_WIFI)) &&
+                mNoMoveTimeout) {
             ICLogger.i("No Move ,skip location!");
             //走到这里返回的条件是
             //1.非强制定位
diff --git a/app/version_code.properties b/app/version_code.properties
index 1f324e74..4133261a 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Thu Oct 28 10:07:29 CST 2021
-VERSION_CODE=1000
+#Thu Oct 28 11:56:21 CST 2021
+VERSION_CODE=1001