From: snickersun Date: Sat, 14 Nov 2020 06:10:26 +0000 (+0800) Subject: 1、计步00:00点重置时，运动检测也重置 X-Git-Url: http://git.snicker.com.cn/Users/apple/Desktop/static/gitweb.css?a=commitdiff_plain;h=8719308caa43487310ce734beaa3cf667aa65499;p=protocol_srv.git 1、计步00:00点重置时，运动检测也重置 2、移动判定公式改为当前计步数-上次计步数 >=0, 防止00:00问题造成判定失败 3、默认音量15，震动1秒 --- diff --git a/app/app.iml b/app/app.iml deleted file mode 100644 index 497b2ac8..00000000 --- a/app/app.iml +++ /dev/null @@ -1,136 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index a098a708..dab0a41f 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -33,9 +33,6 @@ public class Config { public static boolean forceMoveCheck=true; public static boolean forceWearCheck=true; - private static int DurationOfVibration = 10; - private static int MasterVolume = 10; - private static final String KEYDurationOfVibration = "DurationVib"; private static final String KeyMasterVolume = "MasterVolume"; @@ -172,7 +169,7 @@ public class Config { } public static int getDurationOfVibration(Context context){ - return SharPreferenceUtil.getPrefInt(context,KEYDurationOfVibration,1000); + return SharPreferenceUtil.getPrefInt(context,KEYDurationOfVibration,1); } public static void setMasterVolume(Context context, int cycle){ @@ -180,7 +177,7 @@ public class Config { } public static int getMasterVolume(Context context){ - return SharPreferenceUtil.getPrefInt(context,KeyMasterVolume,0); + return SharPreferenceUtil.getPrefInt(context,KeyMasterVolume,15); } diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index 45e0aa76..9ae656f1 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -1268,11 +1268,18 @@ public class CoreService extends Service { this.locationClient.updateStepCount(); //先记录下最后一次步数 runtime.getContextProxy().brodcastResetStepCount(runtime.getTotalStepCount()); updateSleepDate();//更新睡眠信息 - resetStepCount(); + + //更新 运动控制的上次步数 然后再resetstecount + //runtime.setLastStepCount(runtime.getTotalStepCount()-runtime.getLastStepCount()); + //runtime.setLastStepCountForBT(runtime.getTotalStepCount()-runtime.getLastStepCountForBT()); + resetStepCount(); + //此处本来应该把刚刚reset前运动的步数设置到计步器里，继续开始计步。 + // 由于计步接口没有提供设置步数。所以暂时只能清零，不能解决午夜还在运动的情况，会丢失一两次的数据。但是影响不大 + runtime.setLastStepCountForBT(0); + runtime.setLastStepCount(0); this.locationClient.updateStepCount(); //重置后马上跟新当前步数为0， 以便及时更新睡眠信息 一分钟内更新的步数可以忽略不记，从而平滑切换 0点reset 计步数据的计算问题 updateSleepDate();//更新睡眠信息 setCleanStepCountAlarm(); - Config.logBootDate(this);//重置步数的时候，要把开机时间也更新一下，否则第二天 任意时间重启都会造成计步数据清零 return Service.START_STICKY; } else if (ACTION_HEATR_RATE_START.equals(paramIntent.getAction())) { diff --git a/app/src/main/java/com/enqualcomm/support/LocationClient.java b/app/src/main/java/com/enqualcomm/support/LocationClient.java index c9aadbcc..9074ea46 100644 --- a/app/src/main/java/com/enqualcomm/support/LocationClient.java +++ b/app/src/main/java/com/enqualcomm/support/LocationClient.java @@ -839,7 +839,7 @@ public void updateCellInfo() { * else return false */ private boolean checkNoMoveTimeoutForBT(){ - noMove=runtime.getLastStepCountForBT() == runtime.getTotalStepCount(); + noMove= (( runtime.getTotalStepCount() - runtime.getLastStepCountForBT())<=0) ; runtime.updateFZDDevStatusMoving(!noMove); //设置当前运动状态 ICLogger.i("BT checkNoMoveTimeout last_noMoveForBT "+last_noMoveForBT+" noMove "+noMove+ " lastStepCountForBT "+runtime.getLastStepCountForBT()+" StepCount "+runtime.getTotalStepCount()); if (last_noMoveForBT==false&& noMove==true){ @@ -864,7 +864,7 @@ public void updateCellInfo() { * else return false */ private boolean checkNoMoveTimeout(){ - noMove=runtime.getLastStepCount() == runtime.getTotalStepCount(); + 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){ diff --git a/dNSCache/dNSCache.iml b/dNSCache/dNSCache.iml deleted file mode 100644 index 8d78d7a1..00000000 --- a/dNSCache/dNSCache.iml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/icsupport.iml b/icsupport.iml index b525d968..30277a3e 100644 --- a/icsupport.iml +++ b/icsupport.iml @@ -8,10 +8,11 @@ - + +