desc:调整布局结构

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

@@ -2,6 +2,8 @@ package com.yinuo.safetywatcher.watcher.base
 
 import android.os.Bundle
 import android.view.View
+import android.view.ViewGroup
+import android.widget.RelativeLayout
 import androidx.appcompat.app.AppCompatActivity
 import com.yinuo.safetywatcher.databinding.ActivityBaseBinding
 import com.yinuo.safetywatcher.watcher.ui.view.CommonTopBar
@@ -15,11 +17,25 @@ abstract class BaseActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(baseBinding.root)
-        baseBinding.container.addView(generateContentView())
+        setChildContent()
         initView()
         setTopBar()
     }
 
+    private fun setChildContent() {
+        val contentView = generateContentView()
+        baseBinding.container.addView(
+            contentView, 0, ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                ViewGroup.LayoutParams.MATCH_PARENT
+            )
+        )
+        if (!isHome) {
+            val params = contentView.layoutParams as RelativeLayout.LayoutParams
+            params.topMargin = 87
+        }
+    }
+
     private fun setTopBar() {
         val title = getTopBarTitle()
         title?.let {
@@ -36,9 +52,7 @@ abstract class BaseActivity : AppCompatActivity() {
         }
     }
 
-    fun hideTopbar(){
+    open val isHome: Boolean = false
-        baseBinding.topBar.visibility = View.GONE
-    }
 
     abstract fun onOptionClick(type: Int, target: View)
 

app/src/main/java/com/yinuo/safetywatcher/watcher/ui/HomeActivity.kt

@@ -21,8 +21,11 @@ class HomeActivity : NoOptionsActivity() {
 
     private var mRender: RtspSurfaceRender2? = null
 
+    override val isHome: Boolean
+        get() = true
+
     override fun getTopBarTitle(): String? {
-        return null;
+        return null
     }
 
     override fun generateContentView(): View {
@@ -49,7 +52,7 @@ class HomeActivity : NoOptionsActivity() {
             }
             cameraSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
                 if (isChecked) mRender?.startRecording() else mRender?.stopRecording()
-             }
+            }
 
             itemSetting.post {
                 itemSetting.requestFocus()
@@ -69,7 +72,6 @@ class HomeActivity : NoOptionsActivity() {
     }
 
     private fun initTopbarHelper() {
-        hideTopbar()
         BatteryHelper.init(this@HomeActivity)
         WifiHelper.init(this@HomeActivity)
         SimHelper.init(this@HomeActivity)

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

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/container"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -11,4 +11,4 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/_87dp"/>
 
-</LinearLayout>
+</RelativeLayout>

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

@@ -12,7 +12,6 @@
         android:background="@drawable/cloud_sync_btn_bg"
         android:gravity="center"
         android:text="@string/sync_sensor_txt"
-        android:layout_marginTop="@dimen/_186dp"
         android:textColor="@color/white"
         android:textSize="@dimen/_30dp" />