1.完善更多功能页面交互

app/src/main/java/com/waytous/anticollision/ui/SplashActivity.kt

@@ -4,7 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import androidx.appcompat.app.AppCompatActivity
 import com.blankj.utilcode.util.BarUtils
-import com.blankj.utilcode.util.ColorUtils
+import com.blankj.utilcode.util.ScreenUtils
 import com.waytous.anticollision.R
 import com.waytous.anticollision.databinding.ActivitySplashBinding
 import com.waytous.anticollision.ui.home.HomeActivity
@@ -15,12 +15,9 @@ class SplashActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        //设置下布局向上移动状态栏的高度
-        BarUtils.setStatusBarColor(this, ColorUtils.getColor(R.color.white))
-        //设置隐藏虚拟按键
+        ScreenUtils.setFullScreen(this)
         BarUtils.setNavBarVisibility(this,false)
         binding = ActivitySplashBinding.inflate(layoutInflater)
-
         setContentView(binding.root)
         "${getString(R.string.text_progress, 57)}%".also { binding.textProgress.text = it }
         binding.loadingProgressBar.progress = 57

app/src/main/java/com/waytous/anticollision/ui/collect/CollectActivity.kt

@@ -2,6 +2,7 @@ package com.waytous.anticollision.ui.collect
 
 import android.os.Bundle
 import android.view.View
+import android.view.View.OnClickListener
 import android.widget.AdapterView
 import androidx.appcompat.app.AppCompatActivity
 import com.blankj.utilcode.util.BarUtils
@@ -12,12 +13,13 @@ import com.waytous.anticollision.databinding.ActivityCollectBinding
 import com.waytous.anticollision.databinding.RadioTabCollectBinding
 import com.waytous.anticollision.databinding.RadioTabSettingsBinding
 import com.waytous.anticollision.ui.MainViewModel
+import com.waytous.anticollision.ui.view.ButtonMorePopup
 import com.waytous.anticollision.utils.setupMapBox
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class CollectActivity : AppCompatActivity() {
+class CollectActivity : AppCompatActivity(),OnClickListener {
 
     lateinit var binding:ActivityCollectBinding
 
@@ -29,6 +31,8 @@ class CollectActivity : AppCompatActivity() {
     @Inject
     lateinit var tabSettingsBinding: RadioTabSettingsBinding
 
+    lateinit var popupMoreFeatures: ButtonMorePopup
+
     private val itemSelectedListener by lazy {
         object: AdapterView.OnItemSelectedListener {
             override fun onItemSelected(
@@ -73,8 +77,19 @@ class CollectActivity : AppCompatActivity() {
         binding.titleBar.statusBarDriverInfo.visibility = View.VISIBLE
         initTabLayout()
         setupMapBox(binding.mapContainer,mainViewModel)
+        popupMoreFeatures = ButtonMorePopup(this).also {
+            it.bindLifecycleOwner(this)
+        }
+        binding.more.setOnClickListener(this)
+        binding.goHome.setOnClickListener(this)
     }
 
+    override fun onClick(v: View?) {
+        when(v){
+            binding.more -> popupMoreFeatures.showPopupWindow(binding.more)
+            binding.goHome -> finish()
+        }
+    }
     private fun initTabLayout(){
         binding.tabContent.addView(tabCollectBinding.root)
         tabCollectBinding.collectSpinnerVehicleParts.onItemSelectedListener = itemSelectedListener
@@ -87,4 +102,5 @@ class CollectActivity : AppCompatActivity() {
             }
         }
     }
+
 }
\ No newline at end of file

app/src/main/java/com/waytous/anticollision/ui/health/HealthManagerActivity.kt

 package com.waytous.anticollision.ui.health
 
 import android.os.Bundle
+import android.view.View
+import android.view.View.OnClickListener
 import androidx.appcompat.app.AppCompatActivity
-import com.waytous.anticollision.R
+import com.blankj.utilcode.util.BarUtils
+import com.blankj.utilcode.util.ScreenUtils
+import com.waytous.anticollision.databinding.ActivityHealthManagerBinding
+import com.waytous.anticollision.ui.view.ButtonMorePopup
+
+class HealthManagerActivity : AppCompatActivity(),OnClickListener {
+
+    lateinit var binding:ActivityHealthManagerBinding
+
+    lateinit var popupMoreFeatures: ButtonMorePopup
 
-class HealthManagerActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_health_manager)
+        ScreenUtils.setFullScreen(this)
+        BarUtils.setNavBarVisibility(this,false)
+        binding = ActivityHealthManagerBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        popupMoreFeatures = ButtonMorePopup(this).also {
+            it.bindLifecycleOwner(this)
+        }
+        binding.more.setOnClickListener(this)
+        binding.goHome.setOnClickListener(this)
+    }
+
+    override fun onClick(v: View?) {
+        when(v){
+            binding.more -> popupMoreFeatures.showPopupWindow(binding.more)
+            binding.goHome -> finish()
+        }
     }
 }
\ No newline at end of file

app/src/main/java/com/waytous/anticollision/ui/statistics/DataStatisticsActivity.kt

 package com.waytous.anticollision.ui.statistics
 
 import android.os.Bundle
+import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import com.waytous.anticollision.R
+import com.blankj.utilcode.util.BarUtils
+import com.blankj.utilcode.util.ScreenUtils
+import com.waytous.anticollision.databinding.ActivityDataStatisticsBinding
+import com.waytous.anticollision.ui.view.ButtonMorePopup
+
+class DataStatisticsActivity : AppCompatActivity(),View.OnClickListener {
+
+    lateinit var binding: ActivityDataStatisticsBinding
+
+    lateinit var popupMoreFeatures: ButtonMorePopup
 
-class DataStatisticsActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_data_statistics)
+        ScreenUtils.setFullScreen(this)
+        BarUtils.setNavBarVisibility(this,false)
+        binding = ActivityDataStatisticsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        popupMoreFeatures = ButtonMorePopup(this).also {
+            it.bindLifecycleOwner(this)
+        }
+        binding.more.setOnClickListener(this)
+        binding.goHome.setOnClickListener(this)
+    }
+
+    override fun onClick(v: View?) {
+        when(v){
+            binding.more -> popupMoreFeatures.showPopupWindow(binding.more)
+            binding.goHome -> finish()
+        }
     }
 }
