desc:堆栈溢出问题

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++
+        while (true) {
-        SimHelper.setNetStatus(isOnline())
+            heartConter++
-        // 心跳
+            SimHelper.setNetStatus(isOnline())
-        devicesApi.heartBeat(LztekUtil.getSn())
+            // 心跳
-        // 获取推流地址
+            devicesApi.heartBeat(LztekUtil.getSn())
-        checkAndGetRtspUrl()
+            // 获取推流地址
-        // 更新流量信息
+            checkAndGetRtspUrl()
-        checkAndUpdateTrafficInfo()
+            // 更新流量信息
-        // 睡眠30s
+            checkAndUpdateTrafficInfo()
-        Thread.sleep(HEARTBEAT_TIME)
+            // 睡眠30s
-        // 重新轮回
+            Thread.sleep(HEARTBEAT_TIME)
-        handleActionStart(intent)
+//            // 重新轮回
+//            handleActionStart(intent)
+        }
     }
 
     var heartConter = -1

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) {
+        val tip = if (level <= 10) {
-            if (mLevel >= 10 || mLevel == -1) {
+            if (mLevel > 10 || mLevel == -1) {
-                "电池电量低于10%"
+                "电池电量不足，请及时充电！"
             } else {
                 ""
             }
-        } else if (level < 20) {
+        } else if (level <= 20) {
-            if (mLevel >= 20 || mLevel == -1) {
+            if (mLevel > 20 || mLevel == -1) {
-                "电池电量低与20%"
+                "电池电量低，请注意充电！"
             } else {
                 ""
             }

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" />