From 4a584fa7d730848e03a9dfd710a303daf9424fed Mon Sep 17 00:00:00 2001 From: maxinyu Date: Mon, 29 Jun 2026 15:20:47 +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=93=8D=E4=BD=9C=E5=AF=86=E7=A0=81=E4=BC=A0?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle.kts | 8 -------- .../defense_device/liveVideo/AutoModeActivity.kt | 6 +++++- .../defense_device/liveVideo/SettingsActivity.kt | 13 ++++++++----- .../res/layout/warning_voice_content_activity.xml | 1 + 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index af905a8..cce70d8 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -74,14 +74,8 @@ dependencies { // Kotlin 协程 implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3") - // CameraX 用于相机预览 - implementation("androidx.camera:camera-camera2:1.3.0") - implementation("androidx.camera:camera-lifecycle:1.3.0") - implementation("androidx.camera:camera-view:1.3.0") // Google ML Kit 人脸检测 implementation("com.google.mlkit:face-detection:16.1.5") - // 图形绘制库（绘制人脸框） - implementation("com.github.bumptech.glide:glide:4.15.1") //Glide 依赖 implementation("com.github.bumptech.glide:glide:4.16.0") // ZXing 二维码扫描库 @@ -92,8 +86,6 @@ dependencies { implementation("com.geyifeng.immersionbar:immersionbar-ktx:3.2.2") implementation("com.wdullaer:materialdatetimepicker:4.2.3") // 经典稳定 implementation("androidx.core:core-ktx:1.12.0") - // Android-PickerView 时间选择器 - implementation("com.contrarywind:Android-PickerView:4.1.9") //二维码三方库 implementation("com.github.maning0303:MNMLKitScanner:V1.0.4") implementation("com.google.mlkit:barcode-scanning:17.0.2") diff --git a/app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt b/app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt index 2d4bde1..16d6ded 100644 --- a/app/src/main/java/com/ckkj/defense_device/liveVideo/AutoModeActivity.kt +++ b/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) { 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 701e092..4d3fec7 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 @@ -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) { diff --git a/app/src/main/res/layout/warning_voice_content_activity.xml b/app/src/main/res/layout/warning_voice_content_activity.xml index a8ddaa6..f349279 100644 --- a/app/src/main/res/layout/warning_voice_content_activity.xml +++ b/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"