From 38144acd93ece587351031bced8e26209a82c65c Mon Sep 17 00:00:00 2001
From: tsm <tianshuangming@h-partners.com>
Date: Mon, 2 Sep 2024 10:34:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E9=87=87=E6=A0=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: tsm <tianshuangming@h-partners.com>
---
 entry/src/main/ets/pages/DownSamplePage.ets   | 43 +++++++++++++++----
 library/src/main/ets/ImageKnifeDispatcher.ets |  6 ++-
 .../ets/downsampling/BaseDownsampling.ets     |  5 ++-
 .../ets/downsampling/DownsampleStartegy.ets   | 33 ++++++--------
 .../src/main/ets/downsampling/Downsampler.ets | 18 +++++---
 library/src/main/ets/key/DefaultEngineKey.ets |  1 +
 6 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/entry/src/main/ets/pages/DownSamplePage.ets b/entry/src/main/ets/pages/DownSamplePage.ets
index 75c351e..b8cc0e6 100644
--- a/entry/src/main/ets/pages/DownSamplePage.ets
+++ b/entry/src/main/ets/pages/DownSamplePage.ets
@@ -34,9 +34,11 @@ struct DownSamplePage {
   @Local SamplingList: SamplingType[] = [
     new SamplingType(0, "NONE"),
     new SamplingType(1, "AT_MOST"),
-    new SamplingType(2, "FIT_CENTER"),
-    new SamplingType(3, "CENTER_INSIDE"),
-    new SamplingType(4, "CENTER_OUTSIDE"),
+    new SamplingType(2, "FIT_CENTER_MEMORY"),
+    new SamplingType(4, "FIT_CENTER_QUALITY"),
+    new SamplingType(5, "CENTER_INSIDE_MEMORY"),
+    new SamplingType(6, "CENTER_INSIDE_QUALITY"),
+    new SamplingType(7, "CENTER_OUTSIDE"),
   ]
   @Local checked: boolean = false
 
@@ -61,27 +63,50 @@ struct DownSamplePage {
       })
       this.originalPixMap($r('app.media.svgSample'))
       this.afterSamplingFunc($r('app.media.svgSample'))
