From 9e53e027cc2f4dd3320ac308b5abceeef5b0a889 Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 1 Mar 2024 13:53:56 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E5=8F=96=E6=B6=88=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E6=8C=89=E9=94=AE=E8=A7=A6=E5=8F=91=E9=9F=B3=E9=87=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../watcher/base/BaseActivity.kt              | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 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 ec5db03..1fc3575 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
@@ -105,8 +105,7 @@ abstract class BaseActivity : AppCompatActivity() {
         val contentView = generateContentView()
         baseBinding.container.addView(
             contentView, 0, ViewGroup.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.MATCH_PARENT
+                ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT
             )
         )
         if (!isHome) {
@@ -122,7 +121,8 @@ abstract class BaseActivity : AppCompatActivity() {
         }
         val options = getOptions()
         if (options.isNullOrEmpty()) {
-            baseBinding.topBar.getBackArea()?.nextFocusRightId = baseBinding.topBar.getBackArea()?.id!!
+            baseBinding.topBar.getBackArea()?.nextFocusRightId =
+                baseBinding.topBar.getBackArea()?.id!!
         } else {
             baseBinding.topBar.setOptions(options)
             baseBinding.topBar.setOpClickListener(object : CommonTopBar.OpClickListener {
@@ -172,10 +172,7 @@ abstract class BaseActivity : AppCompatActivity() {
         val inflater = LayoutInflater.from(this)
         inflater.factory2 = object : Factory2 {
             override fun onCreateView(
-                parent: View?,
-                name: String,
-                context: Context,
-                attrs: AttributeSet
+                parent: View?, name: String, context: Context, attrs: AttributeSet
             ): View? {
                 val booleanValue =
                     attrs.getAttributeBooleanValue(NAMESPACE_ANDROID, "focusable", false)
@@ -247,12 +244,13 @@ abstract class BaseActivity : AppCompatActivity() {
     private fun dealActionUp(event: KeyEvent): Boolean {
         val repeatCount = event.repeatCount
         val keyCode = event.keyCode
-        if (KeyEvent.KEYCODE_DPAD_LEFT == keyCode || KeyEvent.KEYCODE_DPAD_RIGHT == keyCode) {
+        /*if (KeyEvent.KEYCODE_DPAD_LEFT == keyCode || KeyEvent.KEYCODE_DPAD_RIGHT == keyCode) {
             if (isLeftRightLongPress && baseBinding.areaSound.visibility == View.VISIBLE) {
                 baseBinding.areaSound.postDelayed(hideVoiceAreaRunnable, 1500)
                 return true
             }
-        } else if (keyCode == KeyEvent.KEYCODE_F1) {
+        } else */
+        if (keyCode == KeyEvent.KEYCODE_F1) {
             LogUtils.w("BaseActivity F1 up")
             onSosHelp(false)
             SoundUtils.stopSoundIo()
@@ -266,7 +264,7 @@ abstract class BaseActivity : AppCompatActivity() {
     private fun dealActionDown(event: KeyEvent): Boolean {
         val repeatCount = event.repeatCount
         val keyCode = event.keyCode
-        if (KeyEvent.KEYCODE_DPAD_LEFT == keyCode || KeyEvent.KEYCODE_DPAD_RIGHT == keyCode) {
+        /*if (KeyEvent.KEYCODE_DPAD_LEFT == keyCode || KeyEvent.KEYCODE_DPAD_RIGHT == keyCode) {
             isLeftRightLongPress = repeatCount > 8
             if (isLeftRightLongPress && currentFocus !is SeekBar) {
                 showVoiceArea()
@@ -274,7 +272,8 @@ abstract class BaseActivity : AppCompatActivity() {
                 if (KeyEvent.KEYCODE_DPAD_LEFT == keyCode) mediaVolume-- else mediaVolume++
                 baseBinding.sbSound.progress = mediaVolume
             }
-        } else if (keyCode == KeyEvent.KEYCODE_ENTER) {
+        } else */
+        if (keyCode == KeyEvent.KEYCODE_ENTER) {
             if (repeatCount == 0) {
                 centerDownTime = System.currentTimeMillis()
             } else {