From bd5dcbeed17f2d694527d059dd132af103ad036d Mon Sep 17 00:00:00 2001
From: chenweijie <chris4everchan@gmail.com>
Date: Mon, 2 Sep 2024 15:57:24 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=AE=BE=E5=A4=87=E3=80=914G=20=20?=
=?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=8F=B3=E4=B8=8A=E8=A7=924G=20?=
=?UTF-8?q?=E5=9B=BE=E6=A0=87=20=E5=92=8C=E4=BA=8C=E7=BA=A7=E8=8F=9C?=
=?UTF-8?q?=E5=8D=954G=E5=9B=BE=E6=A0=87=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../safetywatcher/watcher/ui/view/CommonTopBar.kt | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
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 9f9d852..bc480e8 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
@@ -60,7 +60,10 @@ class CommonTopBar : LinearLayout {
private val batteryCallback = object : BatteryHelper.OnBatteryLevelCallback {
override fun onLevel(level: Int, charging: Boolean) {
- Log.i(this@CommonTopBar.javaClass.name, "batteryCallback onLevel = $level charging = $charging")
+ Log.i(
+ this@CommonTopBar.javaClass.name,
+ "batteryCallback onLevel = $level charging = $charging"
+ )
mBinding?.root?.post {
mBinding?.battery?.setImageLevel(if (charging) 200 else level)
mBinding?.batteryTxt?.text = "${level}%"
@@ -107,17 +110,20 @@ class CommonTopBar : LinearLayout {
override fun onLevel(level: Int) {
LogUtils.w("simCallback onLevel = $level")
mBinding?.root?.post {
- var showLevel =
- if (AppData.hasCameraData()) (level / 15 + 1) * 20 else (level + 1) * 20
+ var showLevel = (level + 1) * 20
+// var showLevel =
+// if (AppData.hasCameraData()) (level / 15 + 1) * 20 else (level + 1) * 20
+
if (showLevel > 100) {
showLevel = 100
}
mBinding?.fourG?.setImageLevel(showLevel)
+ Log.d("chenweijie", "$showLevel")
}
}
}
- private fun watchNetWork(){
+ private fun watchNetWork() {
NetworkHelper.watch(wifiCallback, simCallback)
}