From bf3895922785d00ea57418e338544495d84e96ec Mon Sep 17 00:00:00 2001 From: snicker Date: Tue, 31 Mar 2020 11:30:02 +0800 Subject: [PATCH] =?utf8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4=E5=8F=98?= =?utf8?q?=E5=8C=96=E5=90=8E=EF=BC=8C=E9=97=B9=E9=93=83=E5=A4=B1=E6=95=88?= =?utf8?q?=E9=97=AE=E9=A2=98=EF=BC=81=20=E4=BF=AE=E6=94=B9=20LocationCycle?= =?utf8?q?=20=E9=BB=98=E8=AE=A4=E5=80=BC=E4=B8=BA=20900=E7=A7=92.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../java/com/enqualcomm/support/Config.java | 3 +- .../com/enqualcomm/support/CoreService.java | 29 ++++++++++--------- .../support/service/SilentManager.java | 9 ++++++ 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/com/enqualcomm/support/Config.java b/app/src/main/java/com/enqualcomm/support/Config.java index fd339d1d..e5a6c3cb 100644 --- a/app/src/main/java/com/enqualcomm/support/Config.java +++ b/app/src/main/java/com/enqualcomm/support/Config.java @@ -145,7 +145,6 @@ public class Config { final static String KeyHeartBeatCycle="ServerHeartBeatCycle"; - final static String KeyLogFtpServer="FtpServerHost"; final static String KeyLogFtpUser="FtpServerUser"; final static String KeyLogFtpPWD="FtpServerPWD"; @@ -295,7 +294,7 @@ public class Config { } public static int getLocationCycle(Context context){ - return SharPreferenceUtil.getPrefInt(context,KeyLocationCycle,15); + return SharPreferenceUtil.getPrefInt(context,KeyLocationCycle,900); } public static void setLocationMode(Context context,int mode){ diff --git a/app/src/main/java/com/enqualcomm/support/CoreService.java b/app/src/main/java/com/enqualcomm/support/CoreService.java index c845ea16..fc255211 100644 --- a/app/src/main/java/com/enqualcomm/support/CoreService.java +++ b/app/src/main/java/com/enqualcomm/support/CoreService.java @@ -150,7 +150,7 @@ public class CoreService extends Service { } }; - private BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { + private BroadcastReceiver TimeChangeBroadcastReceiver = new BroadcastReceiver() { public void onReceive(Context param1Context, Intent param1Intent) { StringBuilder stringBuilder2 = new StringBuilder(); stringBuilder2.append("broadcastReceiver alarmCycle action=="); @@ -160,14 +160,17 @@ public class CoreService extends Service { stringBuilder1.append("时间变化"); stringBuilder1.append(param1Intent.getAction()+stringBuilder2.toString()); ICLogger.i(stringBuilder1.toString()); - CoreService.this.setSleepAlarm(); - CoreService.this.setWakeAlarm(); - CoreService.this.setHeartAlarm(); - CoreService.this.setHeartRateDetectAlarm(runtime.getPpgTestCycle()); - CoreService.this.setWeatherAlarm(); - CoreService.this.setLocationAlarm(runtime.getLocationInstance().getWorkingMod()); - if (CoreService.this.cmcm_call_eiot_into_powersave_mode() == 0) - AlarmWakeUp.isNeedWakeUpAlarm(CoreService.this.runtime); + + //只有需要确定绝对时间点启动的Alarm需要重置，相对时间点的Alarm不需要重置。防止永远不能正常登陆。 + setSleepAlarm(); + setWakeAlarm(); +// setHeartAlarm(); +// setHeartRateDetectAlarm(runtime.getPpgTestCycle()); + setWeatherAlarm(); + runtime.getContextProxy().sendBroadcast("com.enqualcomm.support.ACTION_ALARM_ALARM_CHANGE",runtime); //更新Alarm + // setLocationAlarm(runtime.getLocationInstance().getWorkingMod()); + if (cmcm_call_eiot_into_powersave_mode() == 0) + AlarmWakeUp.isNeedWakeUpAlarm(runtime); } }; private BroadcastReceiver broadcastSOSReceiver = new BroadcastReceiver() { @@ -362,7 +365,7 @@ public class CoreService extends Service { ICLogger.i("getInvokeHandlerServiceChain"); SendChatMessage sendChatMessage = new SendChatMessage(); HeartRateManager heartRateManager= new HeartRateManager(this.runtime,this.connection); - SilentManager silentManager = new SilentManager(); + SilentManager silentManager = SilentManager.getInstance();// new SilentManager(); sendChatMessage.setNext(heartRateManager); heartRateManager.setNext(silentManager); return sendChatMessage; @@ -541,9 +544,9 @@ public class CoreService extends Service { //注册接收 时间和tiimezone 变更消息 IntentFilter intentFilter = new IntentFilter(); -// intentFilter.addAction("android.intent.action.TIME_SET"); + intentFilter.addAction("android.intent.action.TIME_SET"); intentFilter.addAction("android.intent.action.TIMEZONE_CHANGED"); - registerReceiver(this.broadcastReceiver, intentFilter); + registerReceiver(this.TimeChangeBroadcastReceiver, intentFilter); //注册接收 screen on/off 消息 intentFilter = new IntentFilter(); @@ -956,7 +959,7 @@ public class CoreService extends Service { this.invokeHandlerServiceChain.processDetach(this.connection, this.runtime); this.locationClient.deinit(); this.connection.close(); - unregisterReceiver(this.broadcastReceiver); + unregisterReceiver(this.TimeChangeBroadcastReceiver); unregisterReceiver(this.screenOnReceiver); unregisterReceiver(this.AtCallbackBroadcastReceiver); batteryUtil.unregisterBroadReceiver(); diff --git a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java index a0a7928e..fe70d794 100644 --- a/app/src/main/java/com/enqualcomm/support/service/SilentManager.java +++ b/app/src/main/java/com/enqualcomm/support/service/SilentManager.java @@ -70,6 +70,15 @@ public class SilentManager extends AbstractInvokeHandlerService { private int mStheartRateInterval; private int mTodayWeek; private boolean mValue_isSilence; + + + private static SilentManager mSilentManger=null; + + public static SilentManager getInstance(){ + if (mSilentManger==null) + mSilentManger=new SilentManager(); + return mSilentManger; + } private PhoneStateListener phoneStateListener = new PhoneStateListener() { public void onCallStateChanged(int var1, String var2) { super.onCallStateChanged(var1, var2); -- 2.17.1