From 7a832ec40d9640e66ee2e9d27a11c114154a7ca5 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Thu, 14 Aug 2025 13:36:45 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E7=95=8C=E9=9D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 23 +++++++++----------
 .../sw/platecabinet/activity/InitActivity.kt  |  4 +---
 .../activity/LoginByFaceActivity.kt           | 18 +++++++++++----
 .../activity/LoginByPwdActivity.kt            |  2 +-
 .../main/res/layout/fragment_unbind_plate.xml |  3 ++-
 app/src/main/res/values/themes.xml            | 16 ++++++-------
 6 files changed, 37 insertions(+), 29 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ca1728b..30198e3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,26 +29,25 @@
         <activity
             android:name=".activity.UnBindDialogActivity"
             android:exported="false"
-            android:theme="@style/DialogActivityTheme" />
+            android:theme="@style/DialogActivity" />
         <activity
             android:name=".activity.InitActivity"
-            android:exported="true">
+            android:exported="false">
+        </activity>
+        <activity
+            android:name=".activity.LoginByPwdActivity"
+            android:exported="false"
+            android:launchMode="singleTask"></activity>
+        <activity
+            android:name=".activity.LoginByFaceActivity"
+            android:exported="true"
+            android:launchMode="singleTask">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".activity.LoginByPwdActivity"
-            android:exported="false"
-            android:launchMode="singleTask">
-        </activity>
-        <activity
-            android:name=".activity.LoginByFaceActivity"
-            android:exported="false"
-            android:launchMode="singleTask">
-        </activity>
         <activity
             android:name=".activity.MainActivity"
             android:exported="false">
diff --git a/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt
index d49a9fb..ddce89b 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/InitActivity.kt
@@ -1,6 +1,5 @@
 package com.sw.platecabinet.activity
 
-import android.content.Intent
 import com.sw.platecabinet.databinding.ActivityInitBinding
 import com.sw.platecabinet.databinding.ItemTitleTimeBinding
 
@@ -15,8 +14,7 @@ class InitActivity : BaseActivity<ActivityInitBinding>() {
 
     override fun initialize() {
         binding.main.setOnClickListener {
-            val intent = Intent(this, LoginByFaceActivity::class.java)
-            startActivity(intent)
+            finish()
         }
     }
 
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
index d122c46..ae0b3d0 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -60,8 +60,8 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     companion object {
         private var instance: LoginByFaceActivity? = null
 
-        fun finishActivity() {
-            instance?.finish()
+        fun goInitActivity() {
+            instance?.goInitActivity()
         }
     }
 
@@ -167,6 +167,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     }
 
     override fun onDestroy() {
+        Timber.d("onDestroy")
         instance = null
         if (rgbCameraHelper != null) {
             rgbCameraHelper!!.release()
@@ -388,6 +389,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
     protected override fun onPause() {
         pauseCamera()
         super.onPause()
+        countDownTimer?.cancel()
     }
 
     private fun pauseCamera() {
@@ -398,19 +400,27 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
 
     override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         super.handleLoginSuccess(equipmentUserInfo, isAdmin)
-        finish()
+        goInitActivity()
     }
 
     fun initCountTime() {
         val totalTimeInMillis = 30L * 1000
         countDownTimer = object : CountDownTimer(totalTimeInMillis, 1000) {
             override fun onTick(millisUntilFinished: Long) {
+                Timber.d("initCountTime onTick = ${(millisUntilFinished / 1000).toInt()}")
                 binding.tvToInit.text = "${(millisUntilFinished / 1000).toInt() + 1}"
             }
 
             override fun onFinish() {
-                finish()
+                goInitActivity()
             }
         }.start()
     }
+
+    fun goInitActivity() {
+        val intent = Intent(context, InitActivity::class.java)
+        startActivity(intent)
+    }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
index 137f498..e8fa9e4 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByPwdActivity.kt
@@ -41,7 +41,7 @@ class LoginByPwdActivity : BaseActivity<ActivityLoginByPwdBinding>() {
 
     override fun handleLoginSuccess(equipmentUserInfo: EquipmentUserInfo, isAdmin: Boolean) {
         super.handleLoginSuccess(equipmentUserInfo, isAdmin)
-        LoginByFaceActivity.finishActivity()
+        LoginByFaceActivity.goInitActivity()
         finish()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_unbind_plate.xml b/app/src/main/res/layout/fragment_unbind_plate.xml
index 2451a68..e7800c4 100644
--- a/app/src/main/res/layout/fragment_unbind_plate.xml
+++ b/app/src/main/res/layout/fragment_unbind_plate.xml
@@ -13,7 +13,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="80dp"
-        android:src="@drawable/ic_unbind_img" />
+        android:rotation="180"
+        android:src="@drawable/ic_bind_img" />
 
     <TextView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 47c1731..9b2b5a5 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -22,14 +22,14 @@
         <item name="windowActionBar">false</item>
     </style>
 
-    <style name="DialogActivityTheme" parent="Theme.AppCompat.Dialog">
-        <item name="windowActionBar">false</item>
+    <style name="DialogActivity" parent="Theme.AppCompat.Light.Dialog">
+        <item name="android:windowBackground">@android:color/transparent</item>
+        <item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
+        <item name="android:windowFrame">@null</item>
         <item name="windowNoTitle">true</item>
-        <!--取消默认的居中-->
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:windowBackground">#BF000000</item>
-        <item name="android:windowFullscreen">true</item>
-        <!--触摸外部关闭-->
-        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowIsTranslucent">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:backgroundDimEnabled">true</item>
     </style>
 </resources>
\ No newline at end of file