diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 15f3a91..e10cd77 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -25,15 +25,12 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_20"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher"
-            app:qmui_border_width="0dp"
-            app:qmui_corner_radius="7dp" />
+        <ImageView
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_75"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 15f3a91..e10cd77 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -25,15 +25,12 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_20"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher"
-            app:qmui_border_width="0dp"
-            app:qmui_corner_radius="7dp" />
+        <ImageView
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_75"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_query_marker.xml b/app/src/main/res/layout/dialog_query_marker.xml
index 8245b7b..9b7fe0a 100644
--- a/app/src/main/res/layout/dialog_query_marker.xml
+++ b/app/src/main/res/layout/dialog_query_marker.xml
@@ -96,14 +96,14 @@
 
             <Button
                 android:id="@+id/dialogCancelButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="取消"
-                android:textColor="@color/red"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/red" />
 
             <View
                 android:layout_width="@dimen/lib_px_1"
@@ -112,14 +112,14 @@
 
             <Button
                 android:id="@+id/dialogConfirmButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="确定"
-                android:textColor="@color/blue"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/themeColor" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 15f3a91..e10cd77 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -25,15 +25,12 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_20"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher"
-            app:qmui_border_width="0dp"
-            app:qmui_corner_radius="7dp" />
+        <ImageView
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_75"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_query_marker.xml b/app/src/main/res/layout/dialog_query_marker.xml
index 8245b7b..9b7fe0a 100644
--- a/app/src/main/res/layout/dialog_query_marker.xml
+++ b/app/src/main/res/layout/dialog_query_marker.xml
@@ -96,14 +96,14 @@
 
             <Button
                 android:id="@+id/dialogCancelButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="取消"
-                android:textColor="@color/red"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/red" />
 
             <View
                 android:layout_width="@dimen/lib_px_1"
@@ -112,14 +112,14 @@
 
             <Button
                 android:id="@+id/dialogConfirmButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="确定"
-                android:textColor="@color/blue"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/themeColor" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_popup_menu.xml b/app/src/main/res/layout/item_popup_menu.xml
index b4f4ba4..6aa1b14 100644
--- a/app/src/main/res/layout/item_popup_menu.xml
+++ b/app/src/main/res/layout/item_popup_menu.xml
@@ -14,12 +14,11 @@
         android:layout_weight="1"
         android:textColor="@color/white" />
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+    <androidx.cardview.widget.CardView
         android:id="@+id/tagView"
         android:layout_width="@dimen/dp_10"
         android:layout_height="@dimen/dp_10"
         android:layout_marginStart="@dimen/dp_7"
-        app:qmui_backgroundColor="@color/white"
-        app:qmui_borderColor="@color/white"
-        app:qmui_radius="@dimen/dp_5" />
+        android:backgroundTint="@color/white"
+        app:cardCornerRadius="@dimen/dp_5" />
 </LinearLayout>
\ No newline at end of file

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 15f3a91..e10cd77 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -25,15 +25,12 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_20"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher"
-            app:qmui_border_width="0dp"
-            app:qmui_corner_radius="7dp" />
+        <ImageView
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_75"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_query_marker.xml b/app/src/main/res/layout/dialog_query_marker.xml
index 8245b7b..9b7fe0a 100644
--- a/app/src/main/res/layout/dialog_query_marker.xml
+++ b/app/src/main/res/layout/dialog_query_marker.xml
@@ -96,14 +96,14 @@
 
             <Button
                 android:id="@+id/dialogCancelButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="取消"
-                android:textColor="@color/red"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/red" />
 
             <View
                 android:layout_width="@dimen/lib_px_1"
@@ -112,14 +112,14 @@
 
             <Button
                 android:id="@+id/dialogConfirmButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="确定"
-                android:textColor="@color/blue"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/themeColor" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_popup_menu.xml b/app/src/main/res/layout/item_popup_menu.xml
index b4f4ba4..6aa1b14 100644
--- a/app/src/main/res/layout/item_popup_menu.xml
+++ b/app/src/main/res/layout/item_popup_menu.xml
@@ -14,12 +14,11 @@
         android:layout_weight="1"
         android:textColor="@color/white" />
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+    <androidx.cardview.widget.CardView
         android:id="@+id/tagView"
         android:layout_width="@dimen/dp_10"
         android:layout_height="@dimen/dp_10"
         android:layout_marginStart="@dimen/dp_7"
