desc:充电逻辑完善

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/BatteryHelper.kt

@@ -25,25 +25,33 @@ object BatteryHelper {
                 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)
+                    (status == BatteryManager.BATTERY_STATUS_CHARGING)
                 notifyUser(level)
                 mLevel = level
                 Log.i(
                     this@BatteryHelper.javaClass.name,
-                    "onReceive level = $level isCharging = $isCharging"
+                    "onReceive level = $level, status = $status, isCharging = $isCharging"
                 )
                 callbacks.forEach {
-                    it.onLevel(level, batteryManager?.isCharging == true)
+                    it.onLevel(level, isCharging)
                 }
-            } else if (Intent.ACTION_POWER_CONNECTED == action) {
+            } /*else if (Intent.ACTION_POWER_CONNECTED == action) {
+                Log.i(
+                    this@BatteryHelper.javaClass.name,
+                    "onReceive ACTION_POWER_CONNECTED"
+                )
                 callbacks.forEach {
-                    it.onLevel(mLevel, batteryManager?.isCharging == true)
+                    it.onLevel(mLevel, true)
                 }
             } else if (Intent.ACTION_POWER_DISCONNECTED == action) {
+                Log.i(
+                    this@BatteryHelper.javaClass.name,
+                    "onReceive ACTION_POWER_DISCONNECTED"
+                )
                 callbacks.forEach {
-                    it.onLevel(mLevel, batteryManager?.isCharging == true)
+                    it.onLevel(mLevel, false)
                 }
-            }
+            }*/
         }
     }
 
@@ -83,8 +91,8 @@ object BatteryHelper {
 
     private fun watchBattery(context: Context) {
         val filter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
-        filter.addAction(Intent.ACTION_POWER_CONNECTED)
+//        filter.addAction(Intent.ACTION_POWER_CONNECTED)
-        filter.addAction(Intent.ACTION_POWER_DISCONNECTED)
+//        filter.addAction(Intent.ACTION_POWER_DISCONNECTED)
         context.registerReceiver(receiver, filter)
     }