优化设置页面到操作密码传值

app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt

@@ -31,6 +31,7 @@ class AutoModeActivity : AppCompatActivity() {
     private var selectedStartMinute = 0
     private var selectedEndHour = 10
     private var selectedEndMinute = 0
+    private var optionPassword: String? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -42,6 +43,8 @@ class AutoModeActivity : AppCompatActivity() {
             .titleBar(binding.topBar)
             .init()
 
+        optionPassword = intent.getStringExtra("optionPassword")
+
         initListener()
 
         loadCurrentSettings()
@@ -177,7 +180,8 @@ class AutoModeActivity : AppCompatActivity() {
                     id = deviceId,
                     workMode = selectedMode,
                     startTime = startTime,
-                    endTime = endTime
+                    endTime = endTime,
+                    optionPassword = optionPassword
                 )
                 val response = RetrofitNetwork.getNetworkService().updateDeviceInfo(deviceBean)
                 withContext(Dispatchers.Main) {

app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt

@@ -56,15 +56,15 @@ class SettingsActivity : BaseActivity() {
             if (isPasswordVerified) {
                 val dialog = RecognitionModeDialog(this)
                 dialog.setOnConfirmListener { mode ->
-                    updateRecognitionMode(mode)
+                    updateRecognitionMode(mode, verifiedPassword)
                 }
                 dialog.show()
             } else {
-                showPasswordDialog { _ ->
+                showPasswordDialog { inputPassword ->
                     isPasswordVerified = true
                     val dialog = RecognitionModeDialog(this)
                     dialog.setOnConfirmListener { mode ->
-                        updateRecognitionMode(mode)
+                        updateRecognitionMode(mode, inputPassword)
                     }
                     dialog.show()
                 }
@@ -106,11 +106,13 @@ class SettingsActivity : BaseActivity() {
         binding.itemAutoMode.setOnClickListener {
             if (isPasswordVerified) {
                 val intent = Intent(this, AutoModeActivity::class.java)
+                intent.putExtra("optionPassword", verifiedPassword)
                 startActivity(intent)
             } else {
-                showPasswordDialog { _ ->
+                showPasswordDialog { inputPassword ->
                     isPasswordVerified = true
                     val intent = Intent(this, AutoModeActivity::class.java)
+                    intent.putExtra("optionPassword", inputPassword)
                     startActivity(intent)
                 }
             }
@@ -259,7 +261,7 @@ class SettingsActivity : BaseActivity() {
         }
     }
 
-    private fun updateRecognitionMode(mode: String) {
+    private fun updateRecognitionMode(mode: String, optionPassword: String?) {
         val deviceId = DeviceIdEvent.getDeviceId()
         if (deviceId.isNullOrEmpty()) {
             Toast.makeText(this, "设备ID为空", Toast.LENGTH_SHORT).show()
@@ -277,6 +279,7 @@ class SettingsActivity : BaseActivity() {
                 val deviceBean = com.ckkj.defense_device.bean.DeviceBean(
                     id = deviceId,
                     patternPerception = patternPerception,
+                    optionPassword = optionPassword
                 )
                 val response = RetrofitNetwork.getNetworkService().updateDeviceInfo(deviceBean)
                 withContext(Dispatchers.Main) {

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

@@ -77,6 +77,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/save"
+        android:textColor="@color/white"
         android:layout_marginEnd="20dp"
         android:layout_marginStart="20dp"
         android:layout_marginBottom="90dp"