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)