From 9d14b5499b0f9a7e2408e3a5bfae14f62594efc0 Mon Sep 17 00:00:00 2001
From: zxj <275873859@qq.com>
Date: Fri, 18 Jul 2025 17:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=88=90java17?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/gradle.xml                                     |  2 +-
 .idea/misc.xml                                       |  2 +-
 app/build.gradle.kts                                 |  9 +++++++++
 .../sw/platecabinet/activity/LoginByFaceActivity.kt  |  1 +
 .../com/sw/platecabinet/utils/PermissionHelper.kt    |  3 ---
 app/src/main/res/layout/fragment_setting_list.xml    | 12 +++---------
 6 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a95664d..ea5d566 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -6,7 +6,7 @@
       <GradleProjectSettings>
         <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 01415b9..bccf3fc 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 7094ea5..265a110 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -6,6 +6,14 @@ plugins {
 }
 
 android {
+    signingConfigs {
+        getByName("debug") {
+            storeFile = file("./swkey.jks")
+            storePassword = "123456"
+            keyAlias = "android"
+            keyPassword = "123456"
+        }
+    }
     namespace = "com.sw.platecabinet"
     compileSdk = 35
 
@@ -21,6 +29,7 @@ android {
 //        ndk {
 //            abiFilters.addAll(listOf("armeabi-v7a"/*, "arm64-v8a"*/))
 //        }
+        setProperty("archivesBaseName", "智能餐盘柜_${versionName}")
     }
 
     buildTypes {
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 c065a7a..1ca3f53 100644
--- a/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
+++ b/app/src/main/java/com/sw/platecabinet/activity/LoginByFaceActivity.kt
@@ -66,6 +66,7 @@ class LoginByFaceActivity : BaseActivity<ActivityLoginFaceBinding>() {
     }
 
     private fun startCamera() {
+        Timber.d("startCamera")
         cameraProviderFuture = ProcessCameraProvider.getInstance(this)
         cameraProviderFuture.addListener({
             val cameraProvider = cameraProviderFuture.get()
diff --git a/app/src/main/java/com/sw/platecabinet/utils/PermissionHelper.kt b/app/src/main/java/com/sw/platecabinet/utils/PermissionHelper.kt
index 59d957e..40b0ef4 100644
--- a/app/src/main/java/com/sw/platecabinet/utils/PermissionHelper.kt
+++ b/app/src/main/java/com/sw/platecabinet/utils/PermissionHelper.kt
@@ -9,7 +9,6 @@ import android.provider.Settings
 import androidx.appcompat.app.AlertDialog
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
-import androidx.fragment.app.Fragment
 
 class PermissionHelper private constructor(
     private val context: Context,
@@ -84,8 +83,6 @@ class PermissionHelper private constructor(
             }
             if (context is Activity) {
                 context.startActivity(intent)
-            } else if (context is Fragment) {
-                context.startActivity(intent)
             }
         }
     }
diff --git a/app/src/main/res/layout/fragment_setting_list.xml b/app/src/main/res/layout/fragment_setting_list.xml
index 330c8a8..30d6aae 100644
--- a/app/src/main/res/layout/fragment_setting_list.xml
+++ b/app/src/main/res/layout/fragment_setting_list.xml
@@ -11,15 +11,9 @@
         android:id="@+id/includeHeader"
         layout="@layout/item_title_time" />
 
-    <LinearLayout
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/mainRecyclerView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="6dp">
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/mainRecyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
+        android:layout_height="match_parent" />
 
 </LinearLayout>
\ No newline at end of file