From 62290e3f55d324d2c92febaf3e9e41e22d715096 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Tue, 12 Dec 2023 09:26:16 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E8=83=8C=E5=85=89=E8=B0=83=E8=8A=82?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=EF=BC=8C=E9=95=BF=E6=8C=89=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E9=94=AE=E7=84=A6=E7=82=B9=E8=B7=91=E5=88=B0=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yinuo/safetywatcher/watcher/base/BaseActivity.kt    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
index 36e1a0f..2bf4870 100644
--- a/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
+++ b/app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt
@@ -214,15 +214,15 @@ abstract class BaseActivity : AppCompatActivity() {
         val keyCode = event.keyCode
         if (KeyEvent.KEYCODE_DPAD_LEFT == keyCode || KeyEvent.KEYCODE_DPAD_RIGHT == keyCode) {
             if (isLeftRightLongPress) {
+                lastFocusView?.requestFocus()
                 baseBinding.areaSound.visibility = View.GONE
                 volumeUtil.mediaVolume = baseBinding.sbSound.progress
-                lastFocusView?.requestFocus()
                 return true
             }
         } else if (keyCode == KeyEvent.KEYCODE_ENTER) {
             if (isHomeLongPress) {
-                baseBinding.layoutShutdown.visibility = View.VISIBLE
                 lastFocusView = currentFocus
+                baseBinding.layoutShutdown.visibility = View.VISIBLE
                 baseBinding.tvCancel.requestFocus()
                 return true
             }
@@ -242,8 +242,8 @@ abstract class BaseActivity : AppCompatActivity() {
             if (repeatCount > 10) {
                 val visibility = baseBinding.areaSound.visibility
                 if (View.GONE == visibility) {
-                    baseBinding.areaSound.visibility = View.VISIBLE
                     lastFocusView = currentFocus
+                    baseBinding.areaSound.visibility = View.VISIBLE
                     baseBinding.sbSound.requestFocus()
                 }
                 var mediaVolume = baseBinding.sbSound.progress