From 638968e90aac5ab5f64a9720127cc381eab30848 Mon Sep 17 00:00:00 2001
From: maxinyu <maxinyu@chengkong.com>
Date: Tue, 12 May 2026 08:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                  | 15 +++++++--------
 .../home/ConnectDeviceActivity.kt                 |  2 +-
 .../defenseapplication/home/HomeMenuFragment.kt   |  2 +-
 .../defenseapplication/home/PersonalFragment.kt   |  2 +-
 .../liveVideo/AddLinkedUserActivity.kt            |  2 +-
 .../liveVideo/AlarmLogActivity.kt                 |  2 +-
 .../liveVideo/AutoModeActivity.kt                 |  2 +-
 .../liveVideo/DeviceInfoActivity.kt               |  2 +-
 .../liveVideo/LinkedUserSearchActivity.kt         |  1 +
 .../liveVideo/LiveVideoActivity.kt                |  2 +-
 .../liveVideo/VoiceSettingsActivity.kt            |  1 +
 .../liveVideo/WarningVoiceContentActivity.kt      |  2 +-
 .../liveVideo/WaterGunSettingsActivity.kt         |  2 +-
 .../liveVideo/WiFiManagementActivity.kt           |  2 +-
 .../defenseapplication/login/FaceLoginActivity.kt |  2 +-
 .../login/FaceVerificationActivity.kt             |  2 +-
 .../login/ForgetPasswordActivity.kt               |  2 +-
 .../defenseapplication/login/LoginActivity.kt     |  2 +-
 .../login/RegisterSuccessActivity.kt              |  2 +-
 .../personal/PersonalProfileActivity.kt           |  2 +-
 .../main/res/layout/forget_password_activity.xml  |  2 +-
 .../main/res/layout/register_success_activity.xml |  2 +-
 22 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e28f437..e5e7a63 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -57,7 +57,12 @@
             android:exported="false" />
         <activity
             android:name=".liveVideo.SettingsActivity"
-            android:exported="false" />
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
         <activity
             android:name=".liveVideo.LiveVideoActivity"
             android:exported="false" />
@@ -81,13 +86,7 @@
             android:exported="false" />
         <activity
             android:name=".home.HomeActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
+            android:exported="false"/>
         <activity
             android:name=".login.RegisterSuccessActivity"
             android:exported="false" />
diff --git a/app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt b/app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt
index dff2fd1..937c78d 100644
--- a/app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/ConnectDeviceActivity.kt
@@ -15,7 +15,7 @@ import com.example.defenseapplication.R
 import com.example.defenseapplication.databinding.AddDeviceActivityBinding
 import com.example.defenseapplication.databinding.ConnectDeviceActivityBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//连接设备
 class ConnectDeviceActivity : AppCompatActivity() {
 
     private lateinit var binding: ConnectDeviceActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt b/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt
index 55f4fcd..e35024b 100644
--- a/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/HomeMenuFragment.kt
@@ -22,7 +22,7 @@ import com.example.defenseapplication.databinding.HomeMenuFragmentBinding
 import com.example.defenseapplication.view.DefenseDialogs
 import com.example.defenseapplication.view.showDefenseDialog
 import com.gyf.immersionbar.ImmersionBar
-
+//主页碎片
 class HomeMenuFragment : Fragment() {
     // ViewBinding
     private var _binding: HomeMenuFragmentBinding? = null
diff --git a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
index ef9d1c2..91cde94 100644
--- a/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
+++ b/app/src/main/java/com/example/defenseapplication/home/PersonalFragment.kt
@@ -14,7 +14,7 @@ import com.example.defenseapplication.utils.LanguageUtil
 import com.example.defenseapplication.view.FamilySwitchDialog
 import com.example.defenseapplication.view.LanguageDialog
 import com.gyf.immersionbar.ImmersionBar
-
+//我的碎片
 class PersonalFragment : Fragment() {
     // ViewBinding
     private var _binding: PersonalFragmentBinding? = null
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt
index 030ea96..091b6ae 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/AddLinkedUserActivity.kt
@@ -9,7 +9,7 @@ import com.example.defenseapplication.adapter.AddLinkedUserAdapter
 import com.example.defenseapplication.adapter.UserItem
 import com.example.defenseapplication.databinding.AddLinkedUserActivityBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//添加关联用户
 class AddLinkedUserActivity : AppCompatActivity() {
     private lateinit var binding: AddLinkedUserActivityBinding
     private val selectedPhoneSet = mutableSetOf<String>()
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt
index cf82599..0ca8b1d 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/AlarmLogActivity.kt
@@ -10,7 +10,7 @@ import com.example.defenseapplication.databinding.AlarmLogActivityBinding
 import com.gyf.immersionbar.ImmersionBar
 import com.google.android.material.datepicker.MaterialDatePicker
 import java.util.*
-
+//告警记录
 class AlarmLogActivity : AppCompatActivity() {
     private lateinit var binding: AlarmLogActivityBinding
     private lateinit var calendar: Calendar
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt
index c48ed3b..4037cf0 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/AutoModeActivity.kt
@@ -7,7 +7,7 @@ import com.example.defenseapplication.databinding.AutoModeActivityBinding
 import com.example.defenseapplication.view.AutoModeNoticeDialog
 import com.gyf.immersionbar.ImmersionBar
 import java.util.Calendar
-
+//自动模式
 class AutoModeActivity : AppCompatActivity() {
 
     private lateinit var binding: AutoModeActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt
index b2d37b4..ef7b449 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/DeviceInfoActivity.kt
@@ -9,7 +9,7 @@ import com.example.defenseapplication.R
 import com.example.defenseapplication.databinding.AlarmLogActivityBinding
 import com.example.defenseapplication.databinding.DeviceInfoActivityBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//设备信息
 class DeviceInfoActivity : AppCompatActivity() {
     private lateinit var binding: DeviceInfoActivityBinding
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserSearchActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserSearchActivity.kt
index 933789f..d341a7c 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserSearchActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/LinkedUserSearchActivity.kt
@@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.example.defenseapplication.databinding.LinkedUserSearchActivityBinding
 import com.gyf.immersionbar.ImmersionBar
 
+//搜索
 class LinkedUserSearchActivity : AppCompatActivity() {
 
     private lateinit var binding: LinkedUserSearchActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
index 990b66e..3b42226 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/LiveVideoActivity.kt
@@ -32,7 +32,7 @@ import java.io.File
 import java.io.IOException
 
 private const val TAG = "LiveVideoActivity"
-
+//智能防御机A1
 class LiveVideoActivity : AppCompatActivity(), SurfaceHolder.Callback {
     private lateinit var binding: LiveVideoActivityBinding
     
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt
index 4a8315b..e7d46b3 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/VoiceSettingsActivity.kt
@@ -14,6 +14,7 @@ import com.example.defenseapplication.databinding.SettingsActivityBinding
 import com.example.defenseapplication.databinding.VoiceSettingsActivityBinding
 import com.gyf.immersionbar.ImmersionBar
 
+//语音设置
 class VoiceSettingsActivity : AppCompatActivity() {
 
     private lateinit var binding: VoiceSettingsActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt
index ac786b1..dd1bb88 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/WarningVoiceContentActivity.kt
@@ -8,7 +8,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.widget.doAfterTextChanged
 import com.example.defenseapplication.databinding.WarningVoiceContentActivityBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//警告语音内容
 class WarningVoiceContentActivity : AppCompatActivity() {
 
     private lateinit var binding: WarningVoiceContentActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt
index 1eb3e2b..40c6a12 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/WaterGunSettingsActivity.kt
@@ -8,7 +8,7 @@ import com.example.defenseapplication.databinding.WaterGunSettingsActivityBindin
 import com.example.defenseapplication.view.ContainerSelectDialog
 import com.example.defenseapplication.view.CustomDialogFragmentText
 import com.gyf.immersionbar.ImmersionBar
-
+//水枪设置
 class WaterGunSettingsActivity : BaseActivity() {
 
     private lateinit var binding: WaterGunSettingsActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt b/app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt
index 6f234fa..e566dd9 100644
--- a/app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/liveVideo/WiFiManagementActivity.kt
@@ -23,7 +23,7 @@ import com.example.defenseapplication.adapter.WifiListAdapter
 import com.example.defenseapplication.databinding.DialogWifiListBinding
 import com.example.defenseapplication.databinding.WifiManagementActivityBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//WiFi管理
 class WiFiManagementActivity : AppCompatActivity() {
 
     private lateinit var binding: WifiManagementActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt b/app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt
index 24c403a..38f4ceb 100644
--- a/app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/login/FaceLoginActivity.kt
@@ -10,7 +10,7 @@ import androidx.core.view.WindowInsetsCompat
 import com.example.defenseapplication.R
 import com.example.defenseapplication.databinding.FaceLoginActivityBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//人脸识别
 class FaceLoginActivity : AppCompatActivity() {
 
     private lateinit var binding: FaceLoginActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt b/app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt
index 8b606f3..5aa40ca 100644
--- a/app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/login/FaceVerificationActivity.kt
@@ -18,7 +18,7 @@ import com.google.mlkit.vision.face.FaceDetectorOptions
 import com.gyf.immersionbar.ImmersionBar
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
-
+//人脸采集
 class FaceVerificationActivity : AppCompatActivity() {
 
     private lateinit var binding: FaceVerificationActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt b/app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt
index a968abe..3fc4b1a 100644
--- a/app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/login/ForgetPasswordActivity.kt
@@ -17,7 +17,7 @@ import com.google.firebase.crashlytics.buildtools.reloc.org.apache.http.util.Tex
 import com.gyf.immersionbar.ImmersionBar
 import java.util.regex.Pattern
 import kotlin.random.Random
-
+//找回密码
 class ForgetPasswordActivity : AppCompatActivity() {
     private lateinit var binding: ForgetPasswordActivityBinding
     private var verifyCode: String? = null          // 存储模拟验证码
diff --git a/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt b/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt
index 3d1df4a..3737cf1 100644
--- a/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/login/LoginActivity.kt
@@ -12,7 +12,7 @@ import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.constraintlayout.widget.ConstraintSet
 import com.example.defenseapplication.databinding.ActivityLoginBinding
 import com.gyf.immersionbar.ImmersionBar
-
+//登录
 class LoginActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityLoginBinding
diff --git a/app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt b/app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt
index dadadd3..2c475b4 100644
--- a/app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/login/RegisterSuccessActivity.kt
@@ -11,7 +11,7 @@ import com.example.defenseapplication.R
 import com.example.defenseapplication.databinding.RegisterSuccessActivityBinding
 import com.example.defenseapplication.home.HomeActivity
 import com.gyf.immersionbar.ImmersionBar
-
+//注册
 class RegisterSuccessActivity : AppCompatActivity() {
 
     private lateinit var binding: RegisterSuccessActivityBinding
diff --git a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt b/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt
index 881688b..3e3cddb 100644
--- a/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt
+++ b/app/src/main/java/com/example/defenseapplication/personal/PersonalProfileActivity.kt
@@ -13,7 +13,7 @@ import com.example.defenseapplication.databinding.PersonalProfileActivityBinding
 import com.example.defenseapplication.view.CustomDialogFragmentText
 import com.example.defenseapplication.view.PhoneModifyDialogFragment
 import com.gyf.immersionbar.ImmersionBar
-
+//个人信息
 class PersonalProfileActivity : AppCompatActivity() {
     private lateinit var binding: PersonalProfileActivityBinding
 
diff --git a/app/src/main/res/layout/forget_password_activity.xml b/app/src/main/res/layout/forget_password_activity.xml
index 09a7012..c93b0c7 100644
--- a/app/src/main/res/layout/forget_password_activity.xml
+++ b/app/src/main/res/layout/forget_password_activity.xml
@@ -33,7 +33,7 @@
             android:layout_height="wrap_content"
             android:text="@string/retrieve_password"
             android:textColor="@color/black"
-            android:textSize="32sp"
+            android:textSize="16dp"
             android:textStyle="bold"
             app:layout_constraintBottom_toBottomOf="@id/backIcon"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/register_success_activity.xml b/app/src/main/res/layout/register_success_activity.xml
index fb9b74d..7a4fa3c 100644
--- a/app/src/main/res/layout/register_success_activity.xml
+++ b/app/src/main/res/layout/register_success_activity.xml
@@ -31,7 +31,7 @@ tools:context=".login.RegisterSuccessActivity">
         android:id="@+id/tvTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-            android:text="@string/register"
+        android:text="@string/register"
         android:textColor="@color/black"
         android:textSize="16sp"
         android:textStyle="bold"