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