\ No newline at end of file

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/background_main_light"
     android:orientation="vertical"
     tools:context=".ui.collect.CollectActivity">
     <include
@@ -82,7 +83,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="@id/tabContent" />
         <androidx.appcompat.widget.AppCompatTextView
-            android:id="@+id/backHome"
+            android:id="@+id/goHome"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/dp_18"

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/background_main_light"
     android:orientation="vertical"
     tools:context=".ui.statistics.DataStatisticsActivity">
     <include

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/background_main_light"
     android:orientation="vertical"
     tools:context=".ui.health.HealthManagerActivity">
     <include

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/background_main_light"
     android:orientation="vertical"
     tools:context=".ui.video.HomeVideoActivity">
     <include

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

@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@mipmap/background_main_light"
     android:orientation="vertical"
     tools:context=".ui.settings.UserSettingsActivity">
     <include

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

@@ -5,7 +5,7 @@
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
-    tools:context=".ui.collect.CollectFragment">
+    tools:context=".ui.collect.CollectActivity">
     <Spinner
         android:id="@+id/collectSpinnerRange"
         android:background="@drawable/background_spinner"

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

@@ -5,7 +5,7 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".ui.collect.CollectFragment">
+    tools:context=".ui.collect.CollectActivity">
 
     <androidx.appcompat.widget.AppCompatTextView
         style="@style/StatusBarTextStyle"
@@ -16,7 +16,7 @@
     <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="9dp"
+        android:layout_marginTop="@dimen/dp_9"
         android:background="@drawable/background_collect_tab_manual_update">
 
         <androidx.appcompat.widget.AppCompatTextView
@@ -33,61 +33,58 @@
         style="@style/StatusBarTextStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="21dp"
+        android:layout_marginTop="@dimen/dp_21"
         android:text="@string/collect_settings_map_ratio" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="300dp"
-        android:layout_height="236dp"
-        android:layout_marginTop="9dp"
+        android:layout_width="@dimen/dp_300"
+        android:layout_height="@dimen/dp_236"
+        android:layout_marginTop="@dimen/dp_9"
         android:background="@drawable/background_collect_tab_manual_update">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/collectSettingsRatioText"
             style="@style/StatusBarTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="@dimen/dp_170"
+            android:layout_height="@dimen/dp_50"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="54dp"
+            android:layout_marginTop="@dimen/dp_54"
             android:background="@drawable/background_collect_btn_map_ratio"
             android:text="@string/collect_settings_map_ratio_default"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
-
+        <ProgressBar
+            android:id="@+id/collectSettingsSeekBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="@dimen/dp_160"
+            android:layout_height="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_46"
+            android:progressDrawable="@drawable/background_collect_settings_progressbar"
+            android:splitTrack="false"
+            android:thumb="@null"
+            app:layout_constraintTop_toBottomOf="@id/collectSettingsRatioText"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"/>
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/collectSettingsRatioMinus"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="28sp"
-            android:layout_marginTop="32dp"
             android:adjustViewBounds="true"
             android:src="@drawable/background_collect_tab_seekbar_minus"
-            app:layout_constraintEnd_toStartOf="@id/collectSettingsRatioText"
-            app:layout_constraintTop_toBottomOf="@id/collectSettingsRatioText" />
+            app:layout_constraintEnd_toStartOf="@id/collectSettingsSeekBar"
+            app:layout_constraintTop_toTopOf="@id/collectSettingsSeekBar"
+            app:layout_constraintBottom_toBottomOf="@id/collectSettingsSeekBar"/>
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/collectSettingsRatioAdd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="28sp"
             android:adjustViewBounds="true"
             android:src="@drawable/background_collect_tab_seekbar_add"
-            app:layout_constraintBottom_toBottomOf="@id/collectSettingsRatioMinus"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@id/collectSettingsRatioMinus" />
+            app:layout_constraintStart_toEndOf="@id/collectSettingsSeekBar"
+            app:layout_constraintTop_toTopOf="@id/collectSettingsSeekBar"
+            app:layout_constraintBottom_toBottomOf="@id/collectSettingsSeekBar" />
 
-        <ProgressBar
-            android:id="@+id/collectSettingsSeekBar"
-            style="?android:attr/progressBarStyleHorizontal"
-            android:layout_width="160dp"
-            android:layout_height="16dp"
-            android:progressDrawable="@drawable/background_collect_settings_progressbar"
-            android:splitTrack="false"
-            android:thumb="@null"
-            app:layout_constraintBottom_toBottomOf="@id/collectSettingsRatioMinus"
-            app:layout_constraintEnd_toStartOf="@id/collectSettingsRatioAdd"
-            app:layout_constraintStart_toEndOf="@id/collectSettingsRatioMinus"
-            app:layout_constraintTop_toTopOf="@id/collectSettingsRatioMinus" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file