From: TrillGates <williamtrillgates@gmail.com>
Date: Tue, 9 Nov 2021 06:30:24 +0000 (+0800)
Subject: 默认跳过移动检测
X-Git-Url: http://git.snicker.com.cn/?a=commitdiff_plain;h=bbe7c1403763728f88144a4a00f4106d9aed1af1;p=icsupport.git

默认跳过移动检测
---

diff --git a/app/release/ICSer_V1007_2111031736_release.apk b/app/release/ICSer_V1008_2111081657_release.apk
similarity index 78%
rename from app/release/ICSer_V1007_2111031736_release.apk
rename to app/release/ICSer_V1008_2111081657_release.apk
index 0ce13559..1110a3bf 100644
Binary files a/app/release/ICSer_V1007_2111031736_release.apk and b/app/release/ICSer_V1008_2111081657_release.apk differ
diff --git a/app/release/output.json b/app/release/output.json
index 0d2898fd..246d6558 100644
--- a/app/release/output.json
+++ b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1007,"versionName":"2111031736","enabled":true,"outputFile":"ICSer_V1007_2111031736_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1007_2111031736_release.apk","properties":{}}]
\ No newline at end of file
+[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1008,"versionName":"2111081657","enabled":true,"outputFile":"ICSer_V1008_2111081657_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V1008_2111081657_release.apk","properties":{}}]
\ No newline at end of file
diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java
index 514d6763..86e2a07d 100644
--- a/app/src/main/java/com/enqualcomm/support/Config.java
+++ b/app/src/main/java/com/enqualcomm/support/Config.java
@@ -230,7 +230,7 @@ public class Config {
     }
 
     public static boolean getSkipMoveCheckFlagGlobal(Context context) {
-        return SharePreferenceUtil.getPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, false);
+        return SharePreferenceUtil.getPrefBoolean(context, KEYGlobalSkipMoveCheckFlag, true);
     }
 
     public static void setDurationOfVibration(Context context, int cycle) {
diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java
index b3398257..371732f5 100644
--- a/app/src/main/java/com/enqualcomm/support/LocationClient.java
+++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java
@@ -848,7 +848,7 @@ public class LocationClient {
 
     private static int gpsTimeoutCountOnNoMove = 0;// 记录gps 无信号或者timeout的次数，超过5 就会停止使用gps定位，只要有一次 移动，或者设置为wifi定位，则清零。
     private static final int MaxGpsTimeoutCountOnNoMove = 5;//不动的情况最大的gps搜不到星的次数。
-    private static boolean skipMoveCheck = false;
+    private static boolean skipMoveCheck = true;
 
 
     public static void setSkipMoveCheck(boolean _skipMoveCheck) {
@@ -958,6 +958,8 @@ public class LocationClient {
 
     private boolean needLocationForBT() {
         updateStepCount();//update StepCount,保证每次定位前，计步数据是最新的。防止丢数据。
+        ICLogger.d("skipMoveCheck ==> " + skipMoveCheck);
+        ICLogger.d("Config.GpsForceMoveCheck ==> " + Config.GpsForceMoveCheck);
         //如果没有动，且超时。则跳过定位
         if (skipMoveCheck || Config.GpsForceMoveCheck) {
             mNoMoveTimeout = false;
@@ -1008,6 +1010,8 @@ public class LocationClient {
             ICLogger.i("locating ,skip location!");
             return;
         }
+        ICLogger.d("skipMoveCheck ==> " + skipMoveCheck);
+        ICLogger.d("Config.GpsForceMoveCheck ==> " + Config.GpsForceMoveCheck);
         //如果没有动，且超时。则跳过定位
         //如果超时，返回true，表示静止
         //如果是false表示移动了
diff --git a/app/version_code.properties b/app/version_code.properties
index 56fb8d24..91aa1cbc 100644
--- a/app/version_code.properties
+++ b/app/version_code.properties
@@ -1,2 +1,2 @@
-#Wed Nov 03 17:36:05 CST 2021
-VERSION_CODE=1007
+#Mon Nov 08 16:57:58 CST 2021
+VERSION_CODE=1008