From 12a645aa0a87872e4598463330903f260ed7411a Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Tue, 16 Jan 2024 09:14:58 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E7=94=B5=E6=B1=A0=E5=85=85=E7=94=B5?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD|=E5=90=AF=E5=8A=A8=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=91=84=E5=83=8F=E5=A4=B4gpio|=E5=85=B3=E6=9C=BA=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt        | 2 +-
 .../java/com/yinuo/safetywatcher/watcher/utils/BatteryHelper.kt | 2 +-
 app/src/main/res/layout/activity_base.xml                       | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
index 30dd657..2304921 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/App.kt
@@ -20,7 +20,7 @@ class App : CommonApplication() {
 //        LztekUtil.setObject(Lztek.create(this))
         CrashHandler.getInstance().init(this)
         ipConfig()
-        GPIOUtils.openCamera()
+        GPIOUtils.closeCamera()
         tryFixDbData()
     }
 
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 bd2ae66..b42fb18 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
@@ -25,7 +25,7 @@ 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_CHARGING || status == BatteryManager.BATTERY_STATUS_FULL)
                 notifyUser(level)
                 mLevel = level
                 Log.i(
diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
index e68b3e3..37deb6a 100644
--- a/app/src/main/res/layout/activity_base.xml
+++ b/app/src/main/res/layout/activity_base.xml
@@ -71,6 +71,7 @@
             android:focusable="true"
             android:gravity="center"
             android:text="@string/cancel"
+            android:nextFocusLeft="@id/tv_cancel"
             android:textColor="@color/white_30"
             android:textSize="@dimen/_36dp" />
 
@@ -84,6 +85,7 @@
             android:focusable="true"
             android:gravity="center"
             android:text="@string/confirm"
+            android:nextFocusRight="@id/tv_confirm"
             android:textColor="@color/white"
             android:textSize="@dimen/_36dp" />
     </RelativeLayout>