From: TrillGates Date: Tue, 9 Nov 2021 06:29:34 +0000 (+0800) Subject: 修改为默认跳过移动检测 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=d3f2e2cc92664450b0a14d039884c89127ec6c29;p=icsupport.git 修改为默认跳过移动检测 --- diff --git a/app/release/ICSer_V916_2111031101_release.apk b/app/release/ICSer_V919_2111091116_release.apk similarity index 77% rename from app/release/ICSer_V916_2111031101_release.apk rename to app/release/ICSer_V919_2111091116_release.apk index 38f36202..9fd067be 100644 Binary files a/app/release/ICSer_V916_2111031101_release.apk and b/app/release/ICSer_V919_2111091116_release.apk differ diff --git a/app/release/output.json b/app/release/output.json index 39eb34bc..9098d54b 100644 --- a/app/release/output.json +++ b/app/release/output.json @@ -1 +1 @@ -[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":916,"versionName":"2111031101","enabled":true,"outputFile":"ICSer_V916_2111031101_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V916_2111031101_release.apk","properties":{}}] \ No newline at end of file +[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":919,"versionName":"2111091116","enabled":true,"outputFile":"ICSer_V919_2111091116_release.apk","fullName":"release","baseName":"release"},"path":"ICSer_V919_2111091116_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 ce1649e8..5eb7bb65 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -242,8 +242,9 @@ 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) { SharePreferenceUtil.setPrefInt(context, KEYDurationOfVibration, cycle); } @@ -374,7 +375,7 @@ public class Config { runtime.setPpgTestCycleInMinutes(Config.getPPGTestCycleInMinutes(context)); runtime.getLocationInstance().setLocation_cycle(Config.getLocationCycle(context)); runtime.getLocationInstance().setWorkingMod(Config.getLocationMode(context)); - ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod() + " SkipMoveCheck " +LocationClient.getSkipMoveCheck()); + ICLogger.i("current Cycles PPG " + runtime.getPpgTestCycleInMinutes() + " , LocationCycle " + runtime.getLocationInstance().getLocation_cycle() + " LocationMode " + runtime.getLocationInstance().getWorkingMod() + " SkipMoveCheck " + LocationClient.getSkipMoveCheck()); int mastervolume = getMasterVolume(context); ICAudioManager.setMasterVolume(context, mastervolume); @@ -1087,7 +1088,7 @@ public class Config { DefaultLocationCycle = 15 * 60; DefaultPPGTestCycleInMinutes = 15; DefaultTemperatureTestCycle = 15 * 60; - } else if (Config.custom_name.equals("Gator") ) { + } else if (Config.custom_name.equals("Gator")) { Config.ConfigAlarm(Runtime.AlarmType.ALARM_SOS, true); Config.ConfigAlarm(Runtime.AlarmType.ALARM_LOWBATTERY, true); Config.ConfigAlarm(Runtime.AlarmType.ALARM_WEARED, true); diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java index 34ede47f..f178e01b 100644 --- a/app/src/main/java/com/enqualcomm/support/LocationClient.java +++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java @@ -104,7 +104,6 @@ public class LocationClient { private String mCellInfo; - private LBSHelper mLbsHelper; private static BTHelper btHelper = null; @@ -869,10 +868,12 @@ 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) { + ICLogger.d("_skipMoveCheck ==> " + _skipMoveCheck); skipMoveCheck = _skipMoveCheck; } @@ -956,19 +957,20 @@ public class LocationClient { //如果LBS变化了,我们就认为位置改变了 if (checkLBS()) { ICLogger.d("ON LBS CHANGE..."); - return true; + return false; } noMove = (runtime.getTotalStepCount() - runtime.getLastStepCount() <= 0); runtime.updateFZDDevStatusMoving(!noMove); //设置当前运动状态 ICLogger.i("checkNoMoveTimeout last_noMove " + last_noMove + " noMove " + noMove + " lastStepCount " + runtime.getLastStepCount() + " StepCount " + runtime.getTotalStepCount()); - if (last_noMove == false && noMove == true) { + if (!last_noMove && noMove) { first_NoMove_timestamp = System.currentTimeMillis(); - } else if (noMove == false) { + } else if (!noMove) { first_NoMove_timestamp = 0; } last_noMove = noMove; //属于 判断是否 不动的状态超时 - if (noMove && first_NoMove_timestamp > 0.01 && System.currentTimeMillis() - first_NoMove_timestamp > MaxNoMoveTimeout) { + if (noMove && first_NoMove_timestamp > 0.01 && + System.currentTimeMillis() - first_NoMove_timestamp > MaxNoMoveTimeout) { ICLogger.i(" checkNoMoveTimeout true "); return true; } else { @@ -978,10 +980,11 @@ public class LocationClient { } private boolean needLocationForBT() { + ICLogger.d("skipMoveCheck ==> " + skipMoveCheck + " Config.GpsForceMoveCheck =-=> " + Config.GpsForceMoveCheck); updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。 //如果没有动,且超时。则跳过定位 if (skipMoveCheck || Config.GpsForceMoveCheck) { - NoMoveTimeout = true; + NoMoveTimeout = false; } else { NoMoveTimeout = checkNoMoveTimeoutForBT(); } @@ -999,6 +1002,7 @@ public class LocationClient { private boolean needLocation() { updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。 + ICLogger.d("needLocation ==> skipMoveCheck ==> " + skipMoveCheck + " Config.GpsForceMoveCheck == > " + Config.GpsForceMoveCheck); //如果没有动,且超时。则跳过定位 if (skipMoveCheck || Config.GpsForceMoveCheck) { NoMoveTimeout = false; @@ -1023,6 +1027,7 @@ public class LocationClient { ICLogger.i("locating ,skip location!"); return; } + ICLogger.d("skipMoveCheck ==> " + skipMoveCheck + " Config.GpsForceMoveCheck =-=> " + Config.GpsForceMoveCheck); //如果没有动,且超时。则跳过定位 if (skipMoveCheck || Config.GpsForceMoveCheck) { NoMoveTimeout = false; @@ -1043,13 +1048,13 @@ public class LocationClient { } if (NoMoveTimeout) { + ICLogger.d("gpsTimeoutCountOnNoMove ==> " + gpsTimeoutCountOnNoMove); //记录gps 无信号或者timeout的次数,超过5 就会停止使用gps定位,只要有一次 移动,或者设置为wifi定位,则清零。 if (gpsTimeoutCountOnNoMove >= MaxGpsTimeoutCountOnNoMove) { NoMoveAndNoGPSsignalSkipGpsFlag = true; } else { NoMoveAndNoGPSsignalSkipGpsFlag = false; } - } else { NoMoveAndNoGPSsignalSkipGpsFlag = false; gpsTimeoutCountOnNoMove = 0; //只要有一次 移动,则清零。 diff --git a/app/version_code.properties b/app/version_code.properties index b39733fe..a74e60e6 100644 --- a/app/version_code.properties +++ b/app/version_code.properties @@ -1,2 +1,2 @@ -#Wed Nov 03 11:01:34 CST 2021 -VERSION_CODE=916 +#Tue Nov 09 11:16:59 CST 2021 +VERSION_CODE=919