desc:增加泵开关

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

@@ -26,6 +26,7 @@ import com.yinuo.safetywatcher.watcher.utils.BatteryHelper
 import com.yinuo.safetywatcher.watcher.utils.GPIOUtils
 import com.yinuo.safetywatcher.watcher.utils.RecordHelper
 import com.yinuo.safetywatcher.watcher.utils.SimHelper
+import com.yinuo.safetywatcher.watcher.utils.SpeedUtils
 import com.yinuo.safetywatcher.watcher.utils.WifiHelper
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -83,12 +84,30 @@ class HomeActivity : NoOptionsActivity() {
                 if (isChecked) onCameraOpen() else onCameraClose()
             }
 
+            itemPump.setOnClickListener {
+                pumpSwitch.performClick()
+            }
+            pumpSwitch.setOnCheckedChangeListener { buttonView, isChecked ->
+                if (isChecked) onPumpOpen() else onPumpClose()
+            }
+
             itemSetting.post {
                 itemSetting.requestFocus()
             }
         }
     }
 
+    private fun onPumpClose() {
+        SpeedUtils.setSpeed(0)
+        GasPortUtils.setSpeed(0)
+    }
+
+    private fun onPumpOpen() {
+        val localSpeed = SpeedUtils.getLocalSpeed()
+        SpeedUtils.setSpeed(localSpeed)
+        GasPortUtils.setSpeed(localSpeed)
+    }
+
     private fun onCameraOpen() {
         // 启动录制编码
         RecordHelper.startRecording()

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

@@ -8,6 +8,7 @@ import com.yinuo.safetywatcher.R
 import com.yinuo.safetywatcher.databinding.ActivitySettingBinding
 import com.yinuo.safetywatcher.watcher.base.NoOptionsActivity
 import com.yinuo.safetywatcher.watcher.ui.view.ConfirmDialog
+import com.yinuo.safetywatcher.watcher.utils.SpeedUtils
 
 class SettingActivity : NoOptionsActivity() {
 
@@ -30,6 +31,7 @@ class SettingActivity : NoOptionsActivity() {
     }
 
     override fun initView() {
+        val speed = SpeedUtils.getSpeed()
         mBinding.apply {
             itemTime.setOnClickListener {
                 startActivity(Intent(this@SettingActivity, TimeSettingActivity::class.java))
@@ -52,6 +54,7 @@ class SettingActivity : NoOptionsActivity() {
             itemSpeed.setOnClickListener {
                 startActivity(Intent(this@SettingActivity, SpeedSettingActivity::class.java))
             }
+            itemSpeed.visibility = if (speed == 0) View.GONE else View.VISIBLE
             itemCloud.setOnClickListener {
                 startActivity(Intent(this@SettingActivity, CloudActivity::class.java))
             }

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

@@ -76,6 +76,9 @@ class SpeedSettingActivity : NoOptionsActivity() {
     }
 
     private fun getShowSpeed(speed: Int): CharSequence? {
-        return "${speed + 1}档"
+        if (speed == 0) {
+            return "关闭"
+        }
+        return "${speed}档"
     }
 }

app/src/main/java/com/yinuo/safetywatcher/watcher/utils/SpeedUtils.kt

@@ -1,5 +1,7 @@
 package com.yinuo.safetywatcher.watcher.utils
 
+import com.common.commonlib.utils.MMKVUtils
+
 object SpeedUtils {
     private var speed = 0
 
@@ -9,5 +11,16 @@ object SpeedUtils {
 
     fun setSpeed(legalSpeed: Int) {
         this.speed = legalSpeed
+        if (legalSpeed != 0) {
+            MMKVUtils.put("LocalSpeed", legalSpeed)
+        }
+    }
+
+    fun getLocalSpeed(): Int {
+        var localValue = MMKVUtils.getInt("LocalSpeed")
+        if (localValue<0){
+            localValue = 1
+        }
+        return localValue
     }
 }

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

@@ -26,7 +26,7 @@
     <LinearLayout
         android:id="@+id/setting_area"
         android:layout_width="@dimen/_288dp"
-        android:layout_height="@dimen/_536dp"
+        android:layout_height="@dimen/_624dp"
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="@dimen/_21dp"
         android:layout_marginTop="@dimen/_260dp"
@@ -152,6 +152,30 @@
                 android:layout_height="@dimen/_34dp"
                 android:layout_marginStart="@dimen/_13dp" />
         </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/item_pump"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/_88dp"
+            android:focusable="true"
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="@dimen/_66dp">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/pump_switch"
+                android:textColor="@color/white"
+                android:textSize="@dimen/_30dp" />
+
+            <androidx.appcompat.widget.SwitchCompat
+                android:id="@+id/pump_switch"
+                android:layout_width="wrap_content"
+                android:checked="false"
+                android:layout_height="@dimen/_34dp"
+                android:layout_marginStart="@dimen/_13dp" />
+        </LinearLayout>
     </LinearLayout>
 
     <TextView

app/src/main/res/values/dimens.xml

@@ -61,4 +61,5 @@
     <dimen name="_1920dp">1920px</dimen>
     <dimen name="_1080dp">1080px</dimen>
     <dimen name="_120dp">120px</dimen>
+    <dimen name="_624dp">624px</dimen>
 </resources>

app/src/main/res/values/strings.xml

@@ -92,4 +92,6 @@
     <string name="sensor_status_off">通道关闭</string>
 
     <string name="net_off">无网络连接，请稍后再试！</string>
+
+    <string name="pump_switch">泵开关</string>
 </resources>