-[{"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
}
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);
}
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);
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);
private String mCellInfo;
-
private LBSHelper mLbsHelper;
private static BTHelper btHelper = null;
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;
}
//如果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 {
}
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();
}
private boolean needLocation() {
updateStepCount();//update StepCount,保证每次定位前,计步数据是最新的。防止丢数据。
+ ICLogger.d("needLocation ==> skipMoveCheck ==> " + skipMoveCheck + " Config.GpsForceMoveCheck == > " + Config.GpsForceMoveCheck);
//如果没有动,且超时。则跳过定位
if (skipMoveCheck || Config.GpsForceMoveCheck) {
NoMoveTimeout = false;
ICLogger.i("locating ,skip location!");
return;
}
+ ICLogger.d("skipMoveCheck ==> " + skipMoveCheck + " Config.GpsForceMoveCheck =-=> " + Config.GpsForceMoveCheck);
//如果没有动,且超时。则跳过定位
if (skipMoveCheck || Config.GpsForceMoveCheck) {
NoMoveTimeout = false;
}
if (NoMoveTimeout) {
+ ICLogger.d("gpsTimeoutCountOnNoMove ==> " + gpsTimeoutCountOnNoMove);
//记录gps 无信号或者timeout的次数,超过5 就会停止使用gps定位,只要有一次 移动,或者设置为wifi定位,则清零。
if (gpsTimeoutCountOnNoMove >= MaxGpsTimeoutCountOnNoMove) {
NoMoveAndNoGPSsignalSkipGpsFlag = true;
} else {
NoMoveAndNoGPSsignalSkipGpsFlag = false;
}
-
} else {
NoMoveAndNoGPSsignalSkipGpsFlag = false;
gpsTimeoutCountOnNoMove = 0; //只要有一次 移动,则清零。