From a32c165424ad310c94ca92b2e945861988522fd8 Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Mon, 29 Jun 2026 11:09:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=88=B0=E6=B0=B4=E6=9E=AA=E8=AE=BE=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E5=AF=86=E7=A0=81=E4=BC=A0=E5=80=BC=EF=BC=8C?=
 =?UTF-8?q?=E5=85=B3=E9=97=ADlint=E8=BF=99=E4=B8=AA=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle.kts                          |  5 +++++
 .../liveVideo/SettingsActivity.kt             | 19 +++++++++++--------
 .../liveVideo/WaterGunSettingsActivity.kt     | 11 ++++++++---
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 3be2d50..af905a8 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -36,6 +36,11 @@ android {
     buildFeatures {
         viewBinding=true
     }
+    lint {
+        disable += "ExpiredTargetSdkVersion"
+        checkReleaseBuilds = false
+        abortOnError = false
+    }
 }
 
 dependencies {
diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt
index 90dbec4..701e092 100644
--- a/app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/SettingsActivity.kt
@@ -27,6 +27,7 @@ class SettingsActivity : BaseActivity() {
     private var alertAudio: String? = null
     private var audioContent: String? = null
     private var isPasswordVerified = false
+    private var verifiedPassword: String? = null
 
     override fun onResume() {
         super.onResume()
@@ -59,7 +60,7 @@ class SettingsActivity : BaseActivity() {
                 }
                 dialog.show()
             } else {
-                showPasswordDialog {
+                showPasswordDialog { _ ->
                     isPasswordVerified = true
                     val dialog = RecognitionModeDialog(this)
                     dialog.setOnConfirmListener { mode ->
@@ -94,11 +95,11 @@ class SettingsActivity : BaseActivity() {
         }
         binding.itemWaterGunSetting.setOnClickListener {
             if (isPasswordVerified) {
-                navigateToWaterGunSettings()
+                navigateToWaterGunSettings(verifiedPassword)
             } else {
-                showPasswordDialog {
+                showPasswordDialog { inputPassword ->
                     isPasswordVerified = true
-                    navigateToWaterGunSettings()
+                    navigateToWaterGunSettings(inputPassword)
                 }
             }
         }
@@ -107,7 +108,7 @@ class SettingsActivity : BaseActivity() {
                 val intent = Intent(this, AutoModeActivity::class.java)
                 startActivity(intent)
             } else {
-                showPasswordDialog {
+                showPasswordDialog { _ ->
                     isPasswordVerified = true
                     val intent = Intent(this, AutoModeActivity::class.java)
                     startActivity(intent)
@@ -328,7 +329,7 @@ class SettingsActivity : BaseActivity() {
         }
     }
 
-    private fun showPasswordDialog(onVerified: () -> Unit) {
+    private fun showPasswordDialog(onVerified: (String) -> Unit) {
         passwordDialog = PasswordInputDialog(this).apply {
             setOnConfirmListener { inputPassword ->
                 CoroutineScope(Dispatchers.IO).launch {
@@ -338,7 +339,8 @@ class SettingsActivity : BaseActivity() {
                         withContext(Dispatchers.Main) {
                             if (response.code == 200) {
                                 dismiss()
-                                onVerified()
+                                verifiedPassword = inputPassword
+                                onVerified(inputPassword)
                             } else {
                                 Toast.makeText(
                                     this@SettingsActivity,
@@ -365,8 +367,9 @@ class SettingsActivity : BaseActivity() {
         passwordDialog.show()
     }
 
-    private fun navigateToWaterGunSettings() {
+    private fun navigateToWaterGunSettings(optionPassword: String? = null) {
         val intent = Intent(this, WaterGunSettingsActivity::class.java)
+        intent.putExtra("optionPassword", optionPassword)
         val deviceId = DeviceIdEvent.getDeviceId()
         if (!deviceId.isNullOrEmpty()) {
             CoroutineScope(Dispatchers.IO).launch {
diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt
index c7fe23d..805edbc 100644
--- a/app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt
+++ b/app/src/main/java/com/ckkj/defense_device/liveVideo/WaterGunSettingsActivity.kt
@@ -24,6 +24,7 @@ class WaterGunSettingsActivity : BaseActivity() {
     private var currentStrikeRange: String = "7"
     private var currentStrikeInterval: String = "3"
     private var currentContainer: String = "容器4"
+    private var optionPassword: String? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -41,6 +42,7 @@ class WaterGunSettingsActivity : BaseActivity() {
         currentStrikeRange = intent.getStringExtra("strikeRange") ?: "7"
         currentStrikeInterval = intent.getStringExtra("strikeInterval") ?: "3"
         currentContainer = intent.getStringExtra("container") ?: "容器4"
+        optionPassword = intent.getStringExtra("optionPassword")
 
         // 显示初始值
         binding.tvDistance.text = "${currentStrikeRange}m"
@@ -100,7 +102,8 @@ class WaterGunSettingsActivity : BaseActivity() {
             try {
                 val deviceBean = DeviceBean(
                     id = deviceId,
-                    strikeRange = distance
+                    strikeRange = distance,
+                    optionPassword = optionPassword
                 )
                 val response = RetrofitNetwork.getNetworkService().updateDeviceInfo(deviceBean)
                 withContext(Dispatchers.Main) {
@@ -131,7 +134,8 @@ class WaterGunSettingsActivity : BaseActivity() {
             try {
                 val deviceBean = DeviceBean(
                     id = deviceId,
-                    strikeInterval = interval
+                    strikeInterval = interval,
+                    optionPassword = optionPassword
                 )
                 val response = RetrofitNetwork.getNetworkService().updateDeviceInfo(deviceBean)
                 withContext(Dispatchers.Main) {
@@ -162,7 +166,8 @@ class WaterGunSettingsActivity : BaseActivity() {
             try {
                 val deviceBean = DeviceBean(
                     id = deviceId,
-                    container = container
+                    container = container,
+                    optionPassword = optionPassword
                 )
                 val response = RetrofitNetwork.getNetworkService().updateDeviceInfo(deviceBean)
                 withContext(Dispatchers.Main) {