diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
index 46c17e3..5e458f1 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
@@ -31,29 +31,11 @@
     }
 
     public static class DataModel {
-        private String extinguisher_alarm;
-        private String blower_alarm;
         private String break_alarm;
         private String no_supervisor_alarm;
         private String smoke_alarm;
         private double smoke_conf;
 
-        public String getExtinguisher_alarm() {
-            return extinguisher_alarm;
-        }
-
-        public void setExtinguisher_alarm(String extinguisher_alarm) {
-            this.extinguisher_alarm = extinguisher_alarm;
-        }
-
-        public String getBlower_alarm() {
-            return blower_alarm;
-        }
-
-        public void setBlower_alarm(String blower_alarm) {
-            this.blower_alarm = blower_alarm;
-        }
-
         public String getBreak_alarm() {
             return break_alarm;
         }

diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
index 46c17e3..5e458f1 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
@@ -31,29 +31,11 @@
     }
 
     public static class DataModel {
-        private String extinguisher_alarm;
-        private String blower_alarm;
         private String break_alarm;
         private String no_supervisor_alarm;
         private String smoke_alarm;
         private double smoke_conf;
 
-        public String getExtinguisher_alarm() {
-            return extinguisher_alarm;
-        }
-
-        public void setExtinguisher_alarm(String extinguisher_alarm) {
-            this.extinguisher_alarm = extinguisher_alarm;
-        }
-
-        public String getBlower_alarm() {
-            return blower_alarm;
-        }
-
-        public void setBlower_alarm(String blower_alarm) {
-            this.blower_alarm = blower_alarm;
-        }
-
         public String getBreak_alarm() {
             return break_alarm;
         }
diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
index de30dc1..43bbaa0 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
@@ -71,32 +71,6 @@
             )
         }
 