-    } else if (value === 'FIT_CENTER') {
+    } else if (value === 'FIT_CENTER_MEMORY') {
       this.imageKnifeOption =new ImageKnifeOption( {
         loadSrc: $r('app.media.pngSample'),
         placeholderSrc: $r("app.media.loading"),
         errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
-        downsampleOf: DownsampleStrategy.FIT_CENTER
+        downsampleOf: DownsampleStrategy.FIT_CENTER_MEMORY
       })
       this.originalPixMap($r('app.media.pngSample'))
       this.afterSamplingFunc($r('app.media.pngSample'))
-    } else if (value === 'CENTER_INSIDE') {
+    }
+    else if (value ==='FIT_CENTER_QUALITY') {
+      this.imageKnifeOption =new ImageKnifeOption( {
+        loadSrc: $r('app.media.pngSample'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
+        objectFit: ImageFit.Contain,
+        downsampleOf: DownsampleStrategy.FIT_CENTER_QUALITY
+      })
+      this.originalPixMap($r('app.media.pngSample'))
+      this.afterSamplingFunc($r('app.media.pngSample'))
+    }
+    else if (value === 'CENTER_INSIDE_MEMORY') {
       this.imageKnifeOption = new ImageKnifeOption({
         loadSrc: $r('app.media.jpgSample1'),
         placeholderSrc: $r("app.media.loading"),
         errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
-        downsampleOf: DownsampleStrategy.CENTER_INSIDE
+        downsampleOf: DownsampleStrategy.CENTER_INSIDE_MEMORY
       })
       this.originalPixMap($r('app.media.jpgSample1'))
       this.afterSamplingFunc($r('app.media.jpgSample1'))
-    } else {
+    }    else if (value === 'CENTER_INSIDE_QUALITY') {
+      this.imageKnifeOption = new ImageKnifeOption({
+        loadSrc: $r('app.media.jpgSample1'),
+        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'))
+    }
+    else {
       this.imageKnifeOption = new ImageKnifeOption({
         loadSrc: $r('app.media.jpgSample2'),
         placeholderSrc: $r("app.media.loading"),
@@ -106,7 +131,7 @@ struct DownSamplePage {
     let imageInfo = await imageSource.getImageInfo()
     let reqSize =
       new Downsampler().calculateScaling(typeValue, imageInfo.size.width, imageInfo.size.height, 300,
-        300, this.imageKnifeOption.downsampleOf, false)
+        300, this.imageKnifeOption.downsampleOf)
     decodingOptions = {
       editable: true,
       desiredSize: {
diff --git a/library/src/main/ets/ImageKnifeDispatcher.ets b/library/src/main/ets/ImageKnifeDispatcher.ets
index bbf5986..b338822 100644
--- a/library/src/main/ets/ImageKnifeDispatcher.ets
+++ b/library/src/main/ets/ImageKnifeDispatcher.ets
@@ -40,6 +40,8 @@ import {
 } from './model/ImageKnifeData'
 import { combineArrayBuffers } from './model/utils';
 import { BusinessError } from '@kit.BasicServicesKit';
+import { Downsampler } from './downsampling/Downsampler';
+import { DownsampleStrategy } from './downsampling/DownsampleStartegy';
 
 export class ImageKnifeDispatcher {
   // 最大并发
@@ -659,7 +661,7 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
       request.requestSource == ImageKnifeRequestSource.SRC) {
       let reqSize =
         new Downsampler().calculateScaling(typeValue, imageInfo.size.width, imageInfo.size.height, request.targetWidth,
-          request.targetHeight, request.downsampType, autoResizes)
+          request.targetHeight, request.downsampType)
       opts = {
         editable: true,
         desiredSize: {
@@ -686,7 +688,7 @@ async function requestJob(request: RequestJobRequest, requestList?: List<ImageKn
     request.requestSource == ImageKnifeRequestSource.SRC) {
     let reqSize =
       new Downsampler().calculateScaling(typeValue, imageInfo.size.width, imageInfo.size.height, request.targetWidth,
-        request.targetHeight, request.downsampType, autoResizes)
+        request.targetHeight, request.downsampType)
 
     decodingOptions = {
       editable: true,
diff --git a/library/src/main/ets/downsampling/BaseDownsampling.ets b/library/src/main/ets/downsampling/BaseDownsampling.ets
index 6303a11..5b49b68 100644
--- a/library/src/main/ets/downsampling/BaseDownsampling.ets
+++ b/library/src/main/ets/downsampling/BaseDownsampling.ets
@@ -12,14 +12,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { DownsampleStrategy } from './DownsampleStartegy';
 
 import { SampleSizeRounding } from './DownsampleUtils';
 
 export interface BaseDownsampling {
   getName(): string
 
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestWidth: number, requestHeight: number): number
+  getScaleFactor(sourceWidth: number, sourceHeight: number, requestWidth: number, requestHeight: number,downsampType?:DownsampleStrategy): number
 
   getSampleSizeRounding(sourceWidth: number, sourceHeight: number, requestWidth: number,
-    requestHeight: number): SampleSizeRounding
+    requestHeight: number,downsampType?:DownsampleStrategy): SampleSizeRounding
 }
\ No newline at end of file
diff --git a/library/src/main/ets/downsampling/DownsampleStartegy.ets b/library/src/main/ets/downsampling/DownsampleStartegy.ets
index 3b78fb8..3de4efb 100644
--- a/library/src/main/ets/downsampling/DownsampleStartegy.ets
+++ b/library/src/main/ets/downsampling/DownsampleStartegy.ets
@@ -20,16 +20,13 @@ export class FitCenter implements BaseDownsampling {
     return "FitCenter"
   }
 
-  //实现 getScaleFactor 方法
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
+  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy
     ): number {
-    const IS_BITMAP_FACTORY_SCALING_SUPPORTED = autoResize;
-    if (IS_BITMAP_FACTORY_SCALING_SUPPORTED) {
+    if (downsampType===DownsampleStrategy.FIT_CENTER_QUALITY) {
       const widthPercentage = requestedWidth / sourceWidth
       const heightPercentage = requestedHeight / sourceHeight
       return Math.min(widthPercentage, heightPercentage)
     } else {
-      //类似 AT_LEAST,但只要求一个维度或另一个维度大于等于请求的尺寸
       const maxIntegerFactor = Math.max(sourceHeight / requestedHeight, sourceWidth / requestedWidth);
       const a = maxIntegerFactor === 0 ? 1 : 1 / highestOneBit(maxIntegerFactor)
       return a;
@@ -37,11 +34,9 @@ export class FitCenter implements BaseDownsampling {
   }
 
   //实现 getSampleSizeRounding 方法
-  getSampleSizeRounding(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
+  getSampleSizeRounding(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy
     ): number {
-    const IS_BITMAP_FACTORY_SCALING_SUPPORTED = autoResize;
-
-    if (!IS_BITMAP_FACTORY_SCALING_SUPPORTED) {
+    if (downsampType===DownsampleStrategy.FIT_CENTER_QUALITY) {
       return SampleSizeRounding.QUALITY;
     } else {
       return SampleSizeRounding.MEMORY;
@@ -127,20 +122,19 @@ export class CenterInside implements BaseDownsampling {
     return "CenterInside"
   }
 
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
+  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy
     ): number {
     //获取 FIT_CENTER 的缩放因子
     const fitCenterScaleFactor: ESObject =
-      this.getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, autoResize);
+      this.getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType);
     //返回不超过 1 的缩放因子，即尽量缩小图像以适应目标尺寸，但不会放大
     return Math.min(1, fitCenterScaleFactor);
 
   }
 
-  getScale(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
+  getScale(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy
     ): number {
-    const IS_BITMAP_FACTORY_SCALING_SUPPORTED = autoResize;
-    if (IS_BITMAP_FACTORY_SCALING_SUPPORTED) {
+    if (downsampType===DownsampleStrategy.FIT_CENTER_QUALITY) {
       const widthPercentage = requestedWidth / sourceWidth
       const heightPercentage = requestedHeight / sourceHeight
       return Math.min(widthPercentage, heightPercentage)
@@ -152,20 +146,19 @@ export class CenterInside implements BaseDownsampling {
     }
   }
 
-  getSampleSizeRounding(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
+  getSampleSizeRounding(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy
     ): SampleSizeRounding {
     //如果缩放因子为 1，表示没有缩放，优先选择质量
-    if (this.getScaleFactor(sourceWidth, sourceHeight, requestedWidth, requestedHeight, autoResize) === 1) {
+    if (this.getScaleFactor(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType) === 1) {
       return SampleSizeRounding.QUALITY
     }
     //否则，使用 FIL_CENTER 的 SampleSizeRounding 值
-    return this.getSampleSize(sourceWidth, sourceHeight, requestedWidth, requestedHeight);
+    return this.getSampleSize(sourceWidth, sourceHeight, requestedWidth, requestedHeight,downsampType);
   }
 
-  getSampleSize(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
+  getSampleSize(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,downsampType:DownsampleStrategy
     ): SampleSizeRounding {
-    const IS_BITMAP_FACTORY_SCALING_SUPPORTED = autoResize;
-    if (IS_BITMAP_FACTORY_SCALING_SUPPORTED) {
+    if (downsampType===DownsampleStrategy.CENTER_INSIDE_QUALITY) {
       return SampleSizeRounding.QUALITY;
     } else {
       return SampleSizeRounding.MEMORY;
diff --git a/library/src/main/ets/downsampling/Downsampler.ets b/library/src/main/ets/downsampling/Downsampler.ets
index bfe9065..8c208b8 100644
--- a/library/src/main/ets/downsampling/Downsampler.ets
+++ b/library/src/main/ets/downsampling/Downsampler.ets
@@ -70,11 +70,11 @@ export class Downsampler {
     let exactScaleFactor: number | undefined
     let rounding: SampleSizeRounding | undefined
     switch (downsampType) {
-      case DownsampleStrategy.FIT_CENTER:
+      case DownsampleStrategy.FIT_CENTER_MEMORY || DownsampleStrategy.FIT_CENTER_QUALITY:
         exactScaleFactor = new FitCenter()
-          .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight)
+          .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType)
         rounding = new FitCenter()
-          .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight)
+          .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType)
         break;
       case DownsampleStrategy.NONE:
         exactScaleFactor = new None()
@@ -89,10 +89,11 @@ export class Downsampler {
           .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight)
         break
       case DownsampleStrategy.CENTER_INSIDE_MEMORY || DownsampleStrategy.CENTER_INSIDE_QUALITY:
+        console.log('CENTER_INSIDE',JSON.stringify(downsampType))
         exactScaleFactor = new CenterInside()
-          .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,DownsampleStrategy.CENTER_INSIDE_MEMORY)
+          .getScaleFactor(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType)
         rounding = new CenterInside()
-          .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,DownsampleStrategy.CENTER_INSIDE_MEMORY)
+          .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight,downsampType)
         break
 
       case DownsampleStrategy.CENTER_OUTSIDE:
@@ -102,7 +103,7 @@ export class Downsampler {
           .getSampleSizeRounding(orientedSourceWidth, orientedSourceHeight, targetWidth, targetHeight)
         break
     }
-    if (exactScaleFactor <= 0 ||exactScaleFactor==undefined) {
+    if (exactScaleFactor==undefined|| exactScaleFactor <= 0 ) {
       throw new Error("Cannot round with exactScaleFactor");
     }
     if (rounding == undefined) {
@@ -110,10 +111,13 @@ export class Downsampler {
     }
     let outWidth: number = this.round(exactScaleFactor * orientedSourceWidth);
     let outHeight: number = this.round(exactScaleFactor * orientedSourceHeight);
+    console.log('scaleFactor=outWidth==outHeight======',outWidth,outHeight)
     let widthScaleFactor = orientedSourceWidth / outWidth;
     let heightScaleFactor = orientedSourceHeight / outHeight;
-    let scaleFactor = rounding == 1 ? Math.max(widthScaleFactor, heightScaleFactor) :
+    console.log('scaleFactor=widthScaleFactor==heightScaleFactor======',widthScaleFactor,heightScaleFactor)
+    let scaleFactor = rounding ==SampleSizeRounding.QUALITY ? Math.max(widthScaleFactor, heightScaleFactor) :
     Math.min(widthScaleFactor, heightScaleFactor) //将整型的缩放因子转换为2的次幂采样大小
+    console.log('scaleFactor===scaleFactor======',scaleFactor)
     let powerOfTwoSampleSize: number = scaleFactor;
     powerOfTwoSampleSize = Math.max(1, highestOneBit(scaleFactor))
     if (rounding == 1 && (powerOfTwoSampleSize < (1 / exactScaleFactor))) {
diff --git a/library/src/main/ets/key/DefaultEngineKey.ets b/library/src/main/ets/key/DefaultEngineKey.ets
index 84213d4..e2f48a7 100644
--- a/library/src/main/ets/key/DefaultEngineKey.ets
+++ b/library/src/main/ets/key/DefaultEngineKey.ets
@@ -17,6 +17,7 @@ import { ImageKnifeOption } from '../ImageKnifeOption';
 import { IEngineKey } from './IEngineKey';
 import { PixelMapTransformation } from '../transform/PixelMapTransformation';
 import { ImageKnifeRequestSource } from '../model/ImageKnifeData';
+import { DownsampleStrategy } from '../downsampling/DownsampleStartegy';
 
 @Sendable
 export class DefaultEngineKey implements IEngineKey {