From 2687aabae55ad77d4e2d6adc90bd852d5891cbc3 Mon Sep 17 00:00:00 2001 From: xiaji Date: Fri, 20 Mar 2026 22:13:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AA=92=E4=BD=93=E6=9D=83?= =?UTF-8?q?=E9=99=90=E9=80=BB=E8=BE=91=EF=BC=9A=E5=88=9B=E5=BB=BAcheckshot?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9=EF=BC=8C=E5=8F=AA=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E8=AF=A5=E6=96=87=E4=BB=B6=E5=A4=B9=E4=B8=AD=E7=9A=84=E5=9B=BE?= =?UTF-8?q?=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改GalleryScreen.kt中的loadImagesFromGallery函数，添加WHERE条件只读取checkshot文件夹中的图片 - 修改MergeScreen.kt中的getLatestImages函数，添加WHERE条件只读取checkshot文件夹中的图片 - 修改ImageProcessor.kt中的saveToGallery函数，将图片保存到checkshot文件夹（之前是InspectionCamera） --- .../com/inspection/camera/ui/gallery/GalleryScreen.kt | 8 ++++++-- .../java/com/inspection/camera/ui/merge/MergeScreen.kt | 8 ++++++-- .../java/com/inspection/camera/util/ImageProcessor.kt | 2 +- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/inspection/camera/ui/gallery/GalleryScreen.kt b/app/src/main/java/com/inspection/camera/ui/gallery/GalleryScreen.kt index 29f57b1..3060f50 100644 --- a/app/src/main/java/com/inspection/camera/ui/gallery/GalleryScreen.kt +++ b/app/src/main/java/com/inspection/camera/ui/gallery/GalleryScreen.kt @@ -274,11 +274,15 @@ private suspend fun loadImagesFromGallery(context: android.content.Context): Lis val projection = arrayOf(MediaStore.Images.Media._ID) val sortOrder = "${MediaStore.Images.Media.DATE_ADDED} DESC" + // 只读取checkshot文件夹中的图片 + val selection = "${MediaStore.Images.Media.RELATIVE_PATH} LIKE ?" + val selectionArgs = arrayOf("%/checkshot/%") + context.contentResolver.query( MediaStore.Images.Media.EXTERNAL_CONTENT_URI, projection, - null, - null, + selection, + selectionArgs, sortOrder )?.use { cursor -> val idColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID) diff --git a/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt index ab17801..81b7fed 100644 --- a/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt +++ b/app/src/main/java/com/inspection/camera/ui/merge/MergeScreen.kt @@ -138,11 +138,15 @@ fun MergeScreen( val projection = arrayOf(MediaStore.Images.Media._ID) val sortOrder = "${MediaStore.Images.Media.DATE_ADDED} DESC" + // 只读取checkshot文件夹中的图片 + val selection = "${MediaStore.Images.Media.RELATIVE_PATH} LIKE ?" + val selectionArgs = arrayOf("%/checkshot/%") + context.contentResolver.query( MediaStore.Images.Media.EXTERNAL_CONTENT_URI, projection, - null, - null, + selection, + selectionArgs, sortOrder )?.use { cursor -> val idColumn = cursor.getColumnIndexOrThrow(MediaStore.Images.Media._ID) diff --git a/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt b/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt index 4a2a9b9..672d85d 100644 --- a/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt +++ b/app/src/main/java/com/inspection/camera/util/ImageProcessor.kt @@ -545,7 +545,7 @@ object ImageProcessor { put(MediaStore.Images.Media.DISPLAY_NAME, fileName) put(MediaStore.Images.Media.MIME_TYPE, "image/jpeg") if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { - put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES + "/InspectionCamera") + put(MediaStore.Images.Media.RELATIVE_PATH, Environment.DIRECTORY_PICTURES + "/checkshot") put(MediaStore.Images.Media.IS_PENDING, 1) } }