diff --git a/CHANGELOG.md b/CHANGELOG.md index b0e44f3..f912a80 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## 3.1.0-rc.3 - 部分静态webp图片有delay属性导致识别成动图,改用getFrameCount识别 - 修复加载错误图后未去请求排队队列中的请求 +- 子线程本地Resource参数类型转换成number ## 3.1.0-rc.2 - 修复宽高不等svg图片显示有毛边 diff --git a/library/src/main/ets/ImageKnifeDispatcher.ets b/library/src/main/ets/ImageKnifeDispatcher.ets index b7f44c3..55e1c92 100644 --- a/library/src/main/ets/ImageKnifeDispatcher.ets +++ b/library/src/main/ets/ImageKnifeDispatcher.ets @@ -157,10 +157,21 @@ export class ImageKnifeDispatcher { isWatchProgress = true } }); - + let src: string | number = "" + let moduleName: string = "" + let resName: string = "" + if((imageSrc as Resource).id != undefined) { + moduleName = (imageSrc as Resource).moduleName + src = (imageSrc as Resource).id + if(src == -1) { + resName = (imageSrc as Resource).params![0] + } + } else if(typeof imageSrc == "string") { + src = imageSrc + } let request: RequestJobRequest = { context: currentRequest.context, - src: imageSrc, + src: src, headers: currentRequest.imageKnifeOption.headerOption, allHeaders: currentRequest.headers, componentWidth:currentRequest.componentWidth, @@ -176,7 +187,9 @@ export class ImageKnifeDispatcher { isWatchProgress: isWatchProgress, memoryKey: memoryKey, fileCacheFolder: ImageKnife.getInstance().getFileCache()?.getCacheFolder(), - isAnimator:isAnimator + isAnimator:isAnimator, + moduleName: moduleName == "" ? undefined : moduleName, + resName: resName == "" ? undefined : resName } if(request.customGetImage == undefined) { @@ -391,12 +404,12 @@ async function requestJob(request: RequestJobRequest, requestList?: List, allHeaders: Map, componentWidth: number, @@ -101,6 +101,8 @@ export interface RequestJobRequest { isWatchProgress: boolean memoryKey: string fileCacheFolder: string, - isAnimator?: boolean + isAnimator?: boolean, + moduleName?:string, + resName?: string }