diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 8a95734..4145a5e 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -310,8 +310,8 @@
     }
 
     override fun onDestroy() {
+        super.onDestroy()
         gpioManager.setGpioLow("18")
         detectTimer.cancel()
-        super.onDestroy()
     }
 }
\ No newline at end of file

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 8a95734..4145a5e 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -310,8 +310,8 @@
     }
 
     override fun onDestroy() {
+        super.onDestroy()
         gpioManager.setGpioLow("18")
         detectTimer.cancel()
-        super.onDestroy()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
index ece2b60..4d3d111 100644
--- a/app/src/main/res/layout/activity_permssion.xml
+++ b/app/src/main/res/layout/activity_permssion.xml
@@ -5,21 +5,14 @@
     android:background="@mipmap/splash_background">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
         android:src="@mipmap/splash_logo" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:src="@mipmap/splash_text"
-        android:visibility="invisible" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_above="@id/textView"
         android:layout_centerHorizontal="true"
         android:src="@mipmap/splash_casic" />

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 8a95734..4145a5e 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -310,8 +310,8 @@
     }
 
     override fun onDestroy() {
+        super.onDestroy()
         gpioManager.setGpioLow("18")
         detectTimer.cancel()
-        super.onDestroy()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
index ece2b60..4d3d111 100644
--- a/app/src/main/res/layout/activity_permssion.xml
+++ b/app/src/main/res/layout/activity_permssion.xml
@@ -5,21 +5,14 @@
     android:background="@mipmap/splash_background">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
         android:src="@mipmap/splash_logo" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:src="@mipmap/splash_text"
-        android:visibility="invisible" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_above="@id/textView"
         android:layout_centerHorizontal="true"
         android:src="@mipmap/splash_casic" />
diff --git a/app/src/main/res/layout/include_install_label_open_camera.xml b/app/src/main/res/layout/include_install_label_open_camera.xml
index 2ebfeea..105c34b 100644
--- a/app/src/main/res/layout/include_install_label_open_camera.xml
+++ b/app/src/main/res/layout/include_install_label_open_camera.xml
@@ -29,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_12"
             android:gravity="bottom"
             android:text="长按图片可删除"
-            android:textColor="@color/hintColor"
+            android:textColor="@color/red"
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 8a95734..4145a5e 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -310,8 +310,8 @@
     }
 
     override fun onDestroy() {
+        super.onDestroy()
         gpioManager.setGpioLow("18")
         detectTimer.cancel()
-        super.onDestroy()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
index ece2b60..4d3d111 100644
--- a/app/src/main/res/layout/activity_permssion.xml
+++ b/app/src/main/res/layout/activity_permssion.xml
@@ -5,21 +5,14 @@
     android:background="@mipmap/splash_background">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
         android:src="@mipmap/splash_logo" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:src="@mipmap/splash_text"
-        android:visibility="invisible" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_above="@id/textView"
         android:layout_centerHorizontal="true"
         android:src="@mipmap/splash_casic" />
diff --git a/app/src/main/res/layout/include_install_label_open_camera.xml b/app/src/main/res/layout/include_install_label_open_camera.xml
index 2ebfeea..105c34b 100644
--- a/app/src/main/res/layout/include_install_label_open_camera.xml
+++ b/app/src/main/res/layout/include_install_label_open_camera.xml
@@ -29,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_12"
             android:gravity="bottom"
             android:text="长按图片可删除"
-            android:textColor="@color/hintColor"
+            android:textColor="@color/red"
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-xhdpi/circle.png b/app/src/main/res/mipmap-xhdpi/circle.png
deleted file mode 100644
index 17f83e5..0000000
--- a/app/src/main/res/mipmap-xhdpi/circle.png
+++ /dev/null
Binary files differ

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 8a95734..4145a5e 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -310,8 +310,8 @@
     }
 
     override fun onDestroy() {
+        super.onDestroy()
         gpioManager.setGpioLow("18")
         detectTimer.cancel()
-        super.onDestroy()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
index ece2b60..4d3d111 100644
--- a/app/src/main/res/layout/activity_permssion.xml
+++ b/app/src/main/res/layout/activity_permssion.xml
@@ -5,21 +5,14 @@
     android:background="@mipmap/splash_background">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
         android:src="@mipmap/splash_logo" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:src="@mipmap/splash_text"
-        android:visibility="invisible" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_above="@id/textView"
         android:layout_centerHorizontal="true"
         android:src="@mipmap/splash_casic" />
diff --git a/app/src/main/res/layout/include_install_label_open_camera.xml b/app/src/main/res/layout/include_install_label_open_camera.xml
index 2ebfeea..105c34b 100644
--- a/app/src/main/res/layout/include_install_label_open_camera.xml
+++ b/app/src/main/res/layout/include_install_label_open_camera.xml
@@ -29,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_12"
             android:gravity="bottom"
             android:text="长按图片可删除"
-            android:textColor="@color/hintColor"
+            android:textColor="@color/red"
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-xhdpi/circle.png b/app/src/main/res/mipmap-xhdpi/circle.png
deleted file mode 100644
index 17f83e5..0000000
--- a/app/src/main/res/mipmap-xhdpi/circle.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/panel.png b/app/src/main/res/mipmap-xhdpi/panel.png
deleted file mode 100644
index 225e0a7..0000000
--- a/app/src/main/res/mipmap-xhdpi/panel.png
+++ /dev/null
Binary files differ

diff --git a/app/src/main/java/com/casic/detector/view/MainActivity.kt b/app/src/main/java/com/casic/detector/view/MainActivity.kt
index 9587efb..81fedfa 100644
--- a/app/src/main/java/com/casic/detector/view/MainActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/MainActivity.kt
@@ -592,7 +592,7 @@
     private fun uploadEvent() {
         val taskId = SaveKeyValues.getValue(LocaleConstant.TASK_ID, "") as String
         if (taskId.isBlank()) {
-            "请点击[巡检]并选择执行工单！".show(this)
+            "已完成全部巡检".show(this)
             return
         }
         if (latitude != 0.0 && longitude != 0.0) {
diff --git a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
index 8a95734..4145a5e 100644
--- a/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
+++ b/app/src/main/java/com/casic/detector/view/SearchLabelActivity.kt
@@ -310,8 +310,8 @@
     }
 
     override fun onDestroy() {
+        super.onDestroy()
         gpioManager.setGpioLow("18")
         detectTimer.cancel()
-        super.onDestroy()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_permssion.xml b/app/src/main/res/layout/activity_permssion.xml
index ece2b60..4d3d111 100644
--- a/app/src/main/res/layout/activity_permssion.xml
+++ b/app/src/main/res/layout/activity_permssion.xml
@@ -5,21 +5,14 @@
     android:background="@mipmap/splash_background">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerVertical="true"
         android:src="@mipmap/splash_logo" />
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:src="@mipmap/splash_text"
-        android:visibility="invisible" />
-
-    <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
         android:layout_above="@id/textView"
         android:layout_centerHorizontal="true"
         android:src="@mipmap/splash_casic" />
diff --git a/app/src/main/res/layout/include_install_label_open_camera.xml b/app/src/main/res/layout/include_install_label_open_camera.xml
index 2ebfeea..105c34b 100644
--- a/app/src/main/res/layout/include_install_label_open_camera.xml
+++ b/app/src/main/res/layout/include_install_label_open_camera.xml
@@ -29,7 +29,7 @@
             android:layout_marginVertical="@dimen/dp_12"
             android:gravity="bottom"
             android:text="长按图片可删除"
-            android:textColor="@color/hintColor"
+            android:textColor="@color/red"
             android:textSize="@dimen/sp_12" />
     </LinearLayout>
 
diff --git a/app/src/main/res/mipmap-xhdpi/circle.png b/app/src/main/res/mipmap-xhdpi/circle.png
deleted file mode 100644
index 17f83e5..0000000
--- a/app/src/main/res/mipmap-xhdpi/circle.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/panel.png b/app/src/main/res/mipmap-xhdpi/panel.png
deleted file mode 100644
index 225e0a7..0000000
--- a/app/src/main/res/mipmap-xhdpi/panel.png
+++ /dev/null
Binary files differ
diff --git a/app/src/main/res/mipmap-xhdpi/splash_text.png b/app/src/main/res/mipmap-xhdpi/splash_text.png
deleted file mode 100644
index 25684d7..0000000
--- a/app/src/main/res/mipmap-xhdpi/splash_text.png
+++ /dev/null
Binary files differ