-        binding.extinguisherCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            val state = if (isChecked) {
-                "1"
-            } else {
-                "0"
-            }
-
-            alarmViewModel.changeOtherAlarmState(
-                LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP,
-                "extinguisher", "", state
-            )
-        }
-
-        binding.blowerCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            val state = if (isChecked) {
-                "1"
-            } else {
-                "0"
-            }
-
-            alarmViewModel.changeOtherAlarmState(
-                LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP,
-                "blower", "", state
-            )
-        }
-
         binding.noneSupervisorCheckbox.setOnCheckedChangeListener { _, isChecked ->
             val state = if (isChecked) {
                 "1"
@@ -247,8 +221,6 @@
         alarmViewModel.otherStateResult.observe(this) { result ->
             if (result.code == 200) {
                 result.data.let {
-                    binding.extinguisherCheckbox.isChecked = it.extinguisher_alarm == "1"
-                    binding.blowerCheckbox.isChecked = it.blower_alarm == "1"
                     binding.noneSupervisorCheckbox.isChecked = it.no_supervisor_alarm == "1"
                     binding.intrudeCheckbox.isChecked = it.break_alarm == "1"
                     binding.smokeCheckbox.isChecked = it.smoke_alarm == "1"

diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
index 46c17e3..5e458f1 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
@@ -31,29 +31,11 @@
     }
 
     public static class DataModel {
-        private String extinguisher_alarm;
-        private String blower_alarm;
         private String break_alarm;
         private String no_supervisor_alarm;
         private String smoke_alarm;
         private double smoke_conf;
 
-        public String getExtinguisher_alarm() {
-            return extinguisher_alarm;
-        }
-
-        public void setExtinguisher_alarm(String extinguisher_alarm) {
-            this.extinguisher_alarm = extinguisher_alarm;
-        }
-
-        public String getBlower_alarm() {
-            return blower_alarm;
-        }
-
-        public void setBlower_alarm(String blower_alarm) {
-            this.blower_alarm = blower_alarm;
-        }
-
         public String getBreak_alarm() {
             return break_alarm;
         }
diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
index de30dc1..43bbaa0 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
@@ -71,32 +71,6 @@
             )
         }
 
-        binding.extinguisherCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            val state = if (isChecked) {
-                "1"
-            } else {
-                "0"
-            }
-
-            alarmViewModel.changeOtherAlarmState(
-                LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP,
-                "extinguisher", "", state
-            )
-        }
-
-        binding.blowerCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            val state = if (isChecked) {
-                "1"
-            } else {
-                "0"
-            }
-
-            alarmViewModel.changeOtherAlarmState(
-                LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP,
-                "blower", "", state
-            )
-        }
-
         binding.noneSupervisorCheckbox.setOnCheckedChangeListener { _, isChecked ->
             val state = if (isChecked) {
                 "1"
@@ -247,8 +221,6 @@
         alarmViewModel.otherStateResult.observe(this) { result ->
             if (result.code == 200) {
                 result.data.let {
-                    binding.extinguisherCheckbox.isChecked = it.extinguisher_alarm == "1"
-                    binding.blowerCheckbox.isChecked = it.blower_alarm == "1"
                     binding.noneSupervisorCheckbox.isChecked = it.no_supervisor_alarm == "1"
                     binding.intrudeCheckbox.isChecked = it.break_alarm == "1"
                     binding.smokeCheckbox.isChecked = it.smoke_alarm == "1"
diff --git a/app/src/main/res/layout/activity_guardians.xml b/app/src/main/res/layout/activity_guardians.xml
index 4952956..3daa311 100644
--- a/app/src/main/res/layout/activity_guardians.xml
+++ b/app/src/main/res/layout/activity_guardians.xml
@@ -145,29 +145,6 @@
                         android:textSize="@dimen/sp_12" />
 
                     <CheckBox
-                        android:id="@+id/extinguisherCheckbox"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="@dimen/dp_5"
-                        android:layout_weight="1"
-                        android:text="灭火器"
-                        android:textSize="@dimen/sp_12" />
-
-                    <CheckBox
-                        android:id="@+id/blowerCheckbox"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="鼓风机"
-                        android:textSize="@dimen/sp_12" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <CheckBox
                         android:id="@+id/noneSupervisorCheckbox"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -211,7 +188,6 @@
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginVertical="@dimen/dp_10"
                     app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                     app:spanCount="3" />
 
@@ -219,6 +195,7 @@
                     android:id="@+id/endTaskButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginVertical="@dimen/dp_10"
                     android:background="@drawable/button_check_selector"
                     android:text="结束此次作业"
                     android:textColor="@color/black" />

diff --git a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
index 46c17e3..5e458f1 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
+++ b/app/src/main/java/com/casic/br/operationsite/test/model/OtherAlarmStateModel.java
@@ -31,29 +31,11 @@
     }
 
     public static class DataModel {
-        private String extinguisher_alarm;
-        private String blower_alarm;
         private String break_alarm;
         private String no_supervisor_alarm;
         private String smoke_alarm;
         private double smoke_conf;
 
-        public String getExtinguisher_alarm() {
-            return extinguisher_alarm;
-        }
-
-        public void setExtinguisher_alarm(String extinguisher_alarm) {
-            this.extinguisher_alarm = extinguisher_alarm;
-        }
-
-        public String getBlower_alarm() {
-            return blower_alarm;
-        }
-
-        public void setBlower_alarm(String blower_alarm) {
-            this.blower_alarm = blower_alarm;
-        }
-
         public String getBreak_alarm() {
             return break_alarm;
         }
diff --git a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
index de30dc1..43bbaa0 100644
--- a/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
+++ b/app/src/main/java/com/casic/br/operationsite/test/view/GuardiansActivity.kt
@@ -71,32 +71,6 @@
             )
         }
 
-        binding.extinguisherCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            val state = if (isChecked) {
-                "1"
-            } else {
-                "0"
-            }
-
-            alarmViewModel.changeOtherAlarmState(
-                LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP,
-                "extinguisher", "", state
-            )
-        }
-
-        binding.blowerCheckbox.setOnCheckedChangeListener { _, isChecked ->
-            val state = if (isChecked) {
-                "1"
-            } else {
-                "0"
-            }
-
-            alarmViewModel.changeOtherAlarmState(
-                LocaleConstant.AI_BASE_IP, LocaleConstant.CAMERA_IP,
-                "blower", "", state
-            )
-        }
-
         binding.noneSupervisorCheckbox.setOnCheckedChangeListener { _, isChecked ->
             val state = if (isChecked) {
                 "1"
@@ -247,8 +221,6 @@
         alarmViewModel.otherStateResult.observe(this) { result ->
             if (result.code == 200) {
                 result.data.let {
-                    binding.extinguisherCheckbox.isChecked = it.extinguisher_alarm == "1"
-                    binding.blowerCheckbox.isChecked = it.blower_alarm == "1"
                     binding.noneSupervisorCheckbox.isChecked = it.no_supervisor_alarm == "1"
                     binding.intrudeCheckbox.isChecked = it.break_alarm == "1"
                     binding.smokeCheckbox.isChecked = it.smoke_alarm == "1"
diff --git a/app/src/main/res/layout/activity_guardians.xml b/app/src/main/res/layout/activity_guardians.xml
index 4952956..3daa311 100644
--- a/app/src/main/res/layout/activity_guardians.xml
+++ b/app/src/main/res/layout/activity_guardians.xml
@@ -145,29 +145,6 @@
                         android:textSize="@dimen/sp_12" />
 
                     <CheckBox
-                        android:id="@+id/extinguisherCheckbox"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginHorizontal="@dimen/dp_5"
-                        android:layout_weight="1"
-                        android:text="灭火器"
-                        android:textSize="@dimen/sp_12" />
-
-                    <CheckBox
-                        android:id="@+id/blowerCheckbox"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight="1"
-                        android:text="鼓风机"
-                        android:textSize="@dimen/sp_12" />
-                </LinearLayout>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="horizontal">
-
-                    <CheckBox
                         android:id="@+id/noneSupervisorCheckbox"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
@@ -211,7 +188,6 @@
                     android:id="@+id/recyclerView"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginVertical="@dimen/dp_10"
                     app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
                     app:spanCount="3" />
 
@@ -219,6 +195,7 @@
                     android:id="@+id/endTaskButton"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_marginVertical="@dimen/dp_10"
                     android:background="@drawable/button_check_selector"
                     android:text="结束此次作业"
                     android:textColor="@color/black" />
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ebb70b5..e30dd6b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">动态感知-演示</string>
+    <string name="app_name">动态感知-演练</string>
     <string name="group_name">中国航天科工集团二院二〇三所</string>
     <string name="unknown">数据获取中…</string>
 </resources>
\ No newline at end of file