From 2247db8b066228e4cf0e9aba98c72ef2af5f487c Mon Sep 17 00:00:00 2001
From: xiaowusky <chenyangyang3858@dingtalk.com>
Date: Fri, 1 Mar 2024 11:08:21 +0800
Subject: [PATCH] =?UTF-8?q?desc:=E4=BC=A0=E6=84=9F=E5=99=A8=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E7=95=8C=E9=9D=A2=E6=8C=89=E5=8F=B3=E9=94=AE=E5=85=89?=
 =?UTF-8?q?=E6=A0=87=E6=B6=88=E5=A4=B1?=
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, 4 insertions(+), 2 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 202851b..ec5db03 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
@@ -121,8 +121,10 @@ abstract class BaseActivity : AppCompatActivity() {
             baseBinding.topBar.setTitle(it)
         }
         val options = getOptions()
-        options?.let {
-            baseBinding.topBar.setOptions(it)
+        if (options.isNullOrEmpty()) {
+            baseBinding.topBar.getBackArea()?.nextFocusRightId = baseBinding.topBar.getBackArea()?.id!!
+        } else {
+            baseBinding.topBar.setOptions(options)
             baseBinding.topBar.setOpClickListener(object : CommonTopBar.OpClickListener {
                 override fun onClick(type: Int, target: View) {
                     onOptionClick(type, target)