From 60df15c3ea817027a4be5b14b285975208202407 Mon Sep 17 00:00:00 2001 From: tsm Date: Thu, 5 Sep 2024 11:37:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E9=87=87=E6=A0=B7=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tsm --- .../main/ets/common/CustomEngineKeyImpl.ets | 5 ++ entry/src/main/ets/pages/DownSamplePage.ets | 30 +++++----- library/src/main/ets/ImageKnifeOption.ets | 2 +- .../ets/components/ImageKnifeComponent.ets | 2 +- .../ets/downsampling/DownsampleStartegy.ets | 9 ++- .../src/main/ets/downsampling/Downsampler.ets | 58 +++++++++---------- 6 files changed, 52 insertions(+), 54 deletions(-) diff --git a/entry/src/main/ets/common/CustomEngineKeyImpl.ets b/entry/src/main/ets/common/CustomEngineKeyImpl.ets index 06f2901..5d9fee4 100644 --- a/entry/src/main/ets/common/CustomEngineKeyImpl.ets +++ b/entry/src/main/ets/common/CustomEngineKeyImpl.ets @@ -12,6 +12,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +import { DownsampleStrategy } from '@ohos/imageknife'; import { IEngineKey, ImageKnifeOption, PixelMapTransformation,SparkMD5 ,ImageKnifeRequestSource} from '@ohos/libraryimageknife'; //全局自定义key demo @@ -35,6 +36,10 @@ export class CustomEngineKeyImpl implements IEngineKey { if (imageKnifeOption.transformation) { key += "transformation=" + this.getTransformation(imageKnifeOption.transformation) + ";" } + if ((imageKnifeOption.downsampleOf !== DownsampleStrategy.NONE && imageKnifeOption.downsampleOf !== undefined)) { + key += "downsampleOf" + imageKnifeOption.downsampleOf +"width="+width+"height="+ height + } + } return key } diff --git a/entry/src/main/ets/pages/DownSamplePage.ets b/entry/src/main/ets/pages/DownSamplePage.ets index b8cc0e6..c7442e0 100644 --- a/entry/src/main/ets/pages/DownSamplePage.ets +++ b/entry/src/main/ets/pages/DownSamplePage.ets @@ -45,24 +45,24 @@ struct DownSamplePage { updateImageKnifeOption(value: string) { if (value === 'NONE') { this.imageKnifeOption =new ImageKnifeOption( { - loadSrc: $r('app.media.jpgSample'), + loadSrc: $r('app.media.pngSample'), placeholderSrc: $r("app.media.loading"), errorholderSrc: $r("app.media.app_icon"), objectFit: ImageFit.Contain, downsampleOf: DownsampleStrategy.NONE }) - this.originalPixMap($r('app.media.jpgSample')) - this.afterSamplingFunc($r('app.media.jpgSample')) + this.originalPixMap($r('app.media.pngSample')) + this.afterSamplingFunc($r('app.media.pngSample')) } else if (value === 'AT_MOST') { this.imageKnifeOption =new ImageKnifeOption( { - loadSrc: $r('app.media.svgSample'), + loadSrc: $r('app.media.pngSample'), placeholderSrc: $r("app.media.loading"), errorholderSrc: $r("app.media.app_icon"), objectFit: ImageFit.Contain, downsampleOf: DownsampleStrategy.AT_MOST }) - this.originalPixMap($r('app.media.svgSample')) - this.afterSamplingFunc($r('app.media.svgSample')) + this.originalPixMap($r('app.media.pngSample')) + this.afterSamplingFunc($r('app.media.pngSample')) } else if (value === 'FIT_CENTER_MEMORY') { this.imageKnifeOption =new ImageKnifeOption( { loadSrc: $r('app.media.pngSample'), @@ -87,35 +87,35 @@ struct DownSamplePage { } else if (value === 'CENTER_INSIDE_MEMORY') { this.imageKnifeOption = new ImageKnifeOption({ - loadSrc: $r('app.media.jpgSample1'), + loadSrc: $r('app.media.pngSample'), placeholderSrc: $r("app.media.loading"), errorholderSrc: $r("app.media.app_icon"), objectFit: ImageFit.Contain, downsampleOf: DownsampleStrategy.CENTER_INSIDE_MEMORY }) - this.originalPixMap($r('app.media.jpgSample1')) - this.afterSamplingFunc($r('app.media.jpgSample1')) + this.originalPixMap($r('app.media.pngSample')) + this.afterSamplingFunc($r('app.media.pngSample')) } else if (value === 'CENTER_INSIDE_QUALITY') { this.imageKnifeOption = new ImageKnifeOption({ - loadSrc: $r('app.media.jpgSample1'), + loadSrc: $r('app.media.pngSample'), placeholderSrc: $r("app.media.loading"), errorholderSrc: $r("app.media.app_icon"), objectFit: ImageFit.Contain, downsampleOf: DownsampleStrategy.CENTER_INSIDE_QUALITY }) - this.originalPixMap($r('app.media.jpgSample1')) - this.afterSamplingFunc($r('app.media.jpgSample1')) + this.originalPixMap($r('app.media.pngSample')) + this.afterSamplingFunc($r('app.media.pngSample')) } else { this.imageKnifeOption = new ImageKnifeOption({ - loadSrc: $r('app.media.jpgSample2'), + loadSrc: $r('app.media.pngSample'), placeholderSrc: $r("app.media.loading"), errorholderSrc: $r("app.media.app_icon"), objectFit: ImageFit.Contain, downsampleOf: DownsampleStrategy.CENTER_OUTSIDE }) - this.originalPixMap($r('app.media.jpgSample2')) - this.afterSamplingFunc($r('app.media.jpgSample2')) + this.originalPixMap($r('app.media.pngSample')) + this.afterSamplingFunc($r('app.media.pngSample')) } } diff --git a/library/src/main/ets/ImageKnifeOption.ets b/library/src/main/ets/ImageKnifeOption.ets index 670180d..ec1586c 100644 --- a/library/src/main/ets/ImageKnifeOption.ets +++ b/library/src/main/ets/ImageKnifeOption.ets @@ -125,7 +125,7 @@ export class ImageKnifeOption { onComplete?:(event:EventImage | undefined) => void drawingColorFilter?: ColorFilter | drawing.ColorFilter // 下采样 - downsampleOf?: DownsampleStrategy = DownsampleStrategy.NONE + @Trace downsampleOf?: DownsampleStrategy = DownsampleStrategy.NONE constructor(option?:ImageOption) { this.loadSrc = option?.loadSrc == undefined ? "" : option?.loadSrc diff --git a/library/src/main/ets/components/ImageKnifeComponent.ets b/library/src/main/ets/components/ImageKnifeComponent.ets index 1232ba3..eacc634 100644 --- a/library/src/main/ets/components/ImageKnifeComponent.ets +++ b/library/src/main/ets/components/ImageKnifeComponent.ets @@ -38,7 +38,7 @@ export struct ImageKnifeComponent { @Param imageKnifeOption: ImageKnifeOption = new ImageKnifeOption(); @Monitor('imageKnifeOption', - "imageKnifeOption.loadSrc","imageKnifeOption.signature","imageKnifeOption.transformation","imageKnifeOption.border","imageKnifeOption.objectFit") + "imageKnifeOption.loadSrc","imageKnifeOption.signature","imageKnifeOption.transformation","imageKnifeOption.border","imageKnifeOption.objectFit",'imageKnifeOption.downsampleOf') watchImageKnifeOption() { this.clearLastRequest() this.componentVersion++ diff --git a/library/src/main/ets/downsampling/DownsampleStartegy.ets b/library/src/main/ets/downsampling/DownsampleStartegy.ets index 3de4efb..0e43320 100644 --- a/library/src/main/ets/downsampling/DownsampleStartegy.ets +++ b/library/src/main/ets/downsampling/DownsampleStartegy.ets @@ -22,7 +22,7 @@ export class FitCenter implements BaseDownsampling { getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy ): number { - if (downsampType===DownsampleStrategy.FIT_CENTER_QUALITY) { + if (downsampType===DownsampleStrategy.FIT_CENTER_MEMORY) { const widthPercentage = requestedWidth / sourceWidth const heightPercentage = requestedHeight / sourceHeight return Math.min(widthPercentage, heightPercentage) @@ -82,7 +82,6 @@ export class CenterOutside implements BaseDownsampling { getSampleSizeRounding(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number): SampleSizeRounding { - //根据 CenterOutside 的逻辑，总是返回 QUALITY return SampleSizeRounding.QUALITY; } } @@ -158,10 +157,10 @@ export class CenterInside implements BaseDownsampling { getSampleSize(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy ): SampleSizeRounding { - if (downsampType===DownsampleStrategy.CENTER_INSIDE_QUALITY) { - return SampleSizeRounding.QUALITY; - } else { + if (downsampType===DownsampleStrategy.CENTER_INSIDE_MEMORY) { return SampleSizeRounding.MEMORY; + } else { + return SampleSizeRounding.QUALITY; } } } diff --git a/library/src/main/ets/downsampling/Downsampler.ets b/library/src/main/ets/downsampling/Downsampler.ets index b83918f..9be34b5 100644 --- a/library/src/main/ets/downsampling/Downsampler.ets +++ b/library/src/main/ets/downsampling/Downsampler.ets @@ -69,38 +69,32 @@ export class Downsampler { } let exactScaleFactor: number | undefined let rounding: SampleSizeRounding | undefined - switch (downsampType) { - case DownsampleStrategy.FIT_CENTER_MEMORY || DownsampleStrategy.FIT_CENTER_QUALITY: - exactScaleFactor = new FitCenter() - .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) - rounding = new FitCenter() - .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) - break; - case DownsampleStrategy.NONE: - exactScaleFactor = new None() - .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) - rounding = new None() - .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) - break - case DownsampleStrategy.AT_MOST: - exactScaleFactor = new AtMost() - .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) - rounding = new AtMost() - .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) - break - case DownsampleStrategy.CENTER_INSIDE_MEMORY || DownsampleStrategy.CENTER_INSIDE_QUALITY: - exactScaleFactor = new CenterInside() - .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) - rounding = new CenterInside() - .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) - break + if(downsampType===DownsampleStrategy.FIT_CENTER_MEMORY || downsampType===DownsampleStrategy.FIT_CENTER_QUALITY){ + exactScaleFactor = new FitCenter() + .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) + rounding = new FitCenter() + .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) - case DownsampleStrategy.CENTER_OUTSIDE: - exactScaleFactor = new CenterOutside() - .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) - rounding = new CenterOutside() - .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) - break + }else if(downsampType===DownsampleStrategy.NONE){ + exactScaleFactor = new None() + .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) + rounding = new None() + .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) + }else if( downsampType===DownsampleStrategy.AT_MOST){ + exactScaleFactor = new AtMost() + .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) + rounding = new AtMost() + .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) + }else if(downsampType===DownsampleStrategy.CENTER_INSIDE_MEMORY || downsampType===DownsampleStrategy.CENTER_INSIDE_QUALITY){ + exactScaleFactor = new CenterInside() + .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) + rounding = new CenterInside() + .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType) + }else if(downsampType===DownsampleStrategy.CENTER_OUTSIDE){ + exactScaleFactor = new CenterOutside() + .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) + rounding = new CenterOutside() + .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight) } if (exactScaleFactor==undefined|| exactScaleFactor <= 0 ) { throw new Error("Cannot round with exactScaleFactor"); @@ -116,7 +110,7 @@ export class Downsampler { Math.min(widthScaleFactor, heightScaleFactor) //将整型的缩放因子转换为2的次幂采样大小 let powerOfTwoSampleSize: number = scaleFactor; powerOfTwoSampleSize = Math.max(1, highestOneBit(scaleFactor)) - if (rounding == 1 && (powerOfTwoSampleSize < (1 / exactScaleFactor))) { + if (rounding == 0 && (powerOfTwoSampleSize < (1 / exactScaleFactor))) { powerOfTwoSampleSize = powerOfTwoSampleSize << 1; } //基于上一步得出的采样大小，根据不同的图片类型，计算采样后的图片尺寸