From 035d1bf8dca87d315f644b471fdcd624868263b8 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Tue, 26 Dec 2023 09:03:46 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E5=A0=86=E6=A0=88=E6=BA=A2=E5=87=BA?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../watcher/services/HeartbeatService.kt | 26 ++++++++++--------- .../watcher/utils/BatteryHelper.kt | 20 +++++++++----- .../res/layout/activity_sensor_threshold.xml | 2 ++ 3 files changed, 29 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt index a736a5c..17076bd 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/services/HeartbeatService.kt @@ -43,18 +43,20 @@ class HeartbeatService : IntentService("HeartbeatService") { @SuppressLint("HardwareIds") private fun handleActionStart(intent: Intent) { - heartConter++ - SimHelper.setNetStatus(isOnline()) - // 心跳 - devicesApi.heartBeat(LztekUtil.getSn()) - // 获取推流地址 - checkAndGetRtspUrl() - // 更新流量信息 - checkAndUpdateTrafficInfo() - // 睡眠30s - Thread.sleep(HEARTBEAT_TIME) - // 重新轮回 - handleActionStart(intent) + while (true) { + heartConter++ + SimHelper.setNetStatus(isOnline()) + // 心跳 + devicesApi.heartBeat(LztekUtil.getSn()) + // 获取推流地址 + checkAndGetRtspUrl() + // 更新流量信息 + checkAndUpdateTrafficInfo() + // 睡眠30s + Thread.sleep(HEARTBEAT_TIME) +// // 重新轮回 +// handleActionStart(intent) + } } var heartConter = -1 diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/BatteryHelper.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/BatteryHelper.kt index 74b13f4..a1fbc3e 100644 --- a/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/BatteryHelper.kt +++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/utils/BatteryHelper.kt @@ -23,9 +23,15 @@ object BatteryHelper { val action = intent?.action if (Intent.ACTION_BATTERY_CHANGED == action) { val level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)!! + val status = intent.getIntExtra(BatteryManager.EXTRA_STATUS, -1); + val isCharging = + (status == BatteryManager.BATTERY_STATUS_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL) notifyUser(level) mLevel = level - Log.i(this@BatteryHelper.javaClass.name, "onReceive level = $level") + Log.i( + this@BatteryHelper.javaClass.name, + "onReceive level = $level isCharging = $isCharging" + ) callbacks.forEach { it.onLevel(level, batteryManager?.isCharging == true) } @@ -38,15 +44,15 @@ object BatteryHelper { } private fun notifyUser(level: Int) { - val tip = if (level < 10) { - if (mLevel >= 10 || mLevel == -1) { - "电池电量低于10%" + val tip = if (level <= 10) { + if (mLevel > 10 || mLevel == -1) { + "电池电量不足，请及时充电！" } else { "" } - } else if (level < 20) { - if (mLevel >= 20 || mLevel == -1) { - "电池电量低与20%" + } else if (level <= 20) { + if (mLevel > 20 || mLevel == -1) { + "电池电量低，请注意充电！" } else { "" } diff --git a/app/src/main/res/layout/activity_sensor_threshold.xml b/app/src/main/res/layout/activity_sensor_threshold.xml index d5e9ca9..a4d13c3 100644 --- a/app/src/main/res/layout/activity_sensor_threshold.xml +++ b/app/src/main/res/layout/activity_sensor_threshold.xml @@ -22,6 +22,7 @@ android:background="@drawable/cloud_sync_btn_bg" android:paddingStart="@dimen/_12dp" android:focusable="true" + android:nextFocusDown="@id/et_min" android:inputType="number" android:textColor="@color/white" android:textSize="@dimen/_30dp" /> @@ -43,6 +44,7 @@ android:background="@drawable/cloud_sync_btn_bg" android:paddingStart="@dimen/_12dp" android:focusable="true" + android:nextFocusDown="@id/et_max" android:inputType="number" android:textColor="@color/white" android:textSize="@dimen/_30dp" />