Pre Merge pull request !323 from CoderHank/3.x

Signed-off-by: zgf <zenggaofeng2@h-partners.com>

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.0.1-rc.2
+- 修复自定义下载失败无失败回调
+- 增加全局配置自定义下载接口
+- 修复主图相同，错误图不同导致只显示一个错误图
+- heic格式图片文件魔数从第五位开始匹配
+
 ## 3.0.1-rc.1
 - 新增ImageKnifeAnimatorComponent控制动图组件
 - 修复部分heif图无法解码

README.md

@@ -314,6 +314,7 @@ ImageKnifeAnimatorComponent({
 | addHeader        | key: string, value: Object                                                                            | 全局添加http请求头   |
 | setHeaderOptions | Array<HeaderOptions>                                                                                  | 全局设置http请求头   |
 | deleteHeader     | key: string                                                                                           | 全局删除http请求头   |
+| setCustomGetImage | customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>   | 全局设置自定义下载 |
 | setEngineKeyImpl | IEngineKey                                                                                            | 全局配置缓存key生成策略 |
 | putCacheImage    | url: string, pixelMap: PixelMap, cacheType: CacheStrategy = CacheStrategy.Default, signature?: string | 写入内存磁盘缓存      |
 | removeMemoryCache| url: string | ImageKnifeOption                                                                       | 清理指定内存缓存      |

entry/src/main/ets/common/CustomEngineKeyImpl.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IEngineKey, ImageKnifeOption, PixelMapTransformation,SparkMD5 ,ImageKnifeRequestSource} from '@ohos/libraryimageknife';
+import { IEngineKey, ImageKnifeOption, PixelMapTransformation ,MD5Tools,ImageKnifeRequestSource} from '@ohos/libraryimageknife';
 
 //全局自定义key demo
 @Sendable
@@ -52,7 +52,7 @@ export class CustomEngineKeyImpl implements IEngineKey {
     if (signature !== undefined && signature !== "") {
       src += "signature=" + signature + ";"
     }
-    return SparkMD5.hashBinary(src)
+    return MD5Tools.md5Sync(src)
   }
 
   private getTransformation(transformation: PixelMapTransformation): string {

entry/src/main/ets/pages/Index.ets

@@ -48,6 +48,12 @@ struct Index {
 
           });
         })
+        Button("全局自定义下载").margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestSetCustomImagePage',
+
+          });
+        })
         Button("多图 + LazyForEach").margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/ManyPhotoShowPage',
@@ -135,7 +141,12 @@ struct Index {
             uri: 'pages/TestRemoveCache',
           });
         })
+        Button("测试错误图显示").margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestErrorHolderPage',
 
+          });
+        })
         Button("测试媒体url").margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/dataShareUriLoadPage',

entry/src/main/ets/pages/LoadStatePage.ets

@@ -36,6 +36,10 @@ struct LoadStatePage {
     },
     border: { radius: 50 }
   }
+  @State imageKnifeOption1: ImageKnifeOption = {
+    loadSrc: $r('app.media.startIcon')
+  }
+  @State message: string = ""
   @State currentWidth: number = 200
   @State currentHeight: number = 200
   @State typeValue: string = ""
@@ -78,7 +82,22 @@ struct LoadStatePage {
       Text(this.typeValue)
       ImageKnifeComponent({ imageKnifeOption: this.ImageKnifeOption }).height(this.currentHeight).width(this.currentWidth)
         .margin({ top: 20 })
-
+      Button("自定义下载失败").onClick(()=>{
+        this.imageKnifeOption1 = {
+          loadSrc: "abc",
+          placeholderSrc:$r('app.media.loading'),
+          errorholderSrc:$r('app.media.failed'),
+          customGetImage:custom,
+          onLoadListener: {
+            onLoadFailed:(err)=>{
+              this.message = "err:" + err
+            }
+          }
+        }
+      }).margin({ top: 20 })
+      Text(this.message).fontSize(20).margin({ top: 20 })
+      ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).height(this.currentHeight).width(this.currentWidth)
+        .margin({ top: 20 })
     }
 
     .width('100%')
@@ -86,3 +105,10 @@ struct LoadStatePage {
   }
 
 }
+// 自定义下载方法
+@Concurrent
+async function custom(context: Context, src: string | PixelMap | Resource): Promise<ArrayBuffer | undefined> {
+  console.info("ImageKnife::  custom download：" + src)
+  // 举例写死从本地文件读取，也可以自己请求网络图片
+  return undefined
+}

entry/src/main/ets/pages/TestErrorHolderPage.ets

