From 2bf63533ec5ac72de60f606d68bea8b349095ebb Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Wed, 20 Dec 2023 15:01:07 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E7=94=B5=E6=B1=A0=E4=B8=80=E9=80=9A?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |   1 +
 .../watcher/ui/view/CommonTopBar.kt           |   6 +-
 .../watcher/utils/BatteryHelper.kt            |  61 +++++++++++++++---
 .../res/drawable-hdpi/battery_charging.png    | Bin 0 -> 3081 bytes
 app/src/main/res/drawable/battery.xml         |   4 ++
 5 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/battery_charging.png

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f0ca2c5..757da5e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -28,6 +28,7 @@
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACTION_POWER_CONNECTED" />
 
     <uses-feature
         android:glEsVersion="0x00020000"
diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt
index 0e9affa..7d63469 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/ui/view/CommonTopBar.kt
@@ -59,10 +59,10 @@ class CommonTopBar : LinearLayout {
     }
 
     private val batteryCallback = object : BatteryHelper.OnBatteryLevelCallback {
-        override fun onLevel(level: Int) {
-            Log.i(this@CommonTopBar.javaClass.name, "batteryCallback onLevel = $level")
+        override fun onLevel(level: Int, charging: Boolean) {
+            Log.i(this@CommonTopBar.javaClass.name, "batteryCallback onLevel = $level  charging = $charging")
             mBinding?.root?.post {
-                mBinding?.battery?.setImageLevel(level)
+                mBinding?.battery?.setImageLevel(if (charging) 200 else level)
                 mBinding?.batteryTxt?.text = "${level.toString()}%"
                 dealForNet4()
             }
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 6675f65..74b13f4 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
@@ -6,37 +6,82 @@ import android.content.Intent
 import android.content.IntentFilter
 import android.os.BatteryManager
 import android.util.Log
+import com.common.commonlib.CommonApplication
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+
 
 object BatteryHelper {
     private var callbacks = mutableListOf<OnBatteryLevelCallback>()
     private var mLevel = -1;
+    private var batteryManager: BatteryManager? = null
+//    private var charging = false;
 
     private val receiver = object : BroadcastReceiver() {
         override fun onReceive(context: Context?, intent: Intent?) {
-            val level = intent?.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)
-            mLevel = level!!
-            Log.i(this@BatteryHelper.javaClass.name, "onReceive level = $level")
-            callbacks.forEach {
-                if (level != null) {
-                    it.onLevel(level)
+            val action = intent?.action
+            if (Intent.ACTION_BATTERY_CHANGED == action) {
+                val level = intent.getIntExtra(BatteryManager.EXTRA_LEVEL, -1)!!
+                notifyUser(level)
+                mLevel = level
+                Log.i(this@BatteryHelper.javaClass.name, "onReceive level = $level")
+                callbacks.forEach {
+                    it.onLevel(level, batteryManager?.isCharging == true)
                 }
+            } /*else if (Intent.ACTION_POWER_CONNECTED == action) {
+                charging = true
+            } else if (Intent.ACTION_POWER_DISCONNECTED == action) {
+                charging = false
+            }*/
+        }
+    }
+
+    private fun notifyUser(level: Int) {
+        val tip = if (level < 10) {
+            if (mLevel >= 10 || mLevel == -1) {
+                "电池电量低于10%"
+            } else {
+                ""
+            }
+        } else if (level < 20) {
+            if (mLevel >= 20 || mLevel == -1) {
+                "电池电量低与20%"
+            } else {
+                ""
+            }
+        } else if (level == 100) {
+            if (mLevel < 100) {
+                "充电完成"
+            } else {
+                ""
+            }
+        } else {
+            ""
+        }
+        if (tip.isNotEmpty()) {
+            GlobalScope.launch(Dispatchers.Main) {
+                CommonApplication.getContext()?.showToast(tip)
             }
         }
     }
 
     fun init(context: Context) {
         watchBattery(context)
+        batteryManager = context.getSystemService(Context.BATTERY_SERVICE) as BatteryManager
     }
 
     private fun watchBattery(context: Context) {
         val filter = IntentFilter(Intent.ACTION_BATTERY_CHANGED)
+//        filter.addAction(Intent.ACTION_POWER_CONNECTED)
+//        filter.addAction(Intent.ACTION_POWER_DISCONNECTED)
         context.registerReceiver(receiver, filter)
     }
 
     fun addCallBack(callBack: OnBatteryLevelCallback) {
         callbacks.add(callBack)
         if (mLevel != -1) {
-            callBack.onLevel(mLevel)
+            callBack.onLevel(mLevel, batteryManager?.isCharging == true)
         }
     }
 
@@ -50,6 +95,6 @@ object BatteryHelper {
     }
 
     interface OnBatteryLevelCallback {
-        fun onLevel(level: Int)
+        fun onLevel(level: Int, charging: Boolean)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-hdpi/battery_charging.png b/app/src/main/res/drawable-hdpi/battery_charging.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6a76240fa744914b2cf27e5208cd81b1bb3f322
GIT binary patch
literal 3081
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
XiX|1SpQ|*R00000NkvXXu0mjfZ7<z$

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/battery.xml b/app/src/main/res/drawable/battery.xml
index c6899c2..442b9e6 100644
--- a/app/src/main/res/drawable/battery.xml
+++ b/app/src/main/res/drawable/battery.xml
@@ -25,4 +25,8 @@
         android:drawable="@drawable/battery_100"
         android:maxLevel="100"
         android:minLevel="81" />
+    <item
+        android:drawable="@drawable/battery_charging"
+        android:maxLevel="200"
+        android:minLevel="200" />
 </level-list>
\ No newline at end of file