-        app:qmui_backgroundColor="@color/white"
-        app:qmui_borderColor="@color/white"
-        app:qmui_radius="@dimen/dp_5" />
+        android:backgroundTint="@color/white"
+        app:cardCornerRadius="@dimen/dp_5" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_satellite_rv_l.xml b/app/src/main/res/layout/item_satellite_rv_l.xml
index 5756daa..b421ebc 100644
--- a/app/src/main/res/layout/item_satellite_rv_l.xml
+++ b/app/src/main/res/layout/item_satellite_rv_l.xml
@@ -42,13 +42,14 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/signalProgressView"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:max="63" />
+            android:max="63"
+            app:trackColor="@color/mainBackground"
+            app:trackCornerRadius="@dimen/lib_dp_5" />
 
         <TextView
             android:id="@+id/signalValueView"

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 15f3a91..e10cd77 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -25,15 +25,12 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_20"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher"
-            app:qmui_border_width="0dp"
-            app:qmui_corner_radius="7dp" />
+        <ImageView
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_75"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_query_marker.xml b/app/src/main/res/layout/dialog_query_marker.xml
index 8245b7b..9b7fe0a 100644
--- a/app/src/main/res/layout/dialog_query_marker.xml
+++ b/app/src/main/res/layout/dialog_query_marker.xml
@@ -96,14 +96,14 @@
 
             <Button
                 android:id="@+id/dialogCancelButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="取消"
-                android:textColor="@color/red"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/red" />
 
             <View
                 android:layout_width="@dimen/lib_px_1"
@@ -112,14 +112,14 @@
 
             <Button
                 android:id="@+id/dialogConfirmButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="确定"
-                android:textColor="@color/blue"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/themeColor" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_popup_menu.xml b/app/src/main/res/layout/item_popup_menu.xml
index b4f4ba4..6aa1b14 100644
--- a/app/src/main/res/layout/item_popup_menu.xml
+++ b/app/src/main/res/layout/item_popup_menu.xml
@@ -14,12 +14,11 @@
         android:layout_weight="1"
         android:textColor="@color/white" />
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+    <androidx.cardview.widget.CardView
         android:id="@+id/tagView"
         android:layout_width="@dimen/dp_10"
         android:layout_height="@dimen/dp_10"
         android:layout_marginStart="@dimen/dp_7"
-        app:qmui_backgroundColor="@color/white"
-        app:qmui_borderColor="@color/white"
-        app:qmui_radius="@dimen/dp_5" />
+        android:backgroundTint="@color/white"
+        app:cardCornerRadius="@dimen/dp_5" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_satellite_rv_l.xml b/app/src/main/res/layout/item_satellite_rv_l.xml
index 5756daa..b421ebc 100644
--- a/app/src/main/res/layout/item_satellite_rv_l.xml
+++ b/app/src/main/res/layout/item_satellite_rv_l.xml
@@ -42,13 +42,14 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/signalProgressView"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:max="63" />
+            android:max="63"
+            app:trackColor="@color/mainBackground"
+            app:trackCornerRadius="@dimen/lib_dp_5" />
 
         <TextView
             android:id="@+id/signalValueView"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3859695..c056e28 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--按钮样式-->
-    <style name="MainButtonStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/dp_40</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/sp_16</item>
-        <item name="android:background">@drawable/button_main_selector</item>
-    </style>
-
     <style name="PopupTextViewStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -54,7 +45,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">@dimen/sp_18</item>
+        <item name="android:textSize">@dimen/sp_16</item>
     </style>
 
     <!--安装标识器输入框-->
@@ -68,7 +59,7 @@
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:textColorHint">@color/hintColor</item>
-        <item name="android:textSize">@dimen/sp_18</item>
+        <item name="android:textSize">@dimen/sp_16</item>
     </style>
 
     <style name="spinnerStyle">
@@ -86,7 +77,7 @@
         <item name="android:layout_marginStart">@dimen/dp_125</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:textColorHint">@color/hintColor</item>
-        <item name="android:textSize">@dimen/sp_14</item>
+        <item name="android:textSize">@dimen/sp_16</item>
         <item name="android:singleLine">true</item>
     </style>
 

diff --git a/app/build.gradle b/app/build.gradle
index 1a81160..d0cb423 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -77,14 +77,13 @@
 
 dependencies {
     //基础依赖库
-    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.3'
+    implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.1.4'
     implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.6.1'
+    def base_version = "1.6.1"
+    implementation "androidx.appcompat:appcompat:${base_version}"
+    implementation "com.google.android.material:material:${base_version}"
     //Google官方授权框架
     implementation 'pub.devrel:easypermissions:3.0.0'
-    //腾讯Android UI框架
-    implementation 'com.qmuiteam:qmui:2.0.0-alpha10'
-    implementation 'com.qmuiteam:arch:0.3.1'
     //沉浸式状态栏。基础依赖包，必须要依赖
     implementation 'com.gyf.immersionbar:immersionbar:3.0.0'
     //fragment快速实现
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5c645f0..a4912c4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -38,7 +38,7 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Detector"
+        android:theme="@style/Theme.Detector.NoActionBar"
         android:usesCleartextTraffic="true">
         <activity
             android:name=".view.PermissionActivity"
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
index fc795c6..891c2ed 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/InstallMarkerActivity.kt
@@ -66,17 +66,6 @@
     private lateinit var imageAdapter: EditableImageAdapter
 
     override fun initEvent() {
-        //返回
-        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
-            override fun onLeftClick() {
-                finish()
-            }
-
-            override fun onRightClick() {
-
-            }
-        })
-
         binding.objectInclude.objectTypeSpinner.onItemSelectedListener =
             object : AdapterView.OnItemSelectedListener {
                 override fun onItemSelected(
@@ -390,7 +379,16 @@
     }
 
     override fun setupTopBarLayout() {
-        binding.rootView.initImmersionBar(this, true, R.color.mainBackground)
+        binding.rootView.initImmersionBar(this, true, R.color.white)
+        binding.titleView.setOnClickListener(object : TitleBarView.OnClickListener {
+            override fun onLeftClick() {
+                finish()
+            }
+
+            override fun onRightClick() {
+
+            }
+        })
     }
 
     private fun initDefaultData() {
diff --git a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
index 0f1611d..4703b1d 100644
--- a/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/view/SatelliteStatusActivity.kt
@@ -3,7 +3,6 @@
 import android.Manifest
 import android.content.pm.PackageManager
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
 import android.location.GnssStatus
 import android.location.Location
 import android.location.LocationListener
@@ -48,8 +47,6 @@
     private val locationKit by lazy { LocationKit(this) }
 
     override fun initOnCreate(savedInstanceState: Bundle?) {
-        window.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
-        window.decorView.setBackgroundColor(Color.TRANSPARENT)
         val params = window.attributes
         params.width = (getScreenWidth() * 0.97).roundToInt()
         params.height = (getScreenHeight() * 0.75).roundToInt()
diff --git a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
index 259553c..a6ede2a 100644
--- a/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
+++ b/app/src/main/java/com/casic/common/detector/gd/widgets/SamplePopupWindow.kt
@@ -8,9 +8,9 @@
 import android.widget.ListView
 import android.widget.PopupWindow
 import android.widget.TextView
+import androidx.cardview.widget.CardView
 import com.casic.common.detector.gd.R
 import com.pengxh.kt.lite.extensions.getScreenWidth
-import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
 
 class SamplePopupWindow constructor(context: Context) : PopupWindow() {
     private var clickListener: OnPopupWindowClickListener? = null
@@ -84,6 +84,6 @@
 
     internal class PopupWindowHolder {
         lateinit var titleView: TextView
-        lateinit var tagView: QMUIRoundButton
+        lateinit var tagView: CardView
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_main_selector.xml b/app/src/main/res/drawable/button_main_selector.xml
deleted file mode 100644
index ece8881..0000000
--- a/app/src/main/res/drawable/button_main_selector.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/themeColor" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <!-- 点击按钮时候改变背景色50% -->
-            <solid android:color="@color/themeOpacityColor" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/button_white_selector.xml b/app/src/main/res/drawable/button_white_selector.xml
deleted file mode 100644
index cd713c6..0000000
--- a/app/src/main/res/drawable/button_white_selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:state_pressed="false">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-
-    <item android:state_pressed="true">
-        <shape>
-            <corners android:radius="@dimen/dp_5" />
-            <solid android:color="#80FFFFFF" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_install_marker.xml b/app/src/main/res/layout/activity_install_marker.xml
index 925d972..66f4ff9 100644
--- a/app/src/main/res/layout/activity_install_marker.xml
+++ b/app/src/main/res/layout/activity_install_marker.xml
@@ -4,7 +4,7 @@
     android:id="@+id/rootView"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/mainBackground"
+    android:background="@color/white"
     android:orientation="vertical">
 
     <com.pengxh.kt.lite.widget.TitleBarView
@@ -100,14 +100,14 @@
 
         <Button
             android:id="@+id/installButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装"
-            android:textColor="@color/red"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/red" />
 
         <View
             android:layout_width="@dimen/lib_px_1"
@@ -116,14 +116,14 @@
 
         <Button
             android:id="@+id/readMarkerButton"
+            style="@style/Widget.MaterialComponents.Button.TextButton"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:background="@drawable/dialog_button_selector"
-            android:gravity="center"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="读标识器"
-            android:textColor="@color/themeColor"
-            android:textSize="@dimen/lib_sp_16" />
+            android:textColor="@color/themeColor" />
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index f66c0ac..b41a16c 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -163,10 +163,12 @@
 
         <Button
             android:id="@+id/loginButton"
-            style="@style/MainButtonStyle"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/dp_40"
             android:layout_marginHorizontal="@dimen/dp_40"
-            android:text="登\u3000录"
-            android:textColor="@color/white" />
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:text="登\u3000录" />
 
         <CheckBox
             android:id="@+id/autoSavePasswordView"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 5e75d4d..1837bb5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -26,36 +26,40 @@
 
         <Button
             android:id="@+id/installButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="安装" />
 
         <Button
             android:id="@+id/viewButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginHorizontal="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="查看" />
 
         <Button
             android:id="@+id/inspectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="巡检" />
 
         <Button
             android:id="@+id/detectionButton"
-            style="@style/MainButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_35"
             android:layout_marginStart="@dimen/dp_5"
             android:layout_weight="1"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
             android:text="探测" />
     </LinearLayout>
 
@@ -76,7 +80,7 @@
             app:cardCornerRadius="@dimen/dp_7"
             app:cardElevation="@dimen/dp_5">
 
-            <ImageButton
+            <ImageView
                 android:id="@+id/aimButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_new_object_detail.xml b/app/src/main/res/layout/activity_new_object_detail.xml
index c4f59b6..3143760 100644
--- a/app/src/main/res/layout/activity_new_object_detail.xml
+++ b/app/src/main/res/layout/activity_new_object_detail.xml
@@ -71,16 +71,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_object_detail.xml b/app/src/main/res/layout/activity_object_detail.xml
index b0cc380..ce5fb93 100644
--- a/app/src/main/res/layout/activity_object_detail.xml
+++ b/app/src/main/res/layout/activity_object_detail.xml
@@ -282,16 +282,11 @@
             android:layout_marginHorizontal="@dimen/dp_10"
             android:background="@color/mainBackground" />
 
-        <TextView
+        <Button
             android:id="@+id/showImageView"
             android:layout_width="match_parent"
             android:layout_height="@dimen/titleViewHeight"
-            android:layout_gravity="center_vertical"
-            android:fontFamily="sans-serif-black"
-            android:gravity="center"
-            android:paddingVertical="@dimen/dp_10"
-            android:text="查看图片"
-            android:textColor="@color/black"
-            android:textSize="@dimen/sp_16" />
+            android:layout_marginHorizontal="@dimen/dp_5"
+            android:text="查看图片" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rtk_config.xml b/app/src/main/res/layout/activity_rtk_config.xml
index 20fd0fe..56dfe75 100644
--- a/app/src/main/res/layout/activity_rtk_config.xml
+++ b/app/src/main/res/layout/activity_rtk_config.xml
@@ -147,8 +147,10 @@
 
     <Button
         android:id="@+id/saveButton"
-        style="@style/MainButtonStyle"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/dp_40"
         android:layout_margin="@dimen/dp_10"
-        android:text="保\u3000存"
-        android:textColor="@color/white" />
+        android:insetTop="0dp"
+        android:insetBottom="0dp"
+        android:text="保\u3000存" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_marker.xml b/app/src/main/res/layout/activity_search_marker.xml
index 4fc9888..e9f00ff 100644
--- a/app/src/main/res/layout/activity_search_marker.xml
+++ b/app/src/main/res/layout/activity_search_marker.xml
@@ -102,7 +102,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/dp_20"
             android:layout_marginVertical="@dimen/dp_3"
-            android:max="5150"
+            android:max="5165"
             android:progressDrawable="@drawable/bg_progress_bar" />
 
         <View
@@ -156,6 +156,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器测距"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -164,10 +167,13 @@
             android:id="@+id/markerIdButton"
             android:layout_width="@dimen/dp_50"
             android:layout_height="@dimen/dp_50"
-            android:layout_marginHorizontal="@dimen/dp_5"
+            android:layout_marginHorizontal="@dimen/dp_10"
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="ID"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
@@ -180,6 +186,9 @@
             android:backgroundTint="#8A8A8A"
             android:enabled="false"
             android:fontFamily="@font/fzdhjt"
+            android:insetTop="0dp"
+            android:insetBottom="0dp"
+            android:paddingHorizontal="0dp"
             android:text="标识器信息"
             android:textColor="#CCCCCC"
             android:textSize="@dimen/sp_18" />
diff --git a/app/src/main/res/layout/activity_upload_event.xml b/app/src/main/res/layout/activity_upload_event.xml
index 84490e9..2280965 100644
--- a/app/src/main/res/layout/activity_upload_event.xml
+++ b/app/src/main/res/layout/activity_upload_event.xml
@@ -188,14 +188,14 @@
 
                 <Button
                     android:id="@+id/cancelButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="取消"
-                    android:textColor="@color/red"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/red" />
 
                 <View
                     android:layout_width="@dimen/lib_px_1"
@@ -204,14 +204,14 @@
 
                 <Button
                     android:id="@+id/uploadEventButton"
+                    style="@style/Widget.MaterialComponents.Button.TextButton"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
-                    android:background="@drawable/dialog_button_selector"
-                    android:gravity="center"
+                    android:insetTop="0dp"
+                    android:insetBottom="0dp"
                     android:text="上报"
-                    android:textColor="@color/themeColor"
-                    android:textSize="@dimen/lib_sp_16" />
+                    android:textColor="@color/themeColor" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_version_control.xml b/app/src/main/res/layout/activity_version_control.xml
index 15f3a91..e10cd77 100644
--- a/app/src/main/res/layout/activity_version_control.xml
+++ b/app/src/main/res/layout/activity_version_control.xml
@@ -25,15 +25,12 @@
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <com.qmuiteam.qmui.widget.QMUIRadiusImageView
-            android:layout_width="@dimen/dp_60"
-            android:layout_height="@dimen/dp_60"
-            android:layout_marginTop="@dimen/dp_40"
-            android:layout_marginBottom="@dimen/dp_20"
-            android:scaleType="centerCrop"
-            android:src="@mipmap/ic_launcher"
-            app:qmui_border_width="0dp"
-            app:qmui_corner_radius="7dp" />
+        <ImageView
+            android:layout_width="@dimen/dp_75"
+            android:layout_height="@dimen/dp_75"
+            android:layout_marginTop="@dimen/dp_30"
+            android:layout_marginBottom="@dimen/dp_10"
+            android:src="@mipmap/ic_launcher" />
 
         <TextView
             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_query_marker.xml b/app/src/main/res/layout/dialog_query_marker.xml
index 8245b7b..9b7fe0a 100644
--- a/app/src/main/res/layout/dialog_query_marker.xml
+++ b/app/src/main/res/layout/dialog_query_marker.xml
@@ -96,14 +96,14 @@
 
             <Button
                 android:id="@+id/dialogCancelButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="取消"
-                android:textColor="@color/red"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/red" />
 
             <View
                 android:layout_width="@dimen/lib_px_1"
@@ -112,14 +112,14 @@
 
             <Button
                 android:id="@+id/dialogConfirmButton"
+                style="@style/Widget.MaterialComponents.Button.TextButton"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
-                android:background="@drawable/dialog_button_selector"
-                android:gravity="center"
+                android:insetTop="0dp"
+                android:insetBottom="0dp"
                 android:text="确定"
-                android:textColor="@color/blue"
-                android:textSize="@dimen/lib_sp_16" />
+                android:textColor="@color/themeColor" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_popup_menu.xml b/app/src/main/res/layout/item_popup_menu.xml
index b4f4ba4..6aa1b14 100644
--- a/app/src/main/res/layout/item_popup_menu.xml
+++ b/app/src/main/res/layout/item_popup_menu.xml
@@ -14,12 +14,11 @@
         android:layout_weight="1"
         android:textColor="@color/white" />
 
-    <com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton
+    <androidx.cardview.widget.CardView
         android:id="@+id/tagView"
         android:layout_width="@dimen/dp_10"
         android:layout_height="@dimen/dp_10"
         android:layout_marginStart="@dimen/dp_7"
-        app:qmui_backgroundColor="@color/white"
-        app:qmui_borderColor="@color/white"
-        app:qmui_radius="@dimen/dp_5" />
+        android:backgroundTint="@color/white"
+        app:cardCornerRadius="@dimen/dp_5" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_satellite_rv_l.xml b/app/src/main/res/layout/item_satellite_rv_l.xml
index 5756daa..b421ebc 100644
--- a/app/src/main/res/layout/item_satellite_rv_l.xml
+++ b/app/src/main/res/layout/item_satellite_rv_l.xml
@@ -42,13 +42,14 @@
         android:gravity="center_vertical"
         android:orientation="horizontal">
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.LinearProgressIndicator
             android:id="@+id/signalProgressView"
-            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:max="63" />
+            android:max="63"
+            app:trackColor="@color/mainBackground"
+            app:trackCornerRadius="@dimen/lib_dp_5" />
 
         <TextView
             android:id="@+id/signalValueView"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3859695..c056e28 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,14 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!--按钮样式-->
-    <style name="MainButtonStyle">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">@dimen/dp_40</item>
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">@dimen/sp_16</item>
-        <item name="android:background">@drawable/button_main_selector</item>
-    </style>
-
     <style name="PopupTextViewStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -54,7 +45,7 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">@dimen/sp_18</item>
+        <item name="android:textSize">@dimen/sp_16</item>
     </style>
 
     <!--安装标识器输入框-->
@@ -68,7 +59,7 @@
         <item name="android:singleLine">true</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:textColorHint">@color/hintColor</item>
-        <item name="android:textSize">@dimen/sp_18</item>
+        <item name="android:textSize">@dimen/sp_16</item>
     </style>
 
     <style name="spinnerStyle">
@@ -86,7 +77,7 @@
         <item name="android:layout_marginStart">@dimen/dp_125</item>
         <item name="android:textColor">@color/black</item>
         <item name="android:textColorHint">@color/hintColor</item>
-        <item name="android:textSize">@dimen/sp_14</item>
+        <item name="android:textSize">@dimen/sp_16</item>
         <item name="android:singleLine">true</item>
     </style>
 
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 251fecf..427cc8c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,22 +1,15 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="Theme.Detector" parent="QMUI.Compat.NoActionBar">
-        <!-- 修改控件系统默认颜色 -->
+    <style name="Base.Theme.Detector.NoActionBar" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <!-- Customize your light theme here. -->
+        <item name="colorPrimary">@color/themeColor</item>
         <item name="colorAccent">@color/themeColor</item>
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/teal_200</item>
-        <item name="colorSecondaryVariant">@color/teal_700</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
     </style>
 
-    <style name="Theme.ActivityDialogStyle" parent="Theme.AppCompat.NoActionBar">
+    <style name="Theme.Detector.NoActionBar" parent="Base.Theme.Detector.NoActionBar" />
+
+    <!-- TODO 背景有点问题，不是透明的 -->
+    <style name="Theme.ActivityDialogStyle" parent="Base.Theme.Detector.NoActionBar">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:windowFrame">@null</item>
         <item name="android:windowNoTitle">true</item>
@@ -24,6 +17,6 @@
         <item name="android:windowIsTranslucent">true</item>
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
-        <item name="android:backgroundDimEnabled">true</item>
+        <item name="android:backgroundDimEnabled">false</item> <!-- 禁用背景变暗 -->
     </style>
 </resources>
\ No newline at end of file