From: TrillGates Date: Wed, 13 Oct 2021 12:32:27 +0000 (+0800) Subject: 1515 添加低电震动提醒 X-Git-Url: http://git.snicker.com.cn/css/static/gitweb.css?a=commitdiff_plain;h=7c94c28d5831fa46b1e0eac2e472bdb7ed4fb991;p=icsupport.git 1515 添加低电震动提醒 --- diff --git a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java index b5160d80..f177b915 100644 --- a/app/src/main/java/com/enqualcomm/support/bean/Runtime.java +++ b/app/src/main/java/com/enqualcomm/support/bean/Runtime.java @@ -633,14 +633,14 @@ public class Runtime { public static long lastLinkReceiveStamp = 0; - private boolean PowerConnected = false; + private boolean powerConnected = false; private long msPowerConnectionStatusChangedTime = 0; public void setPowerConnected(boolean connected) { - if (PowerConnected != connected) { + if (powerConnected != connected) { msPowerConnectionStatusChangedTime = System.currentTimeMillis(); - PowerConnected = connected; + powerConnected = connected; } } @@ -661,7 +661,7 @@ public class Runtime { } public boolean isPowerConnected() { - return PowerConnected; + return powerConnected; } private DnsUtil dnsUtil = null; diff --git a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java index 8e38dc22..1594a49e 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/BatteryUtil.java @@ -266,12 +266,58 @@ public class BatteryUtil { Intent intent = new ContextWrapper(context.getApplicationContext()).registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); int batLevel = (intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1) * 100) / intent.getIntExtra(BatteryManager.EXTRA_SCALE, -1); - + //这是个独立的分支,不影响其他的 + //这个方法会在心跳的时候调用 + //1515 添加低电震动提醒 + handleBatteryLevelVibrate(batLevel); process_battery_level(context, batLevel); - return batLevel; } + /** + * 这个是弹窗的标记量: + * 修改时机 + * - 没有插电的情况下: + * - 电量在区间[30~20)间为4 + * - 电量在区间[20~10)间为2 + * - 电量在区间[10~0)间为1 + * - 插电的情况下: + * 插电则为0 + * 如果用户没有充满,拔电,这个时候也会震动 + */ + private int lowBatteryWarningFlag = 1; + + private void handleBatteryLevelVibrate(int lev) { + boolean haveBatteryChange = mRuntime.getHaveBatteryChange(); + ICLogger.d("haveBatteryChange ==> " + haveBatteryChange); + if (haveBatteryChange) { + lowBatteryWarningFlag = 0; + return; + } + boolean shouldVibrate; + if (lev <= 30 && lev > 20) { + //不为4表示这个段不有震动 + shouldVibrate = lowBatteryWarningFlag != 4; + lowBatteryWarningFlag = 1 << 2; + } else if (lev <= 20 && lev > 10) { + shouldVibrate = lowBatteryWarningFlag != 2; + lowBatteryWarningFlag = 1 << 1; + } else { + shouldVibrate = lowBatteryWarningFlag != 1; + lowBatteryWarningFlag = 1; + } + //1515 添加低电震动提醒 + //百分之30的时候会震动(没有charge的时候) + //百分之20的时候会震动(没有charge的时候) + //百分之10的时候会震动(没有charge的时候) + //当用户按了power按键则会震动消失 + //在开始震动的时候,去监听屏幕变化,屏幕亮起或者暗下,取消震动后取消监听 + if (shouldVibrate) { + //发动引擎,让手表抖动 + VibrateUtil.getInstance(mRuntime.getContextProxy().context).vibrateOnForBattery(); + } + } + public boolean isPowerConnected(Context context) { diff --git a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java index 25fefa8b..84418a9f 100644 --- a/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java +++ b/app/src/main/java/com/enqualcomm/support/utils/VibrateUtil.java @@ -1,7 +1,11 @@ package com.enqualcomm.support.utils; +import android.content.BroadcastReceiver; import android.content.Context; +import android.content.Intent; +import android.content.IntentFilter; import android.os.Vibrator; +import android.support.v4.app.INotificationSideChannel; import static android.content.Context.VIBRATOR_SERVICE; @@ -34,6 +38,24 @@ public class VibrateUtil { patter_item = l; } + public void vibrateOnForBattery() { + //不断地震动,并且监听屏幕变化,当屏幕开,或者关的时候,停止震动,取消监听 + //设置监听 + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction(Intent.ACTION_SCREEN_ON); + intentFilter.addAction(Intent.ACTION_SCREEN_OFF); + mContext.registerReceiver(broadcastReceiver, intentFilter); + vibrator.vibrate(1000 * 60 * 60);//不循环 + } + + private final BroadcastReceiver broadcastReceiver = new BroadcastReceiver() { + @Override + public void onReceive(Context context, Intent intent) { + vibrator.cancel(); + mContext.unregisterReceiver(this); + } + }; + public void vibrateOn(boolean on) { if (vibrator != null) { if (on) diff --git a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java index 6d29b6d0..bb7c7d4c 100644 --- a/app/src/main/java/com/ic/protocols/protocolAPIHelper.java +++ b/app/src/main/java/com/ic/protocols/protocolAPIHelper.java @@ -579,13 +579,10 @@ public class protocolAPIHelper { protocolfzd_handler.sendVoice(duration, remoteNum, content, voiceId); break; case Config.PROTOCOL_MQTT: - break; case PROTOCOL_ANAN: - break; case Config.PROTOCOL_S123: - break; case Config.PROTOCOL_GATOR: protocolgator_handler.sendVoicePackage(duration, remoteNum, content, voiceId); @@ -608,16 +605,12 @@ public class protocolAPIHelper { protocolfzd_handler.sendPicture(remoteNum, imagePath, imageId); break; case Config.PROTOCOL_MQTT: - break; case PROTOCOL_ANAN: - break; case Config.PROTOCOL_S123: - break; case Config.PROTOCOL_GATOR: - break; }