From 5b8db65fa2305e084d5bdd5285f4912b1edc267e Mon Sep 17 00:00:00 2001
From: mazengfei <331023091@qq.com>
Date: Mon, 2 Mar 2026 16:35:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              | 16 +++----
 .../java/com/sw/platecabinet/GlobalData.kt    |  3 +-
 .../activity/DeviceInitActivity.kt            | 43 ++++++++++---------
 .../activity/LoginByFaceActivity.kt           |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 5 files changed, 35 insertions(+), 31 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d9c064b..eb5da4e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,7 +17,7 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
 
     <application
-        android:name=".MyApp"
+        android:name="com.sw.platecabinet.MyApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -31,7 +31,7 @@
         tools:targetApi="31">
         <!-- 注册BootReceiver，监听开机完成广播 -->
         <receiver
-            android:name=".receiver.BootReceiver"
+            android:name="com.sw.platecabinet.receiver.BootReceiver"
             android:enabled="true"
             android:exported="true">
             <intent-filter>
@@ -39,24 +39,24 @@
             </intent-filter>
         </receiver>
         <activity
-            android:name=".activity.UnBindDialogActivity"
+            android:name="com.sw.platecabinet.activity.UnBindDialogActivity"
             android:exported="false"
             android:theme="@style/DialogActivity" />
         <activity
-            android:name=".activity.InitActivity"
+            android:name="com.sw.platecabinet.activity.InitActivity"
             android:exported="false"
             android:launchMode="singleTask">
         </activity>
         <activity
-            android:name=".activity.LoginByPwdActivity"
+            android:name="com.sw.platecabinet.activity.LoginByPwdActivity"
             android:exported="false"
             android:launchMode="singleTask"/>
         <activity
-            android:name=".activity.LoginByFaceActivity"
+            android:name="com.sw.platecabinet.activity.LoginByFaceActivity"
             android:exported="true"
             android:launchMode="singleTask"/>
         <activity
-            android:name=".activity.DeviceInitActivity"
+            android:name="com.sw.platecabinet.activity.DeviceInitActivity"
             android:exported="true"
             android:launchMode="singleTask">
             <intent-filter>
@@ -66,7 +66,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.MainActivity"
+            android:name="com.sw.platecabinet.activity.MainActivity"
             android:exported="false">
         </activity>
     </application>
diff --git a/app/src/main/java/com/sw/platecabinet/GlobalData.kt b/app/src/main/java/com/sw/platecabinet/GlobalData.kt
index 01c2ba6..2390a88 100644
--- a/app/src/main/java/com/sw/platecabinet/GlobalData.kt
+++ b/app/src/main/java/com/sw/platecabinet/GlobalData.kt
@@ -28,11 +28,12 @@ object GlobalData {
 
     var appId = "Hkz1rBk6PZXbS8KwKr67K2eZtsz8bRoMHLg64bUdgCZj"
     var sdkKey = "AabXs3sHM8UhhE7oCGf4LVMLrdkGb1nJNksbjjTdVt7k"
-    var activeKey ="085F-118G-Q3J6-35UX" //"085F-118G-Q391-53YL"
+    var activeKey = "085F-118G-Q3Y3-WXXX"//"085F-118G-Q3J6-35UX" //"085F-118G-Q391-53YL"
 
     /**
      * 具体业务baseurl
      */
+//    var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
     var appBaseUrl: String = "https://dev.yixiong-tech.com:8081"
 
     /**
diff --git a/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt b/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt
index 7706863..fc6bab9 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/DeviceInitActivity.kt
@@ -45,26 +45,29 @@ class DeviceInitActivity : BaseActivity<ActivityDeviceInitBinding>() {
 //        binding.root.postDelayed({
 //            goLoginActivity()
 //        }, 1000)
-        showWaitingDialog("加载中……")
-        viewModel.getDeviceConfig { deviceConfig ->
-            runOnUiThread {
-                if (deviceConfig == null) {
-                    hideWaitingDialog()
-                    ToastUtils.showToast("获取设备配置数据失败")
-                    hideWaitingDialog()
-                    goLoginActivity()
-                    return@runOnUiThread
-                }
-                GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
-                GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
-                GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
-                binding.root.postDelayed({
-                    hideWaitingDialog()
-                    goLoginActivity()
-                }, 500)
-            }
-        }
-//        goLoginActivity()
+//        showWaitingDialog("加载中……")
+//        viewModel.getDeviceConfig { deviceConfig ->
+//            runOnUiThread {
+//                if (deviceConfig == null) {
+//                    hideWaitingDialog()
+//                    ToastUtils.showToast("获取设备配置数据失败")
+//                    hideWaitingDialog()
+//                    goLoginActivity()
+//                    return@runOnUiThread
+//                }
+//                GlobalData.appId = deviceConfig.arcsoftAppId ?: ""
+//                GlobalData.sdkKey = deviceConfig.arcsoftSdkKey ?: ""
+//                GlobalData.activeKey = deviceConfig.arcsoftActiveKey ?: ""
+//                binding.root.postDelayed({
+//                    hideWaitingDialog()
+//                    goLoginActivity()
+//                }, 500)
+//            }
+//        }
+
+        binding.root.postDelayed({
+            goLoginActivity()
+        }, 500)
     }
 
     override fun registerDataChange() {
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 45f53e6..6aa4eb9 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -277,7 +277,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>(),
                     val layoutParams = adjustPreviewViewSize(
                         binding.dualCameraTexturePreviewRgb,
                         binding.dualCameraTexturePreviewRgb, binding.dualCameraFaceRectView,
-                        previewSizeRgb, displayOrientation, 0.6f
+                        previewSizeRgb, displayOrientation, 0.7f
                     )
                     Timber.d("initRgbCamera previewSizeRgb = ${previewSizeRgb.width}-${previewSizeRgb.height}")
                     Timber.d("initRgbCamera layoutParams = ${layoutParams.width}-${layoutParams.height}")
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a82b98a..ed80ad9 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">餐盘柜</string>
+    <string name="app_name">餐盘柜会员版</string>
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>