@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ImageKnifeComponent } from '@ohos/libraryimageknife'
+
+@Entry
+@Component
+struct TestErrorHolderPage {
+
+  build() {
+    Column() {
+      Text("ImageKnifeComponent1").fontSize(20)
+      ImageKnifeComponent({
+        imageKnifeOption: {
+          loadSrc: "abc",
+          errorholderSrc:$r('app.media.failed')
+        }
+      }).width(200).height(200)
+      Text("ImageKnifeComponent2").fontSize(20)
+      ImageKnifeComponent({
+        imageKnifeOption: {
+          loadSrc: "abc",
+          errorholderSrc:$r('app.media.startIcon')
+        }
+      }).width(200).height(200)
+      Text("ImageKnifeComponent2").fontSize(20)
+      ImageKnifeComponent({
+        imageKnifeOption: {
+          loadSrc: "abc",
+          errorholderSrc:$r('app.media.mask_starfish')
+        }
+      }).width(200).height(200)
+    }
+    .height('100%') .width('100%')
+  }
+}

entry/src/main/ets/pages/TestSetCustomImagePage.ets

@@ -0,0 +1,64 @@
+/*
+ * Copyright (C) 2024 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ImageKnifeComponent, ImageKnife, ImageKnifeOption } from '@ohos/libraryimageknife'
+
+@Entry
+@Component
+struct TestSetCustomImagePage {
+  @State imageKnifeOption: ImageKnifeOption = {
+    loadSrc: $r('app.media.startIcon'),
+    placeholderSrc: $r('app.media.loading')
+  }
+  aboutToAppear(): void {
+    ImageKnife.getInstance().setCustomGetImage(custom)
+  }
+  aboutToDisappear(): void {
+    ImageKnife.getInstance().setCustomGetImage()
+  }
+  build() {
+    Column() {
+      Button("自定义下载a").onClick(()=>{
+        this.imageKnifeOption = {
+          loadSrc: "aaa",
+          placeholderSrc: $r('app.media.loading')
+        }
+      })
+      Button("自定义下载b").onClick(()=>{
+        this.imageKnifeOption = {
+          loadSrc: "bbb",
+          placeholderSrc: $r('app.media.loading')
+        }
+      })
+      Button("自定义下载c").onClick(()=>{
+        this.imageKnifeOption = {
+          loadSrc: "ccc",
+          placeholderSrc: $r('app.media.loading')
+        }
+      })
+      ImageKnifeComponent({
+        imageKnifeOption: this.imageKnifeOption
+      }).width(300)
+        .height(300)
+    }
+    .width("100%")
+    .height("100%")
+  }
+}
+@Concurrent
+async function custom(context: Context, src: string | PixelMap | Resource): Promise<ArrayBuffer | undefined> {
+  console.info("ImageKnife::  custom download：" + src)
+  // 举例写死从本地文件读取，也可以自己请求网络图片
+  return context.resourceManager.getMediaContentSync($r("app.media.pngSample").id).buffer as ArrayBuffer
+}

entry/src/main/resources/base/profile/main_pages.json

@@ -20,6 +20,8 @@
     "pages/TestRemoveCache",
     "pages/dataShareUriLoadPage",
     "pages/TestCommonImage",
-    "pages/ImageAnimatorPage"
+    "pages/ImageAnimatorPage",
+    "pages/TestSetCustomImagePage",
+    "pages/TestErrorHolderPage"
   ]
 }

library/index.ets

@@ -38,7 +38,7 @@ export { BrightnessTransformation } from './src/main/ets/transform/BrightnessTra
 
 export { BlurTransformation } from './src/main/ets/transform/BlurTransformation'
 
-export { SparkMD5 } from "./src/main/ets/3rd_party/sparkmd5/spark-md5"
+export { MD5Tools } from "./src/main/ets/utils/MD5Tools"
 
 export { GrayScaleTransformation } from './src/main/ets/transform/GrayScaleTransformation'
 

library/oh-package.json5

@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-tpc/ImageKnife",
   "type": "module",
-  "version": "3.0.1-rc.1",
+  "version": "3.0.1-rc.2",
   "dependencies": {
     "@ohos/gpu_transform": "^1.0.2"
   },

library/src/main/ets/3rd_party/sparkmd5/spark-md5.js

@@ -1,741 +0,0 @@
-import buffer from '@ohos.buffer';
-
-    /*
-     * Fastest md5 implementation around (JKM md5).
-     * Credits: Joseph Myers
-     *
-     * @see http://www.myersdaily.org/joseph/javascript/md5-text.html
-     * @see http://jsperf.com/md5-shootout/7
-     */
-
-    /* this function is much faster,
-      so if possible we use it. Some IEs
-      are the only ones I know of that
-      need the idiotic second function,
-      generated by an if clause.  */
-    var add32 = function (a, b) {
-        return (a + b) & 0xFFFFFFFF;
-    },
-        hex_chr = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'];
-
-
-    function cmn(q, a, b, x, s, t) {
-        a = add32(add32(a, q), add32(x, t));
-        return add32((a << s) | (a >>> (32 - s)), b);
-    }
-
-    function md5cycle(x, k) {
-        var a = x[0],
-            b = x[1],
-            c = x[2],
-            d = x[3];
-
-        a += (b & c | ~b & d) + k[0] - 680876936 | 0;
-        a = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[1] - 389564586 | 0;
-        d = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[2] + 606105819 | 0;
-        c = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[3] - 1044525330 | 0;
-        b = (b << 22 | b >>> 10) + c | 0;
-        a += (b & c | ~b & d) + k[4] - 176418897 | 0;
-        a = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[5] + 1200080426 | 0;
-        d = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[6] - 1473231341 | 0;
-        c = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[7] - 45705983 | 0;
-        b = (b << 22 | b >>> 10) + c | 0;
-        a += (b & c | ~b & d) + k[8] + 1770035416 | 0;
-        a = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[9] - 1958414417 | 0;
-        d = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[10] - 42063 | 0;
-        c = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[11] - 1990404162 | 0;
-        b = (b << 22 | b >>> 10) + c | 0;
-        a += (b & c | ~b & d) + k[12] + 1804603682 | 0;
-        a = (a << 7 | a >>> 25) + b | 0;
-        d += (a & b | ~a & c) + k[13] - 40341101 | 0;
-        d = (d << 12 | d >>> 20) + a | 0;
-        c += (d & a | ~d & b) + k[14] - 1502002290 | 0;
-        c = (c << 17 | c >>> 15) + d | 0;
-        b += (c & d | ~c & a) + k[15] + 1236535329 | 0;
-        b = (b << 22 | b >>> 10) + c | 0;
-
-        a += (b & d | c & ~d) + k[1] - 165796510 | 0;
-        a = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[6] - 1069501632 | 0;
-        d = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[11] + 643717713 | 0;
-        c = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[0] - 373897302 | 0;
-        b = (b << 20 | b >>> 12) + c | 0;
-        a += (b & d | c & ~d) + k[5] - 701558691 | 0;
-        a = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[10] + 38016083 | 0;
-        d = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[15] - 660478335 | 0;
-        c = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[4] - 405537848 | 0;
-        b = (b << 20 | b >>> 12) + c | 0;
-        a += (b & d | c & ~d) + k[9] + 568446438 | 0;
-        a = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[14] - 1019803690 | 0;
-        d = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[3] - 187363961 | 0;
-        c = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[8] + 1163531501 | 0;
-        b = (b << 20 | b >>> 12) + c | 0;
-        a += (b & d | c & ~d) + k[13] - 1444681467 | 0;
-        a = (a << 5 | a >>> 27) + b | 0;
-        d += (a & c | b & ~c) + k[2] - 51403784 | 0;
-        d = (d << 9 | d >>> 23) + a | 0;
-        c += (d & b | a & ~b) + k[7] + 1735328473 | 0;
-        c = (c << 14 | c >>> 18) + d | 0;
-        b += (c & a | d & ~a) + k[12] - 1926607734 | 0;
-        b = (b << 20 | b >>> 12) + c | 0;
-
-        a += (b ^ c ^ d) + k[5] - 378558 | 0;
-        a = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[8] - 2022574463 | 0;
-        d = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[11] + 1839030562 | 0;
-        c = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[14] - 35309556 | 0;
-        b = (b << 23 | b >>> 9) + c | 0;
-        a += (b ^ c ^ d) + k[1] - 1530992060 | 0;
-        a = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[4] + 1272893353 | 0;
-        d = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[7] - 155497632 | 0;
-        c = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[10] - 1094730640 | 0;
-        b = (b << 23 | b >>> 9) + c | 0;
-        a += (b ^ c ^ d) + k[13] + 681279174 | 0;
-        a = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[0] - 358537222 | 0;
-        d = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[3] - 722521979 | 0;
-        c = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[6] + 76029189 | 0;
-        b = (b << 23 | b >>> 9) + c | 0;
-        a += (b ^ c ^ d) + k[9] - 640364487 | 0;
-        a = (a << 4 | a >>> 28) + b | 0;
-        d += (a ^ b ^ c) + k[12] - 421815835 | 0;
-        d = (d << 11 | d >>> 21) + a | 0;
-        c += (d ^ a ^ b) + k[15] + 530742520 | 0;
-        c = (c << 16 | c >>> 16) + d | 0;
-        b += (c ^ d ^ a) + k[2] - 995338651 | 0;
-        b = (b << 23 | b >>> 9) + c | 0;
-
-        a += (c ^ (b | ~d)) + k[0] - 198630844 | 0;
-        a = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[7] + 1126891415 | 0;
-        d = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[14] - 1416354905 | 0;
-        c = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[5] - 57434055 | 0;
-        b = (b << 21 | b >>> 11) + c | 0;
-        a += (c ^ (b | ~d)) + k[12] + 1700485571 | 0;
-        a = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[3] - 1894986606 | 0;
-        d = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[10] - 1051523 | 0;
-        c = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[1] - 2054922799 | 0;
-        b = (b << 21 | b >>> 11) + c | 0;
-        a += (c ^ (b | ~d)) + k[8] + 1873313359 | 0;
-        a = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[15] - 30611744 | 0;
-        d = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[6] - 1560198380 | 0;
-        c = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[13] + 1309151649 | 0;
-        b = (b << 21 | b >>> 11) + c | 0;
-        a += (c ^ (b | ~d)) + k[4] - 145523070 | 0;
-        a = (a << 6 | a >>> 26) + b | 0;
-        d += (b ^ (a | ~c)) + k[11] - 1120210379 | 0;
-        d = (d << 10 | d >>> 22) + a | 0;
-        c += (a ^ (d | ~b)) + k[2] + 718787259 | 0;
-        c = (c << 15 | c >>> 17) + d | 0;
-        b += (d ^ (c | ~a)) + k[9] - 343485551 | 0;
-        b = (b << 21 | b >>> 11) + c | 0;
-
-        x[0] = a + x[0] | 0;
-        x[1] = b + x[1] | 0;
-        x[2] = c + x[2] | 0;
-        x[3] = d + x[3] | 0;
-    }
-
-    function md5blk(s) {
-        var md5blks = [],
-            i; /* Andy King said do it this way. */
-
-        for (i = 0; i < 64; i += 4) {
-            md5blks[i >> 2] = s.charCodeAt(i) + (s.charCodeAt(i + 1) << 8) + (s.charCodeAt(i + 2) << 16) + (s.charCodeAt(i + 3) << 24);
-        }
-        return md5blks;
-    }
-
-    function md5blk_array(a) {
-        var md5blks = [],
-            i; /* Andy King said do it this way. */
-
-        for (i = 0; i < 64; i += 4) {
-            md5blks[i >> 2] = a[i] + (a[i + 1] << 8) + (a[i + 2] << 16) + (a[i + 3] << 24);
-        }
-        return md5blks;
-    }
-
-    function md51(s) {
-        var n = s.length,
-            state = [1732584193, -271733879, -1732584194, 271733878],
-            i,
-            length,
-            tail,
-            tmp,
-            lo,
-            hi;
-
-        for (i = 64; i <= n; i += 64) {
-            md5cycle(state, md5blk(s.substring(i - 64, i)));
-        }
-        s = s.substring(i - 64);
-        length = s.length;
-        tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= s.charCodeAt(i) << ((i % 4) << 3);
-        }
-        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-        if (i > 55) {
-            md5cycle(state, tail);
-            for (i = 0; i < 16; i += 1) {
-                tail[i] = 0;
-            }
-        }
-
-        // Beware that the final length might not fit in 32 bits so we take care of that
-        tmp = n * 8;
-        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
-        lo = parseInt(tmp[2], 16);
-        hi = parseInt(tmp[1], 16) || 0;
-
-        tail[14] = lo;
-        tail[15] = hi;
-
-        md5cycle(state, tail);
-        return state;
-    }
-
-    function md51_array(a) {
-        var n = a.length,
-            state = [1732584193, -271733879, -1732584194, 271733878],
-            i,
-            length,
-            tail,
-            tmp,
-            lo,
-            hi;
-
-        for (i = 64; i <= n; i += 64) {
-            md5cycle(state, md5blk_array(a.subarray(i - 64, i)));
-        }
-
-        // Not sure if it is a bug, however IE10 will always produce a sub array of length 1
-        // containing the last element of the parent array if the sub array specified starts
-        // beyond the length of the parent array - weird.
-        // https://connect.microsoft.com/IE/feedback/details/771452/typed-array-subarray-issue
-        a = (i - 64) < n ? a.subarray(i - 64) : new Uint8Array(0);
-
-        length = a.length;
-        tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= a[i] << ((i % 4) << 3);
-        }
-
-        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-        if (i > 55) {
-            md5cycle(state, tail);
-            for (i = 0; i < 16; i += 1) {
-                tail[i] = 0;
-            }
-        }
-
-        // Beware that the final length might not fit in 32 bits so we take care of that
-        tmp = n * 8;
-        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
-        lo = parseInt(tmp[2], 16);
-        hi = parseInt(tmp[1], 16) || 0;
-
-        tail[14] = lo;
-        tail[15] = hi;
-
-        md5cycle(state, tail);
-
-        return state;
-    }
-
-    function rhex(n) {
-        var s = '',
-            j;
-        for (j = 0; j < 4; j += 1) {
-            s += hex_chr[(n >> (j * 8 + 4)) & 0x0F] + hex_chr[(n >> (j * 8)) & 0x0F];
-        }
-        return s;
-    }
-
-    function hex(x) {
-        var i;
-        for (i = 0; i < x.length; i += 1) {
-            x[i] = rhex(x[i]);
-        }
-        return x.join('');
-    }
-
-    // In some cases the fast add32 function cannot be used..
-    if (hex(md51('hello')) !== '5d41402abc4b2a76b9719d911017c592') {
-        add32 = function (x, y) {
-            var lsw = (x & 0xFFFF) + (y & 0xFFFF),
-                msw = (x >> 16) + (y >> 16) + (lsw >> 16);
-            return (msw << 16) | (lsw & 0xFFFF);
-        };
-    }
-
-    // ---------------------------------------------------
-
-    /**
-     * ArrayBuffer slice polyfill.
-     *
-     * @see https://github.com/ttaubert/node-arraybuffer-slice
-     */
-
-    if (typeof ArrayBuffer !== 'undefined' && !ArrayBuffer.prototype.slice) {
-        (function () {
-
-            function clamp(val, length) {
-                val = (val | 0) || 0;
-
-                if (val < 0) {
-                    return Math.max(val + length, 0);
-                }
-
-                return Math.min(val, length);
-            }
-
-            ArrayBuffer.prototype.slice = function (from, to) {
-                var length = this.byteLength,
-                    begin = clamp(from, length),
-                    end = length,
-                    num,
-                    target,
-                    targetArray,
-                    sourceArray;
-
-                if (to !== undefined) {
-                    end = clamp(to, length);
-                }
-
-                if (begin > end) {
-                    return new ArrayBuffer(0);
-                }
-
-                num = end - begin;
-                target = new ArrayBuffer(num);
-                targetArray = new Uint8Array(target);
-
-                sourceArray = new Uint8Array(this, begin, num);
-                targetArray.set(sourceArray);
-
-                return target;
-            };
-        })();
-    }
-
-    // ---------------------------------------------------
-
-    /**
-     * Helpers.
-     */
-
-    function toUtf8(str) {
-        if (/[\u0080-\uFFFF]/.test(str)) {
-            // 源码是str = unescape(encodeURIComponent(str));这里的API并不对等
-            buffer.from(str).toString("utf-8")
-        }
-        return str;
-    }
-
-    function utf8Str2ArrayBuffer(str, returnUInt8Array) {
-        var length = str.length,
-            buff = new ArrayBuffer(length),
-            arr = new Uint8Array(buff),
-            i;
-
-        for (i = 0; i < length; i += 1) {
-            arr[i] = str.charCodeAt(i);
-        }
-
-        return returnUInt8Array ? arr : buff;
-    }
-
-    function arrayBuffer2Utf8Str(buff) {
-        return String.fromCharCode.apply(null, new Uint8Array(buff));
-    }
-
-    function concatenateArrayBuffers(first, second, returnUInt8Array) {
-        var result = new Uint8Array(first.byteLength + second.byteLength);
-
-        result.set(new Uint8Array(first));
-        result.set(new Uint8Array(second), first.byteLength);
-
-        return returnUInt8Array ? result : result.buffer;
-    }
-
-    function hexToBinaryString(hex) {
-        var bytes = [],
-            length = hex.length,
-            x;
-
-        for (x = 0; x < length - 1; x += 2) {
-            bytes.push(parseInt(hex.substr(x, 2), 16));
-        }
-
-        return String.fromCharCode.apply(String, bytes);
-    }
-
-    // ---------------------------------------------------
-
-    /**
-     * SparkMD5 OOP implementation.
-     *
-     * Use this class to perform an incremental md5, otherwise use the
-     * static methods instead.
-     */
-
-    function SparkMD5() {
-        // call reset to init the instance
-        this.reset();
-    }
-
-    /**
-     * Appends a string.
-     * A conversion will be applied if an utf8 string is detected.
-     *
-     * @param {String} str The string to be appended
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.append = function (str) {
-        // Converts the string to utf8 bytes if necessary
-        // Then append as binary
-        this.appendBinary(toUtf8(str));
-
-        return this;
-    };
-
-    /**
-     * Appends a binary string.
-     *
-     * @param {String} contents The binary string to be appended
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.appendBinary = function (contents) {
-        this._buff += contents;
-        this._length += contents.length;
-
-        var length = this._buff.length,
-            i;
-
-        for (i = 64; i <= length; i += 64) {
-            md5cycle(this._hash, md5blk(this._buff.substring(i - 64, i)));
-        }
-
-        this._buff = this._buff.substring(i - 64);
-
-        return this;
-    };
-
-    /**
-     * Finishes the incremental computation, reseting the internal state and
-     * returning the result.
-     *
-     * @param {Boolean} raw True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.prototype.end = function (raw) {
-        var buff = this._buff,
-            length = buff.length,
-            i,
-            tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            ret;
-
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= buff.charCodeAt(i) << ((i % 4) << 3);
-        }
-
-        this._finish(tail, length);
-        ret = hex(this._hash);
-
-        if (raw) {
-            ret = hexToBinaryString(ret);
-        }
-
-        this.reset();
-
-        return ret;
-    };
-
-    /**
-     * Resets the internal state of the computation.
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.reset = function () {
-        this._buff = '';
-        this._length = 0;
-        this._hash = [1732584193, -271733879, -1732584194, 271733878];
-
-        return this;
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @return {Object} The state
-     */
-    SparkMD5.prototype.getState = function () {
-        return {
-            buff: this._buff,
-            length: this._length,
-            hash: this._hash.slice()
-        };
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @param {Object} state The state
-     *
-     * @return {SparkMD5} The instance itself
-     */
-    SparkMD5.prototype.setState = function (state) {
-        this._buff = state.buff;
-        this._length = state.length;
-        this._hash = state.hash;
-
-        return this;
-    };
-
-    /**
-     * Releases memory used by the incremental buffer and other additional
-     * resources. If you plan to use the instance again, use reset instead.
-     */
-    SparkMD5.prototype.destroy = function () {
-        delete this._hash;
-        delete this._buff;
-        delete this._length;
-    };
-
-    /**
-     * Finish the final calculation based on the tail.
-     *
-     * @param {Array}  tail   The tail (will be modified)
-     * @param {Number} length The length of the remaining buffer
-     */
-    SparkMD5.prototype._finish = function (tail, length) {
-        var i = length,
-            tmp,
-            lo,
-            hi;
-
-        tail[i >> 2] |= 0x80 << ((i % 4) << 3);
-        if (i > 55) {
-            md5cycle(this._hash, tail);
-            for (i = 0; i < 16; i += 1) {
-                tail[i] = 0;
-            }
-        }
-
-        // Do the final computation based on the tail and length
-        // Beware that the final length may not fit in 32 bits so we take care of that
-        tmp = this._length * 8;
-        tmp = tmp.toString(16).match(/(.*?)(.{0,8})$/);
-        lo = parseInt(tmp[2], 16);
-        hi = parseInt(tmp[1], 16) || 0;
-
-        tail[14] = lo;
-        tail[15] = hi;
-        md5cycle(this._hash, tail);
-    };
-
-    /**
-     * Performs the md5 hash on a string.
-     * A conversion will be applied if utf8 string is detected.
-     *
-     * @param {String}  str The string
-     * @param {Boolean} [raw] True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.hash = function (str, raw) {
-        // Converts the string to utf8 bytes if necessary
-        // Then compute it using the binary function
-        return SparkMD5.hashBinary(toUtf8(str), raw);
-    };
-
-    /**
-     * Performs the md5 hash on a binary string.
-     *
-     * @param {String}  content The binary string
-     * @param {Boolean} [raw]     True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.hashBinary = function (content, raw) {
-        var hash = md51(content),
-            ret = hex(hash);
-
-        return raw ? hexToBinaryString(ret) : ret;
-    };
-
-    // ---------------------------------------------------
-
-    /**
-     * SparkMD5 OOP implementation for array buffers.
-     *
-     * Use this class to perform an incremental md5 ONLY for array buffers.
-     */
-    SparkMD5.ArrayBuffer = function () {
-        // call reset to init the instance
-        this.reset();
-    };
-
-    /**
-     * Appends an array buffer.
-     *
-     * @param {ArrayBuffer} arr The array to be appended
-     *
-     * @return {SparkMD5.ArrayBuffer} The instance itself
-     */
-    SparkMD5.ArrayBuffer.prototype.append = function (arr) {
-        // @ts-ignore
-        var buff = concatenateArrayBuffers(this._buff.buffer, arr, true),
-            // @ts-ignore
-            length = buff.length,
-            i;
-
-        // @ts-ignore
-        this._length += arr.byteLength;
-
-        for (i = 64; i <= length; i += 64) {
-            // @ts-ignore
-            md5cycle(this._hash, md5blk_array(buff.subarray(i - 64, i)));
-        }
-
-        // @ts-ignore
-        this._buff = (i - 64) < length ? new Uint8Array(buff.buffer.slice(i - 64)) : new Uint8Array(0);
-
-        return this;
-    };
-
-    /**
-     * Finishes the incremental computation, reseting the internal state and
-     * returning the result.
-     *
-     * @param {Boolean} raw True to get the raw string, false to get the hex string
-     *
-     * @return {String} The result
-     */
-    SparkMD5.ArrayBuffer.prototype.end = function (raw) {
-        // @ts-ignore
-        var buff = this._buff,
-            length = buff.length,
-            tail = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0],
-            i,
-            ret;
-
-        for (i = 0; i < length; i += 1) {
-            tail[i >> 2] |= buff[i] << ((i % 4) << 3);
-        }
-
-        this._finish(tail, length);
-        // @ts-ignore
-        ret = hex(this._hash);
-
-        if (raw) {
-            ret = hexToBinaryString(ret);
-        }
-
-        this.reset();
-
-        return ret;
-    };
-
-    /**
-     * Resets the internal state of the computation.
-     *
-     * @return {SparkMD5.ArrayBuffer} The instance itself
-     */
-    SparkMD5.ArrayBuffer.prototype.reset = function () {
-        // @ts-ignore
-        this._buff = new Uint8Array(0);
-        // @ts-ignore
-        this._length = 0;
-        // @ts-ignore
-        this._hash = [1732584193, -271733879, -1732584194, 271733878];
-
-        return this;
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @return {Object} The state
-     */
-    SparkMD5.ArrayBuffer.prototype.getState = function () {
-        var state = SparkMD5.prototype.getState.call(this);
-
-        // Convert buffer to a string
-        state.buff = arrayBuffer2Utf8Str(state.buff);
-
-        return state;
-    };
-
-    /**
-     * Gets the internal state of the computation.
-     *
-     * @param {Object} state The state
-     *
-     * @return {SparkMD5.ArrayBuffer} The instance itself
-     */
-    SparkMD5.ArrayBuffer.prototype.setState = function (state) {
-        // Convert string to buffer
-        state.buff = utf8Str2ArrayBuffer(state.buff, true);
-
-        return SparkMD5.prototype.setState.call(this, state);
-    };
-
-    SparkMD5.ArrayBuffer.prototype.destroy = SparkMD5.prototype.destroy;
-
-    SparkMD5.ArrayBuffer.prototype._finish = SparkMD5.prototype._finish;
-
-    /**
-     * Performs the md5 hash on an array buffer.
-     *
-     * @param {ArrayBuffer} arr The array buffer
-     * @param {Boolean}     [raw] True to get the raw string, false to get the hex one
-     *
-     * @return {String} The result
-     */
-    SparkMD5.ArrayBuffer.hash = function (arr, raw) {
-        var hash = md51_array(new Uint8Array(arr)),
-            ret = hex(hash);
-
-        return raw ? hexToBinaryString(ret) : ret;
-    };
-
-export  { SparkMD5 }
-

library/src/main/ets/ImageKnife.ets

@@ -38,7 +38,7 @@ export class ImageKnife {
   private _isRequestInSubThread: boolean = true;
   //定义全局网络请求header map
   headerMap: Map<string, Object> = new Map<string, Object>();
-
+  customGetImage: ((context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>) | undefined = undefined
   public static getInstance(): ImageKnife {
     if (!ImageKnife.instance) {
       ImageKnife.instance = new ImageKnife();
@@ -380,4 +380,14 @@ export class ImageKnife {
   getEngineKeyImpl(): IEngineKey {
     return this.dispatcher.getEngineKeyImpl();
   }
+  /**
+   * 全局设置自定义下载
+   * @param customGetImage 自定义请求函数
+   */
+  setCustomGetImage(customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>) {
+    this.customGetImage = customGetImage
+  }
+  getCustomGetImage(): undefined | ((context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>){
+    return this.customGetImage
+  }
 }

library/src/main/ets/ImageKnifeDispatcher.ets

@@ -179,7 +179,9 @@ export class ImageKnifeDispatcher {
       isAnimator:isAnimator
     }
 
-
+    if(request.customGetImage == undefined) {
+      request.customGetImage = ImageKnife.getInstance().getCustomGetImage()
+    }
     if (ImageKnife.getInstance().isRequestInSubThread){
       // 启动线程下载和解码主图
       LogUtil.log("ImageKnife_DataTime_getAndShowImage_Task.start:" + currentRequest.imageKnifeOption.loadSrc)
@@ -253,9 +255,9 @@ export class ImageKnifeDispatcher {
         if (requestWithSource.source === ImageKnifeRequestSource.SRC &&
           requestWithSource.request.imageKnifeOption.errorholderSrc !== undefined) {
 
-          if (this.showFromMemomry(currentRequest, requestWithSource.request.imageKnifeOption.errorholderSrc,
+          if (this.showFromMemomry(requestWithSource.request, requestWithSource.request.imageKnifeOption.errorholderSrc,
             ImageKnifeRequestSource.ERROR_HOLDER) === false) {
-            this.getAndShowImage(currentRequest, requestWithSource.request.imageKnifeOption.errorholderSrc,
+            this.getAndShowImage(requestWithSource.request, requestWithSource.request.imageKnifeOption.errorholderSrc,
               ImageKnifeRequestSource.ERROR_HOLDER);
           }
         }
@@ -399,6 +401,7 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
     if (resBuf === undefined) {
       LogUtil.log("customGetImage customGetImage");
       resBuf = await request.customGetImage(request.context, request.src)
+      loadError = resBuf == undefined ? "customGetImage loadFile" : loadError
       // 保存文件缓存
       if (resBuf !== undefined && request.writeCacheStrategy !== CacheStrategy.Memory) {
         let copyBuf = buffer.concat([buffer.from(resBuf)]).buffer; // IDE有bug，不能直接获取resBuf.byteLength

library/src/main/ets/key/DefaultEngineKey.ets

@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SparkMD5 } from '../3rd_party/sparkmd5/spark-md5';
 import { ImageKnifeOption } from '../ImageKnifeOption';
 import { IEngineKey } from './IEngineKey';
 import { PixelMapTransformation } from '../transform/PixelMapTransformation';
 import { ImageKnifeRequestSource } from '../model/ImageKnifeData';
+import { MD5Tools } from '../utils/MD5Tools';
 
 @Sendable
 export class DefaultEngineKey implements IEngineKey {
@@ -41,7 +41,7 @@ export class DefaultEngineKey implements IEngineKey {
     if (signature !== undefined && signature !== "") {
       src += "signature=" + signature + ";"
     }
-    return SparkMD5.hashBinary(src)
+    return MD5Tools.md5Sync(src)
   }
 
   private getTransformation(transformation: PixelMapTransformation): string {

library/src/main/ets/utils/FileCache.ets

@@ -16,7 +16,6 @@ import util from '@ohos.util';
 import { FileUtils } from './FileUtils';
 import fs from '@ohos.file.fs';
 import { LogUtil } from './LogUtil';
-import { SparkMD5 } from '../3rd_party/sparkmd5/spark-md5';
 
 
 /**

library/src/main/ets/utils/FileTypeUtil.ets

@@ -58,7 +58,7 @@ export class FileTypeUtil {
         const bufferList = this.fileSignatureMap[fileType];
         for (let i = 0; i < bufferList.length; i++) {
           let signature = bufferList[i];
-          if (this.matchesSignature(fileData, signature)) {
+          if (this.matchesSignature(fileData, signature,fileType)) {
             hasMatched = true;
             matchedFileType = fileType;
             break
@@ -75,12 +75,12 @@ export class FileTypeUtil {
   }
 
 
-  matchesSignature(fileData: Uint8Array, signature: Uint8Array): boolean {
+  matchesSignature(fileData: Uint8Array, signature: Uint8Array,fileType:string): boolean {
     if (fileData.length < signature.length) {
       return false; // 文件长度不足，无法匹配魔数
     }
 
-    for (let i = 0; i < signature.length; i++) {
+    for (let i = fileType == "heic" ? 4 : 0; i < signature.length; i++) {
       if (fileData[i] !== signature[i]) {
         return false; // 魔数不匹配
       }

library/src/main/ets/utils/MD5Tools.ets

@@ -0,0 +1,49 @@
+import { buffer } from '@kit.ArkTS';
+import { cryptoFramework } from '@kit.CryptoArchitectureKit';
+
+export class MD5Tools {
+  /**
+   * 同步返回MD5功能
+   * @param message
+   * @param key
+   * @returns
+   */
+  public static md5Sync(message: string, key?: string): string {
+    let text: string = message;
+    if (!MD5Tools.isEmpty(key)) {
+      text = text + key;
+    }
+    const textBuffer = buffer.from(text, 'utf-8');
+    const data: Uint8Array = new Uint8Array(textBuffer.buffer);
+    return MD5Tools.md5OfUnit8ArraySync(data);
+  }
+
+  private static isEmpty(str: string | null | undefined | ResourceStr): boolean {
+    if (str === null || str === undefined) {
+      return true;
+    }
+    if (str === '') {
+      return true;
+    }
+    return false;
+  }
+
+  private static md5OfUnit8ArraySync(data: Uint8Array): string {
+    try {
+      const md = cryptoFramework.createMd('MD5')
+      md.updateSync({ data: data })
+      const blob = md.digestSync()
+      let result: string = "";
+      const bytes: Uint8Array = blob.data;
+      for (let i = 0; i < bytes.length; i++) {
+        if ((bytes[i] & 0xff) < 0x10) {
+          result += '0';
+        }
+        result += (bytes[i] & 0xff).toString(16);
+      }
+      return result.toUpperCase()
+    } catch (e) {
+      return "";
+    }
+  }
+}

library/src/main/ets/utils/Tools.ets

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { SparkMD5 } from '../3rd_party/sparkmd5/spark-md5'
 import util from '@ohos.util'
+import { MD5Tools } from '../utils/MD5Tools'
 
 export class Tools {
   private static keyCache: util.LRUCache<string,string> = new util.LRUCache(1024)
@@ -27,7 +27,7 @@ export class Tools {
     if(result != undefined) {
       return result
     } else {
-      result = SparkMD5.hashBinary(keyCache)
+      result = MD5Tools.md5Sync(keyCache)
       Tools.keyCache.put(keyCache,result)
       return result
     }

sharedlibrary/Index.ets

@@ -42,7 +42,7 @@ export { BrightnessTransformation } from '@ohos/imageknife'
 
 export { BlurTransformation } from '@ohos/imageknife'
 
-export { SparkMD5 } from "@ohos/imageknife"
+export {MD5Tools} from '@ohos/imageknife'
 
 export { ImageKnifeRequestSource } from "@ohos/imageknife"