From 02999f0d54a94b7bd7603871b5015ddae812a70a Mon Sep 17 00:00:00 2001
From: shenzuqiang <zuqiangshen@163.com>
Date: Thu, 26 Mar 2026 10:30:22 +0800
Subject: [PATCH] =?UTF-8?q?Dev=EF=BC=9A=201=E3=80=81=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E5=8A=9F=E8=83=BD=EF=BC=8C=E9=98=B2=E6=AD=A2?=
 =?UTF-8?q?=E6=95=8F=E6=84=9F=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml                  |  6 ------
 .../java/com/img/rabbit/components/ImagePicker.kt | 15 +++++++++++----
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5ac3305..e1b0d34 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,14 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-    <!-- 读取相册权限-Android 12及以下版本的权限，如果你不需要特定相机功能，可以添加下面这行降低过滤限制 -->
-    <uses-feature
-        android:name="android.hardware.camera"
-        android:required="false" />
     <!-- 在Android14及以上版本读取SelectedPhotoAccess需要添加READ_MEDIA_VISUAL_USER_SELECTED权限 -->
     <uses-permission android:name="android.permission.READ_MEDIA_VISUAL_USER_SELECTED" />
-    <!--相机权限，用于打开相机和拍照:如用户反馈等-->
-    <uses-permission android:name="android.permission.CAMERA" />
     <!-- 写入外部存储权限，用于保存拍照后的图片或者下载文件，主要兼容Android 13及以下版本（Android13以上高版本不需要，但低版本必须） -->
     <uses-permission android:name = "android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="32"
diff --git a/app/src/main/java/com/img/rabbit/components/ImagePicker.kt b/app/src/main/java/com/img/rabbit/components/ImagePicker.kt
index 4d18e7e..f644b02 100644
--- a/app/src/main/java/com/img/rabbit/components/ImagePicker.kt
+++ b/app/src/main/java/com/img/rabbit/components/ImagePicker.kt
@@ -86,7 +86,7 @@ fun ImagePicker(
     val tempImageUri = remember { mutableStateOf<Uri?>(null) }
 
     // 新增选择对话框
-    var showChoiceDialog by remember { mutableStateOf(false) }
+    //var showChoiceDialog by remember { mutableStateOf(false) }
 
     // 新增大图预览状态
     var previewImageUri by remember { mutableStateOf<Uri?>(null) }
@@ -130,7 +130,7 @@ fun ImagePicker(
         }
     }
 
-
+    /*
     if (showChoiceDialog) {
         AlertDialog(
             onDismissRequest = { showChoiceDialog = false },
@@ -160,6 +160,7 @@ fun ImagePicker(
             }
         )
     }
+     */
 
     // 全屏大图对话框
     previewImageUri?.let { uri ->
@@ -217,7 +218,10 @@ fun ImagePicker(
                     AddSingleButton(
                         imageHeight = imageHeight,
                         aspectRatio = aspectRatio,
-                        onClick = { showChoiceDialog = true },
+                        onClick = {
+                            galleryLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+                            //showChoiceDialog = true
+                                  },
                         label = addButtonName,
                     )
                 }else{
@@ -226,7 +230,10 @@ fun ImagePicker(
                         contentAlignment = Alignment.BottomCenter
                     ) {
                         AddButton(
-                            onClick = { showChoiceDialog = true },
+                            onClick = {
+                                galleryLauncher.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
+                                //showChoiceDialog = true
+                                      },
                             label = addButtonName,
                         )
                     }