-[{"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
stopCheckLocationResult();
-
String msg = "Location Fixed Type " + runtime.getLocationInstance().getLocationType() + " at " + runtime.getLocationInstance().getLocationTime() + " timeout " + timeout;
ICLogger.i(msg);
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;
}
//以目前逻辑,每次检测必然跟随蓝牙扫描,因此可以在此直接更新上一次的计步次数,配合下次的运动检测
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;
return;
}
//如果没有动,且超时。则跳过定位
- NoMoveTimeout = checkNoMoveTimeout();
+ if (skipMoveCheck || Config.GpsForceMoveCheck) {
+ NoMoveTimeout = false;
+ } else {
+ NoMoveTimeout = checkNoMoveTimeout();
+ }
/*
不强制定位(一次性强制取消移动检测用,定位后会恢复) &&
(( NORMAL_MOD , LOWPOWER_MOD, CUSTOM_MODE_WIFI 任意一种) || 强制移动检测(其它协议需GPS要强制移动检测用) ) &&
都满足才检测
*/
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;
}