Pre Merge pull request !411 from zgf/3.x

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

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 3.2.0-rc.0
+- Rollback the old version V1 decorator. V2 decorator will be provided in version 4.x
+- The sub-thread network request is changed to asynchronous, thereby increasing the number of concurrent sub-thread network requests
+- Set the concurrency through the setMaxRequests interface under the ImageKnife class
+- Custom network changed to asynchronous request
+
 ## 3.0.3
 - Released version 3.0.3
 

entry/src/main/ets/pages/CustomNetImagePage.ets

@@ -0,0 +1,78 @@
+/*
+ * 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 { InfoItem } from './model/DataSourcePrefetching';
+import { PageViewModel } from './model/PageViewModel';
+import { ImageKnifeComponent, ImageKnife } from '@ohos/libraryimageknife';
+import { CommonDataSource, GetSession } from './model/CommonDataSource';
+import { rcp } from '@kit.RemoteCommunicationKit';
+import { BusinessError } from '@kit.BasicServicesKit';
+
+@Entry
+@Component
+export struct CustomNetImagePage {
+  @State hotCommendList:CommonDataSource<InfoItem> = new CommonDataSource<InfoItem>([])
+  aboutToAppear(): void {
+    ImageKnife.getInstance().setMaxRequests(32)
+    this.hotCommendList.addData(this.hotCommendList.totalCount(),PageViewModel.getItems())
+  }
+  aboutToDisappear(): void {
+    ImageKnife.getInstance().setMaxRequests(8)
+  }
+  build() {
+    Column() {
+      WaterFlow() {
+        LazyForEach(this.hotCommendList,(item: InfoItem)=>{
+          FlowItem() {
+            Column(){
+              ImageKnifeComponent({
+                imageKnifeOption: {
+                  loadSrc: item.albumUrl,
+                  placeholderSrc: $r("app.media.loading"),
+                  errorholderSrc: $r("app.media.failed"),
+                  customGetImage:custom
+                }
+              }).width("50%").height(200)
+            }
+          }.height(200)
+          .backgroundColor("#95efd2")
+        },(item: string) => item)
+      }.columnsTemplate("1fr 1fr")
+      .columnsGap(10)
+      .rowsGap(5)
+      .backgroundColor(0xFAEEE0)
+      .width("100%").height("100%")
+    }
+  }
+}
+// 自定义下载方法
+@Concurrent
+async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
+  return new Promise((resolve,reject)=>{
+    if (typeof src == "string") {
+      let session = GetSession.session
+      let req = new rcp.Request(src,"GET");
+      session.fetch(req).then((response)=>{
+        if(response.statusCode == 200) {
+          let buffer = response.body
+          resolve(buffer)
+        } else {
+          reject("rcp code:"+response.statusCode)
+        }
+      }).catch((err:BusinessError)=>{
+        reject("error rcp src:"+src+",err:"+JSON.stringify(err))
+      })
+    }
+  })
+}

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

@@ -50,6 +50,11 @@ struct Index {
             uri: 'pages/TestCommonImage',
           });
         })
+        Button($r('app.string.Customize_RCP_network')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/CustomNetImagePage',
+          });
+        })
         Button($r('app.string.Test_Task_error')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestTaskResourcePage',

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

@@ -109,7 +109,7 @@ struct LoadStatePage {
 }
 // 自定义下载方法
 @Concurrent
-async function custom(context: Context, src: string | PixelMap | Resource): Promise<ArrayBuffer | undefined> {
+async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
   console.info("ImageKnife::  custom download：" + src)
   // 举例写死从本地文件读取，也可以自己请求网络图片
   return undefined

entry/src/main/ets/pages/SingleImage.ets

@@ -132,6 +132,7 @@ async function custom(context: Context, src: string | PixelMap | Resource,header
   let refer = headers!["refer"] as string
   console.info("ImageKnife::  custom download：" + src,"refer:"+refer)
   // 举例写死从本地文件读取，也可以自己请求网络图片
-  return context.resourceManager.getMediaContentSync($r("app.media.startIcon").id).buffer as ArrayBuffer
+  let buffer = context.resourceManager.getMediaContentSync($r("app.media.startIcon").id).buffer as ArrayBuffer
+  return buffer
 }
 

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

@@ -60,8 +60,9 @@ struct TestSetCustomImagePage {
   }
 }
 @Concurrent
-async function custom(context: Context, src: string | PixelMap | Resource): Promise<ArrayBuffer | undefined> {
+async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
   console.info("ImageKnife::  custom download：" + src)
   // 举例写死从本地文件读取，也可以自己请求网络图片
-  return context.resourceManager.getMediaContentSync($r("app.media.pngSample").id).buffer as ArrayBuffer
+  let buffer = context.resourceManager.getMediaContentSync($r("app.media.pngSample").id).buffer as ArrayBuffer
+  return buffer
 }

entry/src/main/ets/pages/model/CommonDataSource.ets

@@ -12,6 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { statfs } from '@kit.CoreFileKit'
+import { rcp } from '@kit.RemoteCommunicationKit'
+
 export class CommonDataSource <T> implements IDataSource {
   private dataArray: T[] = []
   private listeners: DataChangeListener[] = []
@@ -52,3 +55,6 @@ export class CommonDataSource <T> implements IDataSource {
     })
   }
 }
+export class GetSession {
+  static session:rcp.Session = rcp.createSession()
+}

entry/src/main/resources/base/element/string.json

@@ -503,6 +503,10 @@
     {
       "name": "disk",
       "value": "Disk"
+    },
+    {
+      "name": "Customize_RCP_network",
+      "value": "Customize RCP network request"
     }
   ]
 }

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

@@ -31,6 +31,7 @@
     "pages/PrefetchAndPreload",
     "pages/TestCacheDataPage",
     "pages/TestChangeColorPage",
-    "pages/TestLoadCancelListenerPage"
+    "pages/TestLoadCancelListenerPage",
+    "pages/CustomNetImagePage"
   ]
 }

entry/src/main/resources/zh_CN/element/string.json

@@ -499,6 +499,10 @@
     {
       "name": "disk",
       "value": "磁盘"
+    },
+    {
+      "name": "Customize_RCP_network",
+      "value": "自定义rcp网络请求"
     }
   ]
 }

library/oh-package.json5

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

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
+  customGetImage: ((context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>) => Promise<ArrayBuffer | undefined>) | undefined = undefined
   public static getInstance(): ImageKnife {
     if (!ImageKnife.instance) {
       ImageKnife.instance = new ImageKnife();

library/src/main/ets/ImageKnifeDispatcher.ets

@@ -189,6 +189,16 @@ export class ImageKnifeDispatcher {
     if(request.customGetImage == undefined) {
       request.customGetImage = ImageKnife.getInstance().getCustomGetImage()
     }
+    emitter.on(Constants.CALLBACK_EMITTER + memoryKey,(data)=>{
+      emitter.off(Constants.CALLBACK_EMITTER + memoryKey)
+      let res = data?.data?.value as RequestJobResult | undefined
+      this.doTaskCallback(res, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
+      if (isWatchProgress){
+        emitter.off(Constants.PROGRESS_EMITTER + memoryKey)
+      }
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
+    })
     if (ImageKnife.getInstance().isRequestInSubThread){
       // 启动线程下载和解码主图
       LogUtil.log("ImageKnife_DataTime_getAndShowImage_Task.start:" + currentRequest.imageKnifeOption.loadSrc)
@@ -202,13 +212,14 @@ export class ImageKnifeDispatcher {
 
       LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.start(subthread):" + currentRequest.imageKnifeOption.loadSrc)
       taskpool.execute(task).then((res: Object) => {
-        this.doTaskCallback(res as RequestJobResult | undefined, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
-        if (isWatchProgress){
-          emitter.off(Constants.PROGRESS_EMITTER + memoryKey)
-        }
-        LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
-        LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
+        // this.doTaskCallback(res as RequestJobResult | undefined, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
+        // if (isWatchProgress){
+        //   emitter.off(Constants.PROGRESS_EMITTER + memoryKey)
+        // }
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
       }).catch((err: BusinessError) => {
+        emitter.off(Constants.CALLBACK_EMITTER + memoryKey)
         LogUtil.error("Fail to requestJob in sub thread src=" + imageSrc + " err=" + err)
         LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:" + currentRequest.imageKnifeOption.loadSrc)
         if (isWatchProgress){
@@ -219,11 +230,12 @@ export class ImageKnifeDispatcher {
       })
     } else { //主线程请求
       LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.start(mainthread):" + currentRequest.imageKnifeOption.loadSrc)
-      requestJob(request, requestList).then((res: RequestJobResult | undefined) => {
-        this.doTaskCallback(res, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
-        LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
-        LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
+      requestJob(request, requestList).then(() => {
+        // this.doTaskCallback(res, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
       }).catch((err: BusinessError) => {
+        emitter.off(Constants.CALLBACK_EMITTER + memoryKey)
         LogUtil.error("Fail to requestJob in main thread src=" + imageSrc + " err=" + err)
         LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:" + currentRequest.imageKnifeOption.loadSrc)
         this.executingJobMap.remove(memoryKey);
@@ -392,44 +404,15 @@ export class ImageKnifeDispatcher {
  * @returns
  */
 @Concurrent
-async function requestJob(request: RequestJobRequest, requestList?: List<ImageKnifeRequestWithSource>): Promise<RequestJobResult | undefined> {
+async function requestJob(request: RequestJobRequest, requestList?: List<ImageKnifeRequestWithSource>) {
   LogUtil.log("ImageKnife_DataTime_requestJob.start:" + request.src + " requestSource=" + request.requestSource)
   let src = typeof request.src == "number" ? request.resName != undefined ? request.resName : request.src + "" : request.src
   // 生成文件缓存key
   let fileKey = request.engineKey.generateFileKey(src, request.signature, request.isAnimator)
 
   //获取图片资源
-  let resBuf: ArrayBuffer
-  try {
-    LogUtil.log("ImageKnife_DataTime_requestJob.getImageArrayBuffer.start:" + request.src)
-    resBuf = await ImageKnifeLoader.getImageArrayBuffer(request, requestList, fileKey)
-    LogUtil.log("ImageKnife_DataTime_requestJob.getImageArrayBuffer.end:" + request.src)
-  } catch (error) {
-    LogUtil.error("ImageKnife_DataTime_requestJob.end: getImageArrayBuffer error " + request.src + " err=" + error)
-    return ImageKnifeLoader.makeEmptyResult(error)
-  }
+  ImageKnifeLoader.execute(request,requestList,fileKey)
 
-  // 获取图片类型
-  let typeValue = new FileTypeUtil().getFileType(resBuf);
-  if(typeValue == null) {
-    LogUtil.log("ImageKnife_DataTime_requestJob.end: getFileType is null " + request.src)
-    return ImageKnifeLoader.makeEmptyResult("request is not a valid image source")
-  }
-
-  // 解析图片
-  LogUtil.log("ImageKnife_DataTime_requestJob.parseImage.start:" + request.src)
-  let result: RequestJobResult = await ImageKnifeLoader.parseImage(resBuf, typeValue, fileKey, request)
-  LogUtil.log("ImageKnife_DataTime_requestJob.parseImage.end:" + request.src)
-
-  // 图形变化
-  if (request.requestSource === ImageKnifeRequestSource.SRC && request.transformation !== undefined && result?.pixelMap !== undefined && typeof result.pixelMap !== 'string') {
-    LogUtil.log("ImageKnife_DataTime_requestJob.transform.start:" + request.src)
-    result.pixelMap = await request.transformation?.transform(request.context, result.pixelMap,  request.componentWidth, request.componentHeight);
-    LogUtil.log("ImageKnife_DataTime_requestJob.transform.end:" + request.src)
-  }
-
-  LogUtil.log("ImageKnife_DataTime_requestJob.end:" + request.src)
-  return result
 }
 
 

library/src/main/ets/ImageKnifeLoader.ets

@@ -28,6 +28,7 @@ import emitter from '@ohos.events.emitter';
 import image from '@ohos.multimedia.image';
 import { RequestJobResult } from './model/ImageKnifeData'
 import util from '@ohos.util';
+import { FileTypeUtil } from './utils/FileTypeUtil';
 
 class RequestData {
   receiveSize: number = 2000
@@ -38,38 +39,52 @@ class RequestData {
  * ImageKnifeDispatcher 抽取出来的方法，因@Concurrent只能import方法，故抽取到另一个类
  */
 export class ImageKnifeLoader {
-  static async parseImage(resBuf: ArrayBuffer, typeValue: string, fileKey: string,
-    request: RequestJobRequest): Promise<RequestJobResult> {
+  static execute(request: RequestJobRequest, requestList: List<ImageKnifeRequestWithSource> | undefined, fileKey: string){
+    ImageKnifeLoader.getImageArrayBuffer(request,requestList,fileKey)
+  }
+  static async parseImage(resBuf: ArrayBuffer, fileKey: string,
+    request: RequestJobRequest) {
+    let typeValue = new FileTypeUtil().getFileType(resBuf);
+    if(typeValue == null) {
+      LogUtil.log("ImageKnife_DataTime_requestJob.end: getFileType is null " + request.src)
+      ImageKnifeLoader.makeEmptyResult(request,"request is not a valid image source")
+      return
+    }
     if(request.isAnimator) {
-      return ImageKnifeLoader.parseForAnimatorComponent(resBuf ,typeValue ,fileKey, request)
+      ImageKnifeLoader.parseForAnimatorComponent(resBuf ,typeValue ,fileKey, request)
+      return
     }
 
     if (typeValue === 'gif' || typeValue === 'webp') {
-      return ImageKnifeLoader.parseAnimatorImage(resBuf ,typeValue ,fileKey , request)
+      ImageKnifeLoader.parseAnimatorImage(resBuf ,typeValue ,fileKey , request)
+      return
     } else if(typeValue == "svg") {
-      return ImageKnifeLoader.parseSvgImage(resBuf ,typeValue ,fileKey , request)
+      ImageKnifeLoader.parseSvgImage(resBuf ,typeValue ,fileKey , request)
+      return
     }
 
-    return ImageKnifeLoader.parseNormalImage(resBuf, typeValue, fileKey, request)
+    ImageKnifeLoader.parseNormalImage(resBuf, typeValue, fileKey, request)
   }
 
-  static makeEmptyResult(error: string): RequestJobResult{
-    return {
+  static makeEmptyResult(request:RequestJobRequest,error: string){
+    let res: RequestJobResult = {
       pixelMap: undefined,
       bufferSize: 0,
       fileKey: '',
       loadFail: error,
     }
+    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
   }
 
-  static async parseNormalImage(resBuf: ArrayBuffer, typeValue: string, fileKey: string, request: RequestJobRequest):Promise<RequestJobResult> {
+  static async parseNormalImage(resBuf: ArrayBuffer, typeValue: string, fileKey: string, request: RequestJobRequest) {
     let resPixelmap: PixelMap | undefined = undefined
     let decodingOptions: image.DecodingOptions = {
       editable: request.requestSource === ImageKnifeRequestSource.SRC && request.transformation !== undefined ? true : false,
     }
     let imageSource: image.ImageSource = image.createImageSource(resBuf)
     if (imageSource === undefined){
-      return ImageKnifeLoader.makeEmptyResult("image.createImageSource failed")
+      ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed")
+      return
     }
 
     let size = (await imageSource.getImageInfo()).size
@@ -79,23 +94,30 @@ export class ImageKnifeLoader {
         imageSource.release()
       }).catch((error: BusinessError) => {
         imageSource.release()
-        return ImageKnifeLoader.makeEmptyResult(JSON.stringify(error))
+        ImageKnifeLoader.makeEmptyResult(request,JSON.stringify(error))
+        return
       })
-
-    return {
+    if (request.requestSource === ImageKnifeRequestSource.SRC && request.transformation !== undefined && resPixelmap !== undefined) {
+      LogUtil.log("ImageKnife_DataTime_requestJob.transform.start:" + request.src)
+      resPixelmap = await request.transformation?.transform(request.context, resPixelmap,  request.componentWidth, request.componentHeight);
+      LogUtil.log("ImageKnife_DataTime_requestJob.transform.end:" + request.src)
+    }
+    let res: RequestJobResult = {
       pixelMap: resPixelmap,
       bufferSize: resBuf.byteLength,
       fileKey: fileKey,
       size:size,
       type:typeValue
-    };
+    }
+    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
   }
   static async parseSvgImage(resBuf: ArrayBuffer, typeValue: string, fileKey: string,
-    request: RequestJobRequest): Promise<RequestJobResult>  {
+    request: RequestJobRequest) {
     let resPixelmap: PixelMap | undefined = undefined
     let imageSource: image.ImageSource = image.createImageSource(resBuf)
     if (imageSource === undefined){
-      return ImageKnifeLoader.makeEmptyResult("image.createImageSource failed")
+      ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed")
+      return
     }
 
     let size = (await imageSource.getImageInfo()).size
@@ -116,21 +138,23 @@ export class ImageKnifeLoader {
         imageSource.release()
       }).catch((error: BusinessError) => {
         imageSource.release()
-        return ImageKnifeLoader.makeEmptyResult(JSON.stringify(error))
+        ImageKnifeLoader.makeEmptyResult(request,JSON.stringify(error))
+        return
       })
-
-    return {
+    let res: RequestJobResult = {
       pixelMap: resPixelmap,
       bufferSize: resBuf.byteLength,
       fileKey: fileKey,
       type:typeValue
-    };
+    }
+    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
   }
   static async parseAnimatorImage(resBuf: ArrayBuffer, typeValue: string,
-    fileKey: string,request: RequestJobRequest): Promise<RequestJobResult>  {
+    fileKey: string,request: RequestJobRequest)  {
     let imageSource: image.ImageSource = image.createImageSource(resBuf)
     if (imageSource === undefined){
-      return ImageKnifeLoader.makeEmptyResult("image.createImageSource failed")
+      ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed")
+      return
     }
 
     let frameCount = await imageSource.getFrameCount()
@@ -140,22 +164,25 @@ export class ImageKnifeLoader {
     if(frameCount == undefined || frameCount == 1) {
     } else {
       let base64str = "data:image/" + typeValue + ";base64," + new util.Base64Helper().encodeToStringSync(new Uint8Array(resBuf))
-      return {
+      let res: RequestJobResult = {
         pixelMap: base64str,
         bufferSize: resBuf.byteLength,
         fileKey: fileKey,
         size:size,
         type:typeValue
-      };
       }
-    return ImageKnifeLoader.parseNormalImage(resBuf, typeValue, fileKey, request)
+      emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
+      return
+    }
+    ImageKnifeLoader.parseNormalImage(resBuf, typeValue, fileKey, request)
   }
   // 为AnimatorComponent解析动图
-  static async parseForAnimatorComponent(resBuf: ArrayBuffer, typeValue: string, fileKey: string,request: RequestJobRequest): Promise<RequestJobResult> {
+  static async parseForAnimatorComponent(resBuf: ArrayBuffer, typeValue: string, fileKey: string,request: RequestJobRequest) {
     if (typeValue === 'gif' || typeValue === 'webp') {
       let imageSource: image.ImageSource = image.createImageSource(resBuf);
       if (imageSource === undefined){
-        return ImageKnifeLoader.makeEmptyResult("image.createImageSource failed")
+        ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed")
+        return
       }
       let decodingOptions: image.DecodingOptions = {
         editable: request.requestSource === ImageKnifeRequestSource.SRC && request.transformation !== undefined ? true : false,
@@ -179,9 +206,10 @@ export class ImageKnifeLoader {
         })
       }).catch((error: BusinessError) => {
         imageSource.release()
-        return ImageKnifeLoader.makeEmptyResult(JSON.stringify(error))
+        ImageKnifeLoader.makeEmptyResult(request,JSON.stringify(error))
+        return
       })
-      return {
+      let res: RequestJobResult = {
         pixelMap: "",
         bufferSize: resBuf.byteLength,
         fileKey: fileKey,
@@ -189,8 +217,9 @@ export class ImageKnifeLoader {
         pixelMapList,
         delayList
       }
+      emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
     } else {
-      return ImageKnifeLoader.makeEmptyResult("ImageKnifeAnimatorComponent组件仅支持动态图")
+      ImageKnifeLoader.makeEmptyResult(request,"ImageKnifeAnimatorComponent组件仅支持动态图")
     }
   }
   static getHeaderObj(request:RequestJobRequest){
@@ -207,31 +236,40 @@ export class ImageKnifeLoader {
     return headerObj
   }
   // 获取图片资源
-  static async getImageArrayBuffer(request: RequestJobRequest, requestList: List<ImageKnifeRequestWithSource> | undefined,fileKey:string): Promise<ArrayBuffer> {
+  static async getImageArrayBuffer(request: RequestJobRequest, requestList: List<ImageKnifeRequestWithSource> | undefined,fileKey:string) {
     let resBuf: ArrayBuffer | undefined
-
+    let loadError: string = ""
     // 判断自定义下载
     if (request.customGetImage !== undefined && request.requestSource == ImageKnifeRequestSource.SRC && typeof request.src == "string") {
       // 先从文件缓存获取
       resBuf = FileCache.getFileCacheByFile(request.context, fileKey , request.fileCacheFolder)
       if (resBuf === undefined) {
         LogUtil.log("start customGetImage src=" + request.src)
-        try {
         const headerObj: Record<string, Object> = ImageKnifeLoader.getHeaderObj(request)
-          resBuf = await request.customGetImage(request.context, request.src,headerObj)
-          LogUtil.log("end customGetImage src=" + request.src)
-        } catch (err) {
-          throw new Error('customGetImage loadFile failed! err = ' + err)
-        }
-        if (resBuf === undefined) {
-          throw new Error('customGetImage loadFile failed!')
-        }
+        try {
+          request.customGetImage(request.context, request.src, headerObj)
+            .then((buffer)=>{
+              if(buffer != undefined) {
                 // 保存文件缓存
                 if (request.writeCacheStrategy !== CacheStrategy.Memory) {
                   LogUtil.log("ImageKnife_DataTime_requestJob_saveFileCacheOnlyFile.start:" + request.src)
-          FileCache.saveFileCacheOnlyFile(request.context, fileKey, resBuf, request.fileCacheFolder)
+                  FileCache.saveFileCacheOnlyFile(request.context, fileKey, buffer, request.fileCacheFolder)
                   LogUtil.log("ImageKnife_DataTime_requestJob_saveFileCacheOnlyFile.end:" + request.src)
                 }
+                ImageKnifeLoader.parseImage(buffer,fileKey,request)
+              } else {
+                loadError = "customGetImage loadFail undefined"
+                ImageKnifeLoader.makeEmptyResult(request,loadError)
+              }
+            }).catch((err:string)=>{
+            ImageKnifeLoader.makeEmptyResult(request,err)
+          })
+        } catch (e) {
+          loadError = "customGetImage loadFail failed"
+          ImageKnifeLoader.makeEmptyResult(request,loadError + e)
+        }
+        LogUtil.log("end customGetImage src=" + request.src)
+        return
       }
     }
     else {
@@ -284,25 +322,29 @@ export class ImageKnifeLoader {
               // header: new Header('application/json')
             });
 
-            await promise.then((data: number) => {
+            promise.then((data: number) => {
               if (data == 200 || data == 206 || data == 204) {
                 resBuf = combineArrayBuffers(arrayBuffers)
-              } else {
-                throw new Error("HttpDownloadClient has error, http code =" + JSON.stringify(data))
-              }
-            }).catch((err: Error) => {
-              throw new Error("HttpDownloadClient download ERROR : err = " + JSON.stringify(err))
-            });
-            LogUtil.log("HttpDownloadClient.end:" + request.src)
                 // 保存文件缓存
                 if (resBuf !== undefined && request.writeCacheStrategy !== CacheStrategy.Memory) {
                   LogUtil.log("ImageKnife_DataTime_requestJob_saveFileCacheOnlyFile.start:"+request.src)
                   FileCache.saveFileCacheOnlyFile(request.context, fileKey, resBuf , request.fileCacheFolder)
                   LogUtil.log("ImageKnife_DataTime_requestJob_saveFileCacheOnlyFile.end:"+request.src)
                 }
+                ImageKnifeLoader.parseImage(resBuf,fileKey,request)
+              } else {
+                loadError = "HttpDownloadClient has error, http code =" + JSON.stringify(data)
+                ImageKnifeLoader.makeEmptyResult(request,loadError)
+              }
+            }).catch((err: Error) => {
+              loadError = "HttpDownloadClient download ERROR : err = " + JSON.stringify(err)
+              ImageKnifeLoader.makeEmptyResult(request,loadError)
+            });
+            LogUtil.log("HttpDownloadClient.end:" + request.src)
+            return
           }
           else {
-            throw new Error('onlyRetrieveFromCache,do not fetch image src = ' + request.src)
+            loadError = 'onlyRetrieveFromCache,do not fetch image src = ' + request.src
           }
         } else if (request.src.startsWith('datashare://') || request.src.startsWith('file://')) {
           await fs.open(request.src, fs.OpenMode.READ_ONLY).then(async (file) => {
@@ -312,13 +354,13 @@ export class ImageKnifeLoader {
                 resBuf = buf;
                 fs.closeSync(file.fd);
               }).catch((err:BusinessError) => {
-                throw new Error('LoadDataShareFileClient fs.read err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code)
+                loadError = 'LoadDataShareFileClient fs.read err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code
               })
             }).catch((err:BusinessError) => {
-              throw new Error('LoadDataShareFileClient fs.stat err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code)
+              loadError = 'LoadDataShareFileClient fs.stat err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code
             })
           }).catch((err:BusinessError) => {
-            throw new Error('LoadDataShareFileClient fs.open err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code)
+            loadError = 'LoadDataShareFileClient fs.open err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code
           })
         } else { //从本地文件获取
           try {
@@ -330,7 +372,7 @@ export class ImageKnifeLoader {
               fs.closeSync(file);
             }
           } catch (err) {
-            throw new Error(err)
+            loadError = err
           }
         }
       } else if (typeof request.src == "number") { //从资源文件获取
@@ -354,8 +396,9 @@ export class ImageKnifeLoader {
     }
 
     if (resBuf === undefined){
-      throw new Error('getImageArrayBuffer undefined')
+      ImageKnifeLoader.makeEmptyResult(request,loadError)
+      return
     }
-    return resBuf
+    ImageKnifeLoader.parseImage(resBuf,fileKey,request)
   }
 }

library/src/main/ets/utils/Constants.ets

@@ -14,4 +14,5 @@
  */
 export class Constants {
   public static PROGRESS_EMITTER: string = "progressEmitter"
+  public static CALLBACK_EMITTER: string = "callBackEmitter"
 }