From fae5b3c7fd1dbf3f16516cb3991cbd1f8c72f7ab Mon Sep 17 00:00:00 2001
From: zgf <zenggaofeng2@h-partners.com>
Date: Fri, 23 Aug 2024 17:28:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9webp=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=E5=8C=BA=E5=88=86=E5=8A=A8=E9=9D=99=E5=9B=BE=E5=92=8C=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E5=9B=BE=E5=8A=A0=E8=BD=BD=E5=AE=8C=E6=9C=AA=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=8E=92=E9=98=9F=E9=98=9F=E5=88=97=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zgf <zenggaofeng2@h-partners.com>
---
 CHANGELOG.md                                   | 4 ++++
 entry/src/main/ets/pages/ManyPhotoShowPage.ets | 5 +++--
 library/oh-package.json5                       | 2 +-
 library/src/main/ets/ImageKnifeDispatcher.ets  | 5 +++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c03bead..b0e44f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.1.0-rc.3
+- 部分静态webp图片有delay属性导致识别成动图,改用getFrameCount识别
+- 修复加载错误图后未去请求排队队列中的请求
+
 ## 3.1.0-rc.2
 - 修复宽高不等svg图片显示有毛边
 
diff --git a/entry/src/main/ets/pages/ManyPhotoShowPage.ets b/entry/src/main/ets/pages/ManyPhotoShowPage.ets
index 545b121..3c9edf3 100644
--- a/entry/src/main/ets/pages/ManyPhotoShowPage.ets
+++ b/entry/src/main/ets/pages/ManyPhotoShowPage.ets
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife';
+import { BlurTransformation, ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife';
 
 
 
@@ -43,7 +43,8 @@ struct ManyPhotoShowPage {
                   placeholderSrc:$r("app.media.loading"),
                   errorholderSrc:$r("app.media.failed"),
                   objectFit: ImageFit.Auto,
-                  border: {radius:50}
+                  border: {radius:50},
+                  transformation:new BlurTransformation(5)
                 })})
               }
               .width(56).height(56)
diff --git a/library/oh-package.json5 b/library/oh-package.json5
index 06ef69d..11b6259 100644
--- a/library/oh-package.json5
+++ b/library/oh-package.json5
@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-tpc/ImageKnife",
   "type": "module",
-  "version": "3.1.0-rc.2",
+  "version": "3.1.0-rc.3",
   "dependencies": {
     "@ohos/gpu_transform": "^1.0.2"
   },
diff --git a/library/src/main/ets/ImageKnifeDispatcher.ets b/library/src/main/ets/ImageKnifeDispatcher.ets
index 18c9693..b7f44c3 100644
--- a/library/src/main/ets/ImageKnifeDispatcher.ets
+++ b/library/src/main/ets/ImageKnifeDispatcher.ets
@@ -263,6 +263,7 @@ export class ImageKnifeDispatcher {
         }
       });
       this.executingJobMap.remove(memoryKey);
+      this.dispatchNextJob();
       return;
     }
     // 保存文件缓存
@@ -608,8 +609,8 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
   }
   let resPixelmap: PixelMap | undefined = undefined
   if (typeValue === 'gif' || typeValue === 'webp') {
-    let delayList = await imageSource.getDelayTimeList()
-    if(delayList == undefined) {
+    let frameCount = await imageSource.getFrameCount()
+    if(frameCount == undefined || frameCount == 1) {
     } else {
       let size = (await imageSource.getImageInfo()).size
       let base64Help = new util.Base64Helper()