From 344504d8c716c0abab3e7ef8d3eb3c24133cf9bf Mon Sep 17 00:00:00 2001 From: zenggaofeng Date: Thu, 21 Mar 2024 10:01:54 +0800 Subject: [PATCH] =?UTF-8?q?master=E5=88=86=E6=94=AF=E5=90=88=E5=B9=B6taskp?= =?UTF-8?q?ool=E5=88=86=E6=94=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zenggaofeng --- .../imageknife/ImageKnifeComponent.ets | 130 +++++++++--------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets index 1f2df12..45bc38e 100644 --- a/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets +++ b/library/src/main/ets/components/imageknife/ImageKnifeComponent.ets @@ -475,18 +475,8 @@ export struct ImageKnifeComponent { drawPlaceholder(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) { LogUtil.log('ImageKnifeComponent default drawPlaceholder start!') // API12 getImageInfoSync同步 - if(data.drawPixelMap?.imagePixelMap != undefined) { - let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() - LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) - let scaleType = (typeof imageKnifeOption.placeholderScaleType == 'number') ? imageKnifeOption.placeholderScaleType : ScaleType.FIT_CENTER - context.save(); - context.clearRect(0, 0, compWidth, compHeight) - ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) - context.restore(); - LogUtil.log('ImageKnifeComponent default drawPlaceholder end!') - } - // getImageInfo异步 - // data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + // if(data.drawPixelMap?.imagePixelMap != undefined) { + // let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() // LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) // let scaleType = (typeof imageKnifeOption.placeholderScaleType == 'number') ? imageKnifeOption.placeholderScaleType : ScaleType.FIT_CENTER // context.save(); @@ -494,7 +484,17 @@ export struct ImageKnifeComponent { // ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) // context.restore(); // LogUtil.log('ImageKnifeComponent default drawPlaceholder end!') - // }) + // } + // getImageInfo异步 + data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + let scaleType = (typeof imageKnifeOption.placeholderScaleType == 'number') ? imageKnifeOption.placeholderScaleType : ScaleType.FIT_CENTER + context.save(); + context.clearRect(0, 0, compWidth, compHeight) + ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) + context.restore(); + LogUtil.log('ImageKnifeComponent default drawPlaceholder end!') + }) } drawProgress(context: CanvasRenderingContext2D, progress: number, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) { @@ -541,18 +541,8 @@ export struct ImageKnifeComponent { drawThumbSizeMultiplier(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) { LogUtil.log('ImageKnifeComponent default drawThumbSizeMultiplier start!') // API12 getImageInfoSync同步 - if(data.drawPixelMap?.imagePixelMap != undefined) { - let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() - LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) - let scaleType = (typeof imageKnifeOption.thumbSizeMultiplierScaleType == 'number') ? imageKnifeOption.thumbSizeMultiplierScaleType : ScaleType.FIT_CENTER - context.save(); - context.clearRect(0, 0, compWidth, compHeight) - ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) - context.restore(); - LogUtil.log('ImageKnifeComponent default drawThumbSizeMultiplier end!') - } - // getImageInfo异步 - // data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + // if(data.drawPixelMap?.imagePixelMap != undefined) { + // let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() // LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) // let scaleType = (typeof imageKnifeOption.thumbSizeMultiplierScaleType == 'number') ? imageKnifeOption.thumbSizeMultiplierScaleType : ScaleType.FIT_CENTER // context.save(); @@ -560,25 +550,25 @@ export struct ImageKnifeComponent { // ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) // context.restore(); // LogUtil.log('ImageKnifeComponent default drawThumbSizeMultiplier end!') - // }) + // } + // getImageInfo异步 + data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + let scaleType = (typeof imageKnifeOption.thumbSizeMultiplierScaleType == 'number') ? imageKnifeOption.thumbSizeMultiplierScaleType : ScaleType.FIT_CENTER + context.save(); + context.clearRect(0, 0, compWidth, compHeight) + ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) + context.restore(); + LogUtil.log('ImageKnifeComponent default drawThumbSizeMultiplier end!') + }) } drawMainSource(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) { LogUtil.log('ImageKnifeComponent default drawMainSource start!') if (data.isPixelMap()) { // API12 getImageInfoSync同步 - if(data.drawPixelMap?.imagePixelMap != undefined) { - let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() - let scaleType = (typeof imageKnifeOption.mainScaleType == 'number') ? imageKnifeOption.mainScaleType : ScaleType.FIT_CENTER - LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height + 'scaleType=' + scaleType) - context.save(); - context.clearRect(0, 0, compWidth, compHeight) - ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) - context.restore(); - LogUtil.log('ImageKnifeComponent default drawMainSource end!') - } - // getImageInfo异步 - // data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + // if(data.drawPixelMap?.imagePixelMap != undefined) { + // let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() // let scaleType = (typeof imageKnifeOption.mainScaleType == 'number') ? imageKnifeOption.mainScaleType : ScaleType.FIT_CENTER // LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height + 'scaleType=' + scaleType) // context.save(); @@ -586,7 +576,17 @@ export struct ImageKnifeComponent { // ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) // context.restore(); // LogUtil.log('ImageKnifeComponent default drawMainSource end!') - // }) + // } + // getImageInfo异步 + data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + let scaleType = (typeof imageKnifeOption.mainScaleType == 'number') ? imageKnifeOption.mainScaleType : ScaleType.FIT_CENTER + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height + 'scaleType=' + scaleType) + context.save(); + context.clearRect(0, 0, compWidth, compHeight) + ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) + context.restore(); + LogUtil.log('ImageKnifeComponent default drawMainSource end!') + }) if (data.drawPixelMap != undefined) { data.drawPixelMap.isShowOnComponent = true; this.detachFromLayoutPixelMap = data.drawPixelMap.detachFromLayoutPixelMap; @@ -603,18 +603,8 @@ export struct ImageKnifeComponent { drawRetryholder(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) { LogUtil.log('ImageKnifeComponent default drawRetryholder start!') // API12 getImageInfoSync同步 - if(data.drawPixelMap?.imagePixelMap != undefined) { - let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() - LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) - let scaleType = (typeof imageKnifeOption.retryholderScaleType == 'number') ? imageKnifeOption.retryholderScaleType : ScaleType.FIT_CENTER - context.save(); - context.clearRect(0, 0, compWidth, compHeight) - ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) - context.restore(); - LogUtil.log('ImageKnifeComponent default drawRetryholder end!') - } - // getImageInfo异步 - // data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + // if(data.drawPixelMap?.imagePixelMap != undefined) { + // let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() // LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) // let scaleType = (typeof imageKnifeOption.retryholderScaleType == 'number') ? imageKnifeOption.retryholderScaleType : ScaleType.FIT_CENTER // context.save(); @@ -622,24 +612,24 @@ export struct ImageKnifeComponent { // ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) // context.restore(); // LogUtil.log('ImageKnifeComponent default drawRetryholder end!') - // }) + // } + // getImageInfo异步 + data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + let scaleType = (typeof imageKnifeOption.retryholderScaleType == 'number') ? imageKnifeOption.retryholderScaleType : ScaleType.FIT_CENTER + context.save(); + context.clearRect(0, 0, compWidth, compHeight) + ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) + context.restore(); + LogUtil.log('ImageKnifeComponent default drawRetryholder end!') + }) } drawErrorholder(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) { LogUtil.log('ImageKnifeComponent default drawErrorholder start!') // API12 getImageInfoSync同步 - if(data.drawPixelMap?.imagePixelMap != undefined) { - let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() - LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) - let scaleType = (typeof imageKnifeOption.errorholderSrcScaleType == 'number') ? imageKnifeOption.errorholderSrcScaleType : ScaleType.FIT_CENTER - context.save(); - context.clearRect(0, 0, compWidth, compHeight) - ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) - context.restore(); - LogUtil.log('ImageKnifeComponent default drawErrorholder end!') - } - // getImageInfo异步 - // data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + // if(data.drawPixelMap?.imagePixelMap != undefined) { + // let imageInfo = data.drawPixelMap?.imagePixelMap.getImageInfoSync() // LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) // let scaleType = (typeof imageKnifeOption.errorholderSrcScaleType == 'number') ? imageKnifeOption.errorholderSrcScaleType : ScaleType.FIT_CENTER // context.save(); @@ -647,7 +637,17 @@ export struct ImageKnifeComponent { // ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) // context.restore(); // LogUtil.log('ImageKnifeComponent default drawErrorholder end!') - // }) + // } + // getImageInfo异步 + data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => { + LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height) + let scaleType = (typeof imageKnifeOption.errorholderSrcScaleType == 'number') ? imageKnifeOption.errorholderSrcScaleType : ScaleType.FIT_CENTER + context.save(); + context.clearRect(0, 0, compWidth, compHeight) + ScaleTypeHelper.drawImageWithScaleType(context, scaleType, data.drawPixelMap?.imagePixelMap, px2vp(imageInfo.size.width), px2vp(imageInfo.size.height), compWidth, compHeight, 0, 0) + context.restore(); + LogUtil.log('ImageKnifeComponent default drawErrorholder end!') + }) } requestAddTransform(request: RequestOption) {