From 72562fb38c61bed027916d041092b0c69404cf9b Mon Sep 17 00:00:00 2001 From: 857288218 <31814795+857288218@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:53:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93isPageSyncAsCoun?= =?UTF-8?q?t=3Dfalse&&isFilterSizeDuration=3Dtrue=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E8=BF=87=E6=BB=A4folder=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../luck/picture/lib/loader/LocalMediaPageLoader.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java b/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java index 8306eac79..3275ebe81 100644 --- a/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java +++ b/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java @@ -275,13 +275,12 @@ public List doInBackground() { Map countMap = new HashMap<>(); Set hashSet = new HashSet<>(); while (data.moveToNext()) { - if (getConfig().isPageSyncAsCount) { - LocalMedia media = parseLocalMedia(data, true); - if (media == null) { - continue; - } - media.recycle(); + // 当isPageSyncAsCount=false&&isFilterSizeDuration=true时没过滤folder数量 + LocalMedia media = parseLocalMedia(data, true); + if (media == null) { + continue; } + media.recycle(); long bucketId = data.getLong(data.getColumnIndexOrThrow(COLUMN_BUCKET_ID)); Long newCount = countMap.get(bucketId); if (newCount == null) { From 6ff6790382cdd83a9371e0bf770be47e25956862 Mon Sep 17 00:00:00 2001 From: 857288218 <31814795+857288218@users.noreply.github.com> Date: Tue, 2 Apr 2024 16:55:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93isPageSyncAsCoun?= =?UTF-8?q?t=3Dfalse&&isFilterSizeDuration=3Dtrue=E6=97=B6=E6=B2=A1?= =?UTF-8?q?=E8=BF=87=E6=BB=A4folder=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/luck/picture/lib/loader/LocalMediaPageLoader.java | 1 - 1 file changed, 1 deletion(-) diff --git a/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java b/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java index 3275ebe81..066ab540c 100644 --- a/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java +++ b/selector/src/main/java/com/luck/picture/lib/loader/LocalMediaPageLoader.java @@ -275,7 +275,6 @@ public List doInBackground() { Map countMap = new HashMap<>(); Set hashSet = new HashSet<>(); while (data.moveToNext()) { - // 当isPageSyncAsCount=false&&isFilterSizeDuration=true时没过滤folder数量 LocalMedia media = parseLocalMedia(data, true); if (media == null) { continue;