Revert "desc:默认返回获取焦点"

This reverts commit a33aa2eef2.

app/src/main/java/com/yinuo/safetywatcher/watcher/base/BaseActivity.kt

@@ -13,7 +13,6 @@ 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
@@ -39,13 +38,6 @@ abstract class BaseActivity : AppCompatActivity() {
         setTopBar()
     }
 
-    override fun onResume() {
-        super.onResume()
-        getDefaultFocusView()?.postDelayed(10){
-            getDefaultFocusView()?.requestFocus()
-        }
-    }
-
     private fun setChildContent() {
         val contentView = generateContentView()
         baseBinding.container.addView(
@@ -90,10 +82,6 @@ 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<CommonTopBar.Option>?

app/src/main/res/layout/activity_cloud.xml

@@ -11,6 +11,7 @@
         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"

app/src/main/res/layout/activity_home.xml

@@ -25,6 +25,7 @@
             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">

app/src/main/res/layout/activity_query_data.xml

@@ -25,6 +25,7 @@
             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"