From a33aa2eef22091f9db4786a278264a29fc5f1bc8 Mon Sep 17 00:00:00 2001 From: xiaowusky Date: Wed, 5 Jul 2023 12:21:53 +0800 Subject: [PATCH] =?UTF-8?q?desc:=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yinuo/safetywatcher/watcher/base/BaseActivity.kt | 12 ++++++++++++ app/src/main/res/layout/activity_cloud.xml | 1 - app/src/main/res/layout/activity_home.xml | 1 - app/src/main/res/layout/activity_query_data.xml | 1 - 4 files changed, 12 insertions(+), 3 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 eba4a5d..f76094c 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 @@ -13,6 +13,7 @@ import android.widget.SeekBar import android.widget.TextView import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.AppCompatRadioButton +import androidx.core.view.postDelayed import com.loper7.date_time_picker.number_picker.NumberPicker import com.yinuo.safetywatcher.R import com.yinuo.safetywatcher.databinding.ActivityBaseBinding @@ -38,6 +39,13 @@ abstract class BaseActivity : AppCompatActivity() { setTopBar() } + override fun onResume() { + super.onResume() + getDefaultFocusView()?.postDelayed(10){ + getDefaultFocusView()?.requestFocus() + } + } + private fun setChildContent() { val contentView = generateContentView() baseBinding.container.addView( @@ -82,6 +90,10 @@ abstract class BaseActivity : AppCompatActivity() { open val isHome: Boolean = false + open fun getDefaultFocusView(): View? { + return baseBinding.topBar.mBinding?.backArea + } + abstract fun onOptionClick(type: Int, target: View) abstract fun getOptions(): List? diff --git a/app/src/main/res/layout/activity_cloud.xml b/app/src/main/res/layout/activity_cloud.xml index b6bbd68..cfcba23 100644 --- a/app/src/main/res/layout/activity_cloud.xml +++ b/app/src/main/res/layout/activity_cloud.xml @@ -11,7 +11,6 @@ android:layout_height="@dimen/_100dp" android:background="@drawable/cloud_sync_btn_bg" android:gravity="center" - android:focusedByDefault="true" android:focusable="true" android:text="@string/sync_sensor_txt" android:textColor="@color/white" diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 1dc6023..fae5c6b 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -25,7 +25,6 @@ android:layout_height="@dimen/_88dp" android:gravity="center_vertical" android:orientation="horizontal" - android:focusedByDefault="true" android:focusable="true" android:nextFocusDown="@id/item_query" android:paddingStart="@dimen/_66dp"> diff --git a/app/src/main/res/layout/activity_query_data.xml b/app/src/main/res/layout/activity_query_data.xml index b7d3e7a..5cf5aac 100644 --- a/app/src/main/res/layout/activity_query_data.xml +++ b/app/src/main/res/layout/activity_query_data.xml @@ -25,7 +25,6 @@ android:background="@drawable/save_btn_bg" android:gravity="center" android:paddingVertical="@dimen/_12dp" - android:focusedByDefault="true" android:focusable="true" android:text="@string/modify_params" android:textColor="@color/white"