From 8ca3b81ebe00808316e1a3ce7fe30e87e8b791bd Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 1 Dec 2023 09:08:33 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E8=B0=83=E6=95=B4=E5=A3=B0=E9=9F=B3?=
 =?UTF-8?q?=E4=B9=8B=E5=90=8E=EF=BC=8C=E7=84=A6=E7=82=B9=E5=9B=9E=E5=88=B0?=
 =?UTF-8?q?=E4=B9=8B=E5=89=8D=E7=9A=84=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt | 4 ++++
 1 file changed, 4 insertions(+)

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 c056627..af40e1a 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
@@ -41,6 +41,8 @@ abstract class BaseActivity : AppCompatActivity() {
 
     var loadingDialog: CommonDialog? = null;
 
+    var lastFocusView: View? = null
+
     override fun onCreate(savedInstanceState: Bundle?) {
         setViewFactory()
         super.onCreate(null)
@@ -188,6 +190,7 @@ abstract class BaseActivity : AppCompatActivity() {
             if (isLeftRightLongPress) {
                 baseBinding.areaSound.visibility = View.GONE
                 volumeUtil.mediaVolume = baseBinding.sbSound.progress
+                lastFocusView?.requestFocus()
                 return true
             }
         } else if (keyCode == KeyEvent.KEYCODE_ENTER) {
@@ -212,6 +215,7 @@ abstract class BaseActivity : AppCompatActivity() {
                 val visibility = baseBinding.areaSound.visibility
                 if (View.GONE == visibility) {
                     baseBinding.areaSound.visibility = View.VISIBLE
+                    lastFocusView = currentFocus
                     baseBinding.sbSound.requestFocus()
                 }
                 var mediaVolume = baseBinding.sbSound.progress