修改CHANGELOG3.0.3正式版本

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

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "gpu_transform/src/main/cpp/boundscheck/third_party_bounds_checking_function"]
-	path = gpu_transform/src/main/cpp/boundscheck/third_party_bounds_checking_function
-	url = https://gitee.com/openharmony/third_party_bounds_checking_function.git

CHANGELOG.md

@@ -1,27 +1,31 @@
-## 3.1.1-rc.1
+## 3.0.3
-- Photo reduction sampling
+- Released version 3.0.3
-## 3.1.1-rc.0
+
-- 重构代码：抽取ImageKnifeDispatcher子线程requestJob相关代码到ImageKnifeLoader中，降低函数复杂度
+## 3.0.3-rc.0
-## 3.1.0
+- Custom network method to add request header parameters
+
+## 3.0.2
+- Added new image reloading interface reload
+- Added return request preload interface preload
+- Added cancel request interface cancel
+
+## 3.0.2-rc.2
+- ImageKnifeAnimatorComponent新增开始、结束、暂停的回调事件
+- 文件缓存数量负数和超过INT最大值时默认为INT最大值
+- 修复宽高不等svg图片显示有毛边
 - 部分静态webp图片有delay属性导致识别成动图,改用getFrameCount识别
 - 修复加载错误图后未去请求排队队列中的请求
 - 子线程本地Resource参数类型转换成number
 - 修改使用hilog记录日志，默认打开debug级别的日志
-- file格式图片，fd同步close
 - 解码pixelMap默认不可编辑，图形变化可编辑
 - 修改网络请求超时设置
+- 重构代码：抽取ImageKnifeDispatcher子线程requestJob相关代码到ImageKnifeLoader中，降低函数复杂度
 
-## 3.1.0-rc.2
+## 3.0.2-rc.1
-- 修复宽高不等svg图片显示有毛边
+- release打包关闭混淆
 
-## 3.1.0-rc.1
+## 3.0.2-rc.0
-- ImageKnifeAnimatorComponent新增开始、结束、暂停的回调事件
+- FileUtil.readFile接口和file格式图片同步关闭fd
-- 文件缓存数量负数和超过INT最大值时默认为INT最大值
-
-## 3.1.0-rc.0
-- ComponentV2装饰器适配
-- imageKnifeOption={...}用法改为new ImageKnifeOption({...})
-- animatorOption={...}用法改为new AnimatorOption({...})
 
 ## 3.0.1
 - 修复animatorOption属性设置初始化值失效

OAT.xml

@@ -1,21 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2021 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.
-
-    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README.
-
--->
 <configuration>
 <oatconfig>
     <filefilterlist>

README.OpenSource

@@ -2,9 +2,9 @@
     {
         "Name": "glide",
         "License": "Apache License 2.0",
-        "License File": "LICENSE",
+        "License File": "https://github.com/bumptech/glide/blob/master/LICENSE",
         "Version Number": "4.13.1",
-        "Owner" : "xiafeng@huawei.com",
+        "Owner" : "bumptech",
         "Upstream URL": "https://github.com/bumptech/glide",
         "Description": "An image loading and caching library  focused on smooth scrolling"
     },
@@ -12,9 +12,9 @@
   {
         "Name": "glide-transformations",
         "License": "Apache License 2.0",
-        "License File": "LICENSE",
+        "License File": "https://github.com/wasabeef/glide-transformations/blob/main/LICENSE",
         "Version Number": "4.3.0",
-        "Owner" : "xiafeng@huawei.com",
+        "Owner" : "wasabeef",
         "Upstream URL": "https://github.com/wasabeef/glide-transformations",
         "Description": "  An  transformation library providing a variety of image transformations for Glide. "
     },
@@ -22,9 +22,9 @@
   {
         "Name": "fresco",
         "License": "MIT License",
-        "License File": "LICENSE",
+        "License File": "https://github.com/facebook/fresco/blob/main/LICENSE",
         "Version Number": "2.6.0",
-        "Owner" : "xiafeng@huawei.com",
+        "Owner" : "facebook",
         "Upstream URL": "https://github.com/facebook/fresco",
         "Description": " An  library for managing images and the memory they use. "
     },
@@ -32,9 +32,9 @@
   {
         "Name": "UPNG.js",
         "License": "MIT License",
-        "License File": "LICENSE",
+        "License File": "https://github.com/photopea/UPNG.js/blob/master/LICENSE",
         "Version Number": "1.0.0",
-        "Owner" : "xiafeng@huawei.com",
+        "Owner" : "photopea",
         "Upstream URL": "https://github.com/photopea/UPNG.js",
         "Description": "  Fast and advanced PNG (APNG) decoder and encoder (lossy / lossless)  "
     },
@@ -42,9 +42,9 @@
   {
         "Name": "Luban",
         "License": "Apache License 2.0",
-        "License File": "LICENSE",
+        "License File": "https://github.com/Curzibn/Luban/blob/master/LICENSE",
         "Version Number": "1.1.8",
-        "Owner" : " xiafeng@huawei.com",
+        "Owner" : " Curzibn",
         "Upstream URL": "https://github.com/Curzibn/Luban",
         "Description": " Luban(鲁班)—Image compression with efficiency very close to WeChat Moments/可能是最接近微信朋友圈的图片压缩算法  "
     },
@@ -54,16 +54,16 @@
         "License": "Apache License 2.0",
         "License File": "https://github.com/Yalantis/uCrop/blob/develop/README.md",
         "Version Number": "2.2.8",
-        "Owner" : " xiafeng@huawei.com",
+        "Owner" : " Yalantis",
         "Upstream URL": "https://github.com/Yalantis/uCrop",
         "Description": " Image Cropping Library "
     },
     {
         "Name": "js-spark-md5",
         "License": "MIT",
-        "License File": "LICENSE",
+        "License File": "https://github.com/satazor/js-spark-md5/blob/master/LICENSE",
         "Version Number": "v3.0.2",
-        "Owner" : "xiafeng@huawei.com",
+        "Owner" : "satazor",
         "Upstream URL": "https://github.com/satazor/js-spark-md5",
         "Description": "Lightning fast normal and incremental md5 for javascript"
     }

README.md

@@ -264,17 +264,6 @@ ImageKnifeAnimatorComponent({
         }),animatorOption:this.animatorOption
       }).width(300).height(300).backgroundColor(Color.Orange).margin({top:30})
 ```
-#### 11.图片降采样 示例
-```
-ImageKnifeComponent({
-        imageKnifeOption:new ImageKnifeOption({
-          loadSrc:$r("app.media.pngSample"),
-          placeholderSrc:$r('app.media.loading'),
-          errorholderSrc:$r('app.media.failed'),
-          downsampleOf: DownsampleStrategy.NONE
-        }),animatorOption:this.animatorOption
-      }).width(300).height(300)
-```
 #### Reuse Scenario
 Clear the component content in the **aboutToRecycle** lifecycle and trigger image loading through watch observeration.
 ## Available APIs
@@ -319,17 +308,7 @@ Clear the component content in the **aboutToRecycle** lifecycle and trigger imag
 | drawingColorFilter    | ColorFilter                                           | Drawing color filter. Optional.            |
 | onComplete            | (event:EventImage \| undefined)=>void              | Callback for image loading completion. Optional. |
 | onLoadListener        | onLoadStart:()=>void,onLoadSuccess:(data:string\|Pixelmap)=>void                       | Callback for image loading events. Optional. |
-| downsampleOf          | DownsampleStrategy                                    | 降采样(可选)                  |
+
-### 降采样类型
-| 类型                  | 相关描述              |
-|---------------------|-------------------|
-| NONE                | 不进行降采样            |
-| AT_MOST             | 请求尺寸大于实际尺寸不进行放大   |
-| FIT_CENTER_MEMORY          | 两边自适应内存优先             |
-| FIT_CENTER_QUALITY          | 两边自适应质量优先             |
-| CENTER_OUTSIDE_MEMORY       | 宽高缩放比最大的比例，进行缩放适配内存优先 |
-| CENTER_OUTSIDE_QUALITY       | 宽高缩放比最大的比例，进行缩放适配质量优先 |
-| AT_LEAST      | 根据宽高的最小的比例，进行适配   |
 ### ImageKnife
 
 | Parameter         | Type                                                    | Description                  |

README_zh.md

@@ -287,44 +287,47 @@ ImageKnifeAnimatorComponent({
 
 ### ImageKnifeOption参数列表
 
-| 参数名称                  | 入参内容                                                  | 功能简介            |
+| 参数名称                  | 入参内容                                                                                                                                  | 功能简介          |
-|-----------------------|-------------------------------------------------------|-----------------|
+|-----------------------|---------------------------------------------------------------------------------------------------------------------------------------|---------------|
-| loadSrc               | string、PixelMap、Resource                              | 主图展示            |
+| loadSrc               | string、PixelMap、Resource                                                                                                              | 主图展示          |
-| placeholderSrc        | PixelMap、Resource                                     | 占位图图展示（可选）      |
+| placeholderSrc        | PixelMap、Resource                                                                                                                     | 占位图图展示（可选）    |
-| errorholderSrc        | PixelMap、Resource                                     | 错误图展示（可选）       |
+| errorholderSrc        | PixelMap、Resource                                                                                                                     | 错误图展示（可选）     |
-| objectFit             | ImageFit                                              | 主图填充效果（可选）      |
+| objectFit             | ImageFit                                                                                                                              | 主图填充效果（可选）    |
-| placeholderObjectFit  | ImageFit                                              | 占位图填充效果（可选）     |
+| placeholderObjectFit  | ImageFit                                                                                                                              | 占位图填充效果（可选）   |
-| errorholderObjectFit  | ImageFit                                              | 错误图填充效果（可选）     |
+| errorholderObjectFit  | ImageFit                                                                                                                              | 错误图填充效果（可选）   |
-| writeCacheStrategy    | CacheStrategyType                                     | 写入缓存策略(可选)      |
+| writeCacheStrategy    | CacheStrategyType                                                                                                                     | 写入缓存策略(可选)    |
-| onlyRetrieveFromCache | boolean                                               | 是否跳过网络和本地请求（可选） |
+| onlyRetrieveFromCache | boolean                                                                                                                               | 是否跳过网络和本地请求（可选） |
-| customGetImage        | (context: Context, src: string                        | 自定义下载图片（可选）     |                                                                                                                                                                              | Resource                                      | 错误占位图数据源                    |
+| customGetImage        | customGetImage?:(context: Context, src: string、PixelMap、Resource ,headers?: Record<string, Object>) => Promise<ArrayBuffer、undefined> | 自定义下载图片（可选）    |                                                                                                                                                                              | Resource                                      | 错误占位图数据源                    |
-| border                | BorderOptions                                         | 边框圆角（可选）        |
+| border                | BorderOptions                                                                                                                         | 边框圆角（可选）      |
-| priority              | taskpool.Priority                                     | 加载优先级（可选）       | 
+| priority              | taskpool.Priority                                                                                                                     | 加载优先级（可选）     | 
-| context               | common.UIAbilityContext                               | 上下文（可选）         |
+| context               | common.UIAbilityContext                                                                                                               | 上下文（可选）       |
-| progressListener      | (progress: number)=>void                              | 进度（可选）          |
+| progressListener      | (progress: number)=>void                                                                                                              | 进度（可选）        |
-| signature             | String                                                | 自定义缓存关键字（可选）    | 
+| signature             | String                                                                                                                                | 自定义缓存关键字（可选）  | 
-| headerOption          | Array<HeaderOptions>                                  | 设置请求头（可选）       |
+| headerOption          | Array<HeaderOptions>                                                                                                                  | 设置请求头（可选）     |
-| transformation        | PixelMapTransformation                                | 图片变换（可选）        |
+| transformation        | PixelMapTransformation                                                                                                                | 图片变换（可选）      |
-| drawingColorFilter    | ColorFilter | drawing.ColorFilter                     | 图片变换（可选）        |
+| drawingColorFilter    | ColorFilter                                                                                                                           | drawing.ColorFilter                  | 图片变换（可选）        |
-| onComplete            | (event:EventImage | undefined) => voi                 | 颜色滤镜效果（可选）        |
+| onComplete            | (event:EventImage                                                                                                                     | undefined) => voi              | 颜色滤镜效果（可选）        |
-| onLoadListener        | onLoadStart: () => void、onLoadSuccess: (data: string | PixelMap | undefined) => void、onLoadFailed: (err: string) => void| 监听图片加载成功与失败     |
+| onLoadListener        | onLoadStart: () => void，onLoadSuccess: (data: string、PixelMap、undefined) => void，onLoadFailed: (err: string) => void                  | 监听图片加载成功与失败     |
 
 ### ImageKnife接口
 
-| 参数名称             | 入参内容                                                                                                  | 功能简介          |
+| 参数名称              | 入参内容                                                                                                  | 功能简介             |
-|------------------|-------------------------------------------------------------------------------------------------------|---------------|
+|-------------------|-------------------------------------------------------------------------------------------------------|------------------|
-| initMemoryCache  | newMemoryCache: IMemoryCache                                                                          | 自定义内存缓存策略     |
+| initMemoryCache   | newMemoryCache: IMemoryCache                                                                          | 自定义内存缓存策略        |
-| initFileCache    | context: Context, size: number, memory: number                                                        | 初始化文件缓存数量和大小  |
+| initFileCache     | context: Context, size: number, memory: number                                                        | 初始化文件缓存数量和大小     |
-| preLoadCache     | loadSrc: string I ImageKnifeOption                                                                    | 预加载并返回文件缓存路径  |
+| reload            | request: ImageKnifeRequest                                                                            | 图片重新加载           |
-| getCacheImage    | loadSrc: string, cacheType: CacheStrategy = CacheStrategy.Default, signature?: string)                | 从内存或文件缓存中获取资源 |
+| preLoad           | loadSrc: string I ImageKnifeOption                                                                    | 预加载返回图片请求request |
-| addHeader        | key: string, value: Object                                                                            | 全局添加http请求头   |
+| cancel            | request: ImageKnifeRequest                                                                    | 取消图片请求           |
-| setHeaderOptions | Array<HeaderOptions>                                                                                  | 全局设置http请求头   |
+| preLoadCache      | loadSrc: string I ImageKnifeOption                                                                            | 预加载并返回文件缓存路径     |
-| deleteHeader     | key: string                                                                                           | 全局删除http请求头   |
+| getCacheImage     | loadSrc: string, cacheType: CacheStrategy = CacheStrategy.Default, signature?: string)                | 从内存或文件缓存中获取资源    |
-| setCustomGetImage | customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>   | 全局设置自定义下载 |
+| addHeader         | key: string, value: Object                                                                            | 全局添加http请求头      |
-| setEngineKeyImpl | IEngineKey                                                                                            | 全局配置缓存key生成策略 |
+| setHeaderOptions  | Array<HeaderOptions>                                                                                  | 全局设置http请求头      |
-| putCacheImage    | url: string, pixelMap: PixelMap, cacheType: CacheStrategy = CacheStrategy.Default, signature?: string | 写入内存磁盘缓存      |
+| deleteHeader      | key: string                                                                                           | 全局删除http请求头      |
-| removeMemoryCache| url: string | ImageKnifeOption                                                                       | 清理指定内存缓存      |
+| setCustomGetImage | customGetImage?: (context: Context, src: string、PixelMap、Resource ,headers?: Record<string, Object>) => Promise<ArrayBuffer、undefined>                                                      | PixelMap         | Resource) => Promise<ArrayBuffer | undefined>   | 全局设置自定义下载 |
-| removeFileCache  | url: string | ImageKnifeOption                                                                                           | 清理指定磁盘缓存      |
+| setEngineKeyImpl  | IEngineKey                                                                                            | 全局配置缓存key生成策略    |
+| putCacheImage     | url: string, pixelMap: PixelMap, cacheType: CacheStrategy = CacheStrategy.Default, signature?: string | 写入内存磁盘缓存         |
+| removeMemoryCache | url: string                                                                                           | ImageKnifeOption | 清理指定内存缓存      |
+| removeFileCache   | url: string                                                                                           | ImageKnifeOption | 清理指定磁盘缓存      |
 ### 图形变换类型（需要为GPUImage添加依赖项）
 
 | 类型                               | 相关描述                      |

build-profile.json5

@@ -7,8 +7,9 @@
       {
         "name": "default",
         "signingConfig": "default",
-        "compileSdkVersion": 12,
+        "compileSdkVersion": "5.0.0(12)",
-        "compatibleSdkVersion": 12
+        "compatibleSdkVersion": "5.0.0(12)",
+        "runtimeOS": "HarmonyOS",
       }
     ],
     "buildModeSet": [
@@ -37,10 +38,6 @@
       "name": "library",
       "srcPath": "./library"
     },
-    {
-      "name": "gpu_transform",
-      "srcPath": "./gpu_transform"
-    },
     {
       "name": "sharedlibrary",
       "srcPath": "./sharedlibrary",

entry/src/main/ets/common/CustomEngineKeyImpl.ets

@@ -12,7 +12,6 @@
  * 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
@@ -36,9 +35,6 @@ 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
   }

entry/src/main/ets/entryability/EntryAbility.ets

@@ -17,7 +17,7 @@ import hilog from '@ohos.hilog';
 import UIAbility from '@ohos.app.ability.UIAbility';
 import Want from '@ohos.app.ability.Want';
 import window from '@ohos.window';
-import { ImageKnife, InitImageKnife, LogUtil } from '@ohos/libraryimageknife';
+import { ImageKnife, InitImageKnife } from '@ohos/libraryimageknife';
 import { CustomEngineKeyImpl } from '../common/CustomEngineKeyImpl';
 import abilityAccessCtrl, { Permissions } from '@ohos.abilityAccessCtrl';
 import { BusinessError } from '@ohos.base'

entry/src/main/ets/pages/DownSamplePage.ets

@@ -1,214 +0,0 @@
-/*
- * 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 { DownsampleStrategy, ImageKnifeOption, } from '@ohos/imageknife';
-import { ImageKnifeComponent } from '@ohos/libraryimageknife';
-import { image } from '@kit.ImageKit';
-import { BusinessError } from '@kit.BasicServicesKit';
-import { Downsampler } from '@ohos/imageknife/src/main/ets/downsampling/Downsampler';
-import { FileTypeUtil } from '@ohos/imageknife/src/main/ets/utils/FileTypeUtil';
-
-@Entry
-@ComponentV2
-struct DownSamplePage {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
-    loadSrc: $r('app.media.startIcon'),
-    placeholderSrc: $r("app.media.loading"),
-    errorholderSrc: $r("app.media.app_icon"),
-    objectFit: ImageFit.Contain
-  })
-  isBrightness: boolean = false
-  @Local beforeSampling: number = 0
-  @Local afterSampling: number = 0
-  @Local SamplingList: SamplingType[] = [
-
-    new SamplingType(7, "AT_LEAST"),
-    new SamplingType(1, "AT_MOST"),
-
-    new SamplingType(2, "FIT_CENTER_MEMORY"),
-    new SamplingType(4, "FIT_CENTER_QUALITY"),
-    new SamplingType(5, "CENTER_OUTSIDE_MEMORY"),
-    new SamplingType(6, "CENTER_OUTSIDE_QUALITY"),
-    new SamplingType(0, "NONE"),
-
-  ]
-  @Local checked: boolean = false
-
-  updateImageKnifeOption(value: string) {
-    if (value === 'NONE') {
-      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.NONE
-      })
-      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.pngSample'),
-        placeholderSrc: $r("app.media.loading"),
-        errorholderSrc: $r("app.media.app_icon"),
-        objectFit: ImageFit.Contain,
-        downsampleOf: DownsampleStrategy.AT_MOST
-      })
-      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'),
-        placeholderSrc: $r("app.media.loading"),
-        errorholderSrc: $r("app.media.app_icon"),
-        objectFit: ImageFit.Contain,
-        downsampleOf: DownsampleStrategy.FIT_CENTER_MEMORY
-      })
-      this.originalPixMap($r('app.media.pngSample'))
-      this.afterSamplingFunc($r('app.media.pngSample'))
-    } 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_OUTSIDE_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.CENTER_OUTSIDE_MEMORY
-      })
-      this.originalPixMap($r('app.media.pngSample'))
-      this.afterSamplingFunc($r('app.media.pngSample'))
-    } else if (value === 'CENTER_OUTSIDE_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.CENTER_OUTSIDE_QUALITY
-      })
-      this.originalPixMap($r('app.media.pngSample'))
-      this.afterSamplingFunc($r('app.media.pngSample'))
-    } else {
-      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.AT_LEAST
-      })
-      this.originalPixMap($r('app.media.pngSample'))
-      this.afterSamplingFunc($r('app.media.pngSample'))
-    }
-  }
-
-  async afterSamplingFunc(imgs: Resource) {
-    let img: Uint8Array = await getContext(this).resourceManager.getMediaContent(imgs);
-    let imageSource: image.ImageSource = image.createImageSource(img.buffer.slice(0));
-    let fileTypeUtil = new FileTypeUtil();
-    let typeValue = fileTypeUtil.getFileType(img.buffer.slice(0)) as string;
-    let decodingOptions: image.DecodingOptions = {
-      editable: true,
-      desiredPixelFormat: 3,
-    }
-    let imageInfo = await imageSource.getImageInfo()
-
-    if (this.imageKnifeOption.downsampleOf !== DownsampleStrategy.NONE){
-      let reqSize =
-        new Downsampler().calculateScaling(typeValue, imageInfo.size.width, imageInfo.size.height, 300,
-          300, this.imageKnifeOption.downsampleOf)
-      decodingOptions = {
-        editable: true,
-        desiredSize: {
-          width: reqSize.width,
-          height: reqSize.height
-        }
-      }
-    }
-
-    // 创建pixelMap
-    imageSource.createPixelMap(decodingOptions).then((pixelMap: image.PixelMap) => {
-      this.afterSampling = pixelMap.getPixelBytesNumber()
-    }).catch((err: BusinessError) => {
-      console.error("Failed to create PixelMap")
-    });
-  }
-
-  async originalPixMap(imgs: Resource,) {
-    let img: Uint8Array = await getContext(this).resourceManager.getMediaContent(imgs);
-    let imageSource: image.ImageSource = image.createImageSource(img.buffer.slice(0));
-    let decodingOptions: image.DecodingOptions = {
-      editable: true,
-      desiredPixelFormat: 3,
-    }
-    // 创建pixelMap
-    imageSource.createPixelMap(decodingOptions).then((pixelMap: image.PixelMap) => {
-      this.beforeSampling = pixelMap.getPixelBytesNumber()
-    }).catch((err: BusinessError) => {
-      console.error("Failed to create PixelMap")
-    });
-  }
-  getResourceString(res:Resource){
-    return getContext().resourceManager.getStringSync(res.id)
-  }
-  build() {
-    Scroll() {
-      Column() {
-        ForEach(this.SamplingList, (item: SamplingType, index) => {
-          Flex({ justifyContent: FlexAlign.Center, alignItems: ItemAlign.Center }) {
-            Radio({ value: item.value + 'radio', group: 'radioGroup' })
-              .height(50)
-              .width(50)
-              .checked(this.checked)
-              .onClick(() => {
-                this.updateImageKnifeOption(item.value)
-              })
-            Text(this.getResourceString($r('app.string.Sampling_pecification'))+ item.value).fontSize(20)
-          }
-        }, (item: SamplingType) => JSON.stringify(item))
-        Column() {
-          Text(`${this.getResourceString($r('app.string.Unreal_samples'))}：${this.beforeSampling}`).fontSize(20)
-          Text(`${ this.getResourceString($r('app.string.After_the_sampling'))}：${this.afterSampling}`).fontSize(20)
-        }
-
-        ImageKnifeComponent({
-          imageKnifeOption: this.imageKnifeOption
-        })
-          .height(300)
-          .width(300)
-          .borderWidth(1)
-          .borderColor(Color.Pink)
-      }
-
-    }
-    .height('100%')
-    .width('100%')
-  }
-}
-
-class SamplingType {
-  key: number
-  value: string
-
-  constructor(key: number, value: string) {
-    this.key = key
-    this.value = value
-  }
-}

entry/src/main/ets/pages/ImageAnimatorPage.ets

@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { AnimatorOption, ImageKnifeAnimatorComponent,ImageKnifeOption } from "@ohos/libraryimageknife"
+import { AnimatorOption, ImageKnifeAnimatorComponent } from "@ohos/libraryimageknife"
 
 @Entry
-@ComponentV2
+@Component
 struct ImageAnimatorPage {
-  @Local animatorOption: AnimatorOption = new AnimatorOption({
+  @State animatorOption: AnimatorOption = {
     state: AnimationStatus.Running,
-    iterations: -1,
+    iterations: 1,
     onFinish:()=>{
       console.log("ImageKnifeAnimatorComponent animatorOption onFinish")
     },
@@ -35,14 +35,14 @@ struct ImageAnimatorPage {
     onRepeat:()=>{
       console.log("ImageKnifeAnimatorComponent animatorOption onRepeat")
     }
-  })
+  }
-  @Local animatorOption1: AnimatorOption = new AnimatorOption({
+  @State animatorOption1: AnimatorOption = {
     state: AnimationStatus.Initial
-  })
+  }
-  @Local animatorOption2: AnimatorOption = new AnimatorOption({
+  @State animatorOption2: AnimatorOption = {
     state: AnimationStatus.Initial,
     reverse: true
-  })
+  }
   build() {
     Column(){
       Flex(){
@@ -66,27 +66,27 @@ struct ImageAnimatorPage {
         })
       }
       ImageKnifeAnimatorComponent({
-        imageKnifeOption:new ImageKnifeOption({
+        imageKnifeOption:{
           loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed')
-        }),animatorOption:this.animatorOption
+        },animatorOption:this.animatorOption
-      }).width(200).height(200).backgroundColor(Color.Orange).margin({top:30})
+      }).width(300).height(300).backgroundColor(Color.Orange).margin({top:30})
       Text($r('app.string.Display_the_first_frame')).fontSize(20)
       ImageKnifeAnimatorComponent({
-        imageKnifeOption:new ImageKnifeOption({
+        imageKnifeOption:{
           loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed')
-        }),animatorOption:this.animatorOption1
+        },animatorOption:this.animatorOption1
       }).width(200).height(200).backgroundColor(Color.Orange).margin({top:30})
       Text($r('app.string.Display_the_last_frame')).fontSize(20)
       ImageKnifeAnimatorComponent({
-        imageKnifeOption:new ImageKnifeOption({
+        imageKnifeOption:{
           loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed')
-        }),animatorOption:this.animatorOption2
+        },animatorOption:this.animatorOption2
       }).width(200).height(200).backgroundColor(Color.Orange).margin({top:30})
     }.width("100%").height("100%")
   }

entry/src/main/ets/pages/ImageKnifeReload.ets

@@ -0,0 +1,82 @@
+/*
+ * 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 { connection } from '@kit.NetworkKit'
+import { List } from '@kit.ArkTS'
+import { ImageKnifeRequest,ImageKnife,ImageKnifeComponent } from '@ohos/libraryimageknife'
+
+@Entry
+@Component
+struct ImageKnifeReload {
+  aboutToAppear(): void {
+    NetWatchState.init()
+  }
+  build() {
+    Column() {
+      ImageKnifeComponent({
+        imageKnifeOption:{
+          loadSrc:"https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp",
+          placeholderSrc:$r('app.media.loading'),
+          errorholderSrc:$r('app.media.failed'),
+          onLoadListener:{
+            onLoadFailed(err,request){
+              NetWatchState.requestList.add(request)
+            }
+          }
+        }
+      }).width(200).height(200)
+      ImageKnifeComponent({
+        imageKnifeOption:{
+          loadSrc:"https://img-blog.csdn.net/20140514114029140",
+          placeholderSrc:$r('app.media.loading'),
+          errorholderSrc:$r('app.media.failed'),
+          onLoadListener:{
+            onLoadFailed(err,request){
+              NetWatchState.requestList.add(request)
+            }
+          }
+        }
+      }).width(200).height(200).margin({top:10})
+    }.width("100%")
+    .height("100%")
+  }
+}
+
+class NetWatchState {
+  public static netConnection: connection.NetConnection | undefined = undefined
+  public static requestList: List<ImageKnifeRequest> = new List()
+
+  static init() {
+    NetWatchState.netConnection = connection.createNetConnection()
+    // 注册订阅事件
+    NetWatchState.netConnection.register(()=>{
+    })
+    // 订阅网络能力变化事件。调用register后，才能接收到此事件通知
+    NetWatchState.netConnection.on("netCapabilitiesChange",(data:connection.NetCapabilityInfo)=>{
+      if(NetWatchState.requestList.length > 0 && data.netHandle.netId >= 100) {
+        NetWatchState.requestList.forEach((request)=>{
+          ImageKnife.getInstance().reload(request)
+          NetWatchState.requestList.remove(request)
+        })
+      }
+    })
+  }
+
+  static cancel(){
+    if(NetWatchState.netConnection != undefined) {
+      // 取消订阅
+      NetWatchState.netConnection.unregister(()=>{})
+    }
+  }
+}

entry/src/main/ets/pages/ImageTransformation.ets

@@ -35,17 +35,17 @@ import {
 import { collections } from '@kit.ArkTS'
 
 @Entry
-@ComponentV2
+@Component
 struct ImageTransformation {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r('app.media.pngSample'),
     placeholderSrc: $r("app.media.loading"),
     errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Contain
-  })
+  }
-  @Local isRound: boolean = false;
+  @State isRound: boolean = false;
-  @Local isContrast: boolean = false;
+  @State isContrast: boolean = false;
-  @Local isRotate: boolean = false;
+  @State isRotate: boolean = false;
   isBlur: boolean = false
   isBrightness: boolean = false
   isGrayScale: boolean = false;
@@ -412,14 +412,14 @@ struct ImageTransformation {
     if (this.isMask) {
       transformations.push(new MaskTransformation($r('app.media.mask_starfish')));
     }
-    this.imageKnifeOption = new ImageKnifeOption({
+    this.imageKnifeOption = {
       loadSrc: $r('app.media.pngSample'),
       placeholderSrc: $r("app.media.loading"),
       errorholderSrc: $r("app.media.app_icon"),
       objectFit: ImageFit.Contain,
       border: { radius: this.isRound ? { topLeft: 50, bottomRight: 50 } : 0 },
       transformation: transformations.length > 0 ? new MultiTransTransformation(transformations) : undefined
-    })
+    }
     if (this.isCropCircle) {
       this.imageKnifeOption.objectFit = ImageFit.Cover;
       this.imageKnifeOption.border = { radius: 150 };

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

@@ -15,153 +15,161 @@
 import router from '@system.router';
 
 @Entry
-@ComponentV2
+@Component
 struct Index {
-  getResourceString(res: Resource) {
+
+  getResourceString(res:Resource){
     return getContext().resourceManager.getStringSync(res.id)
   }
 
+
   aboutToAppear(): void {
 
   }
 
   build() {
-    Scroll() {
+    Scroll(){
       Column() {
-        Button($r('app.string.Test_ImageAnimator')).onClick(() => {
+        Button($r('app.string.Test_ImageAnimator')).onClick(()=>{
           router.push({
             uri: 'pages/ImageAnimatorPage',
           });
         })
-        Button($r('app.string.Test_multiple_images')).margin({ top: 10 }).onClick(() => {
+        Button($r('app.string.Network_reload')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/ImageKnifeReload',
+          });
+        })
+        Button($r('app.string.preloading_prefetch')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/PrefetchAndCacheCount',
+          });
+        })
+        Button($r('app.string.Test_multiple_images')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestCommonImage',
           });
         })
-        Button(this.getResourceString($r('app.string.Multiple_images')) + " + reuse + LazyForeach")
+        Button($r('app.string.Test_Task_error')).margin({top:10}).onClick(()=>{
-          .margin({ top: 10 })
+          router.push({
-          .onClick(() => {
+            uri: 'pages/TestTaskResourcePage',
-            router.push({
+          });
-              uri: 'pages/UserPage',
+        })
+        Button($r('app.string.Test_HSP')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestHspPreLoadImage',
 
-            });
+          });
-          })
+        })
-        Button($r('app.string.Test_SingleImage')).margin({ top: 10 }).onClick(() => {
+        Button($r('app.string.Test_SingleImage')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/SingleImage',
 
           });
         })
-        Button($r('app.string.Image_Downsampling_Functionality')).margin({top:10}).onClick(()=>{
+        Button($r('app.string.Test_custom_download')).margin({top:10}).onClick(()=>{
           router.push({
-            uri: 'pages/DownSamplePage',
+            uri: 'pages/TestSetCustomImagePage',
+
           });
         })
-        Button($r('app.string.Display_long_image')).margin({ top: 10 }).onClick(() => {
+        // Button(this.getResourceString($r('app.string.Multiple_images')) + " + LazyForEach").margin({top:10}).onClick(()=>{
+        //   router.push({
+        //     uri: 'pages/ManyPhotoShowPage',
+        //
+        //   });
+        // })
+        Button(this.getResourceString($r('app.string.Multiple_images')) + " + reuse + LazyForeach").margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/UserPage',
+
+          });
+        })
+        Button($r('app.string.Display_long_image')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/LongImagePage',
 
           });
         })
-        Button($r('app.string.Image_Transformation')).margin({ top: 10 }).onClick(() => {
+        Button($r('app.string.Image_scaling')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TransformPage',
+
+          });
+        })
+        Button(this.getResourceString($r('app.string.Message_list')) + " + List").margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestImageFlash',
+
+          });
+        })
+        Button($r('app.string.Custom_cache_key')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/SignatureTestPage',
+
+          });
+        })
+        Button($r('app.string.Preloading_images_to_cache')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestPrefetchToFileCache',
+
+          });
+        })
+        Button($r('app.string.Retrieve_image_display_from_cache')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestIsUrlExist',
+
+          });
+        })
+        Button($r('app.string.Test_single_request_header')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestHeader',
+
+          });
+        })
+        Button($r('app.string.Test_write_cache_strategy')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/TestWriteCacheStage',
+
+          });
+        })
+        Button($r('app.string.Image_Transformation')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/ImageTransformation',
 
           });
 
         })
-        Button($r('app.string.Test_media_URL')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/dataShareUriLoadPage',
 
-          });
+        Button($r('app.string.Different_ObjectFit')).margin({top:10}).onClick(()=>{
-        })
-        Button($r('app.string.Different_ObjectFit')).margin({ top: 10 }).onClick(() => {
           router.push({
             uri: 'pages/ObjectFitPage',
 
           });
 
         })
-        Button($r('app.string.Custom_cache_key')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/SignatureTestPage',
 
-          });
+        Button($r('app.string.Test_image_loading_success_or_failure_events')).margin({top:10}).onClick(()=>{
-        })
-        Button($r('app.string.Test_image_loading_success_or_failure_events')).margin({ top: 10 }).onClick(() => {
           router.push({
             uri: 'pages/LoadStatePage',
           })
         })
-        Button($r('app.string.Image_scaling')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TransformPage',
 
-          });
+        Button($r('app.string.Test_removing_image_cache_interface')).margin({top:10}).onClick(()=>{
-        })
-
-        Button($r('app.string.Test_HSP')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestHspPreLoadImage',
-
-          });
-        })
-
-        Button($r('app.string.Test_custom_download')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestSetCustomImagePage',
-
-          });
-        })
-
-        Button(this.getResourceString($r('app.string.Message_list')) + " + List").margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestImageFlash',
-
-          });
-        })
-
-        Button($r('app.string.Preloading_images_to_cache')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestPrefetchToFileCache',
-
-          });
-        })
-        Button($r('app.string.Retrieve_image_display_from_cache')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestIsUrlExist',
-
-          });
-        })
-        Button($r('app.string.Test_single_request_header')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestHeader',
-
-          });
-        })
-        Button($r('app.string.Test_write_cache_strategy')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestWriteCacheStage',
-
-          });
-        })
-
-
-        Button($r('app.string.Test_removing_image_cache_interface')).margin({ top: 10 }).onClick(() => {
           router.push({
             uri: 'pages/TestRemoveCache',
           });
         })
-        Button($r('app.string.Test_error_image_display')).margin({ top: 10 }).onClick(() => {
+        Button($r('app.string.Test_error_image_display')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestErrorHolderPage',
 
           });
         })
-        Button($r('app.string.Test_Task_error')).margin({ top: 10 }).onClick(() => {
+        Button($r('app.string.Test_media_URL')).margin({top:10}).onClick(()=>{
           router.push({
-            uri: 'pages/TestTaskResourcePage',
+            uri: 'pages/dataShareUriLoadPage',
+
           });
         })
         Button($r('app.string.test_cache_btn')).margin({ top: 10 }).onClick(() => {
@@ -180,7 +188,7 @@ struct Index {
           });
         })
       }
-    }.width('100%')
+    } .width('100%')
     .height('100%')
   }
 }

entry/src/main/ets/pages/LazyForEachCache.ets

@@ -0,0 +1,51 @@
+/*
+ * 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, ImageKnifeOption } from '@ohos/libraryimageknife';
+import { CommonDataSource } from './model/CommonDataSource';
+
+@Entry
+@Component
+export struct LazyForEachCache {
+  @State hotCommendList:CommonDataSource<InfoItem> = new CommonDataSource<InfoItem>([])
+  aboutToAppear(): void {
+    this.hotCommendList.addData(this.hotCommendList.totalCount(),PageViewModel.getItems())
+  }
+  build() {
+    Column() {
+      List({ space: 16 }) {
+        LazyForEach(this.hotCommendList, (item: InfoItem,index) => {
+          ListItem() {
+            Column({ space: 12 }) {
+              ImageKnifeComponent({
+                imageKnifeOption:{
+                  loadSrc: item.albumUrl,
+                  placeholderSrc:$r('app.media.loading')
+                }
+              }).width(100).height(100)
+              Text(`${index}`)
+            }.border({ width: 5 , color: "#000000"})
+          }
+        })
+      }
+      .cachedCount(5)
+      .width("100%")
+      .height("100%")
+      .margin({ left: 10, right: 10 })
+      .layoutWeight(1)
+    }
+  }
+}

entry/src/main/ets/pages/LazyForEachCount.ets

@@ -0,0 +1,51 @@
+/*
+ * 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, ImageKnifeOption } from '@ohos/libraryimageknife';
+import { CommonDataSource } from './model/CommonDataSource';
+
+@Entry
+@Component
+export struct LazyForEachCount {
+  @State hotCommendList:CommonDataSource<InfoItem> = new CommonDataSource<InfoItem>([])
+  aboutToAppear(): void {
+    this.hotCommendList.addData(this.hotCommendList.totalCount(),PageViewModel.getItems())
+  }
+  build() {
+    Column() {
+      List({ space: 16 }) {
+        LazyForEach(this.hotCommendList, (item: InfoItem,index) => {
+          ListItem() {
+            Column({ space: 12 }) {
+              ImageKnifeComponent({
+                imageKnifeOption:{
+                  loadSrc: item.albumUrl,
+                  placeholderSrc:$r('app.media.loading')
+                }
+              }).width(100).height(100)
+              Text(`${index}`)
+            }.border({ width: 5 , color: "#000000"})
+          }
+        })
+      }
+      .cachedCount(30)
+      .width("100%")
+      .height("100%")
+      .margin({ left: 10, right: 10 })
+      .layoutWeight(1)
+    }
+  }
+}

entry/src/main/ets/pages/ListPage.ets

@@ -15,11 +15,11 @@
 import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife';
 
 @Entry
-@ComponentV2
+@Component
 struct ListPage {
 
   private data: string[] = []
-  @Local ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption({ loadSrc: $r('app.media.startIcon')})
+  @State ImageKnifeOption: ImageKnifeOption = { loadSrc: $r('app.media.startIcon')}
 
 
   aboutToAppear(): void {

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

@@ -16,12 +16,12 @@ import { ImageKnifeComponent, ImageKnifeOption } from "@ohos/libraryimageknife"
 import matrix4 from '@ohos.matrix4'
 
 @Entry
-@ComponentV2
+@Component
 struct LoadStatePage {
 
   starTime:number = new Date().getTime()
 
-  @Local ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State ImageKnifeOption: ImageKnifeOption = {
     loadSrc: $r("app.media.rabbit"),
     placeholderSrc: $r("app.media.loading"),
     errorholderSrc: $r("app.media.app_icon"),
@@ -35,14 +35,14 @@ struct LoadStatePage {
       },
     },
     border: { radius: 50 }
-  })
+  }
-  @Local imageKnifeOption1: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption1: ImageKnifeOption = {
     loadSrc: $r('app.media.startIcon')
-  })
+  }
-  @Local message: string = ""
+  @State message: string = ""
-  @Local currentWidth: number = 200
+  @State currentWidth: number = 200
-  @Local currentHeight: number = 200
+  @State currentHeight: number = 200
-  @Local typeValue: string = ""
+  @State typeValue: string = ""
   build() {
     Column() {
       Text($r('app.string.TIPS'))
@@ -50,7 +50,7 @@ struct LoadStatePage {
       Row() {
         Button($r('app.string.Test_failure_success'))
           .onClick(() => {
-            this.ImageKnifeOption = new ImageKnifeOption({
+            this.ImageKnifeOption = {
               loadSrc: "https://www.openharmony.cn/_nuxt/img/logo.dcf95b3.png",
               placeholderSrc: $r("app.media.loading"),
               errorholderSrc: $r("app.media.app_icon"),
@@ -75,7 +75,7 @@ struct LoadStatePage {
               onComplete:(event)=>{
                 console.error("Load onComplete width:"+event?.width , " height:"+event?.height , " componentWidth:"+event?.componentWidth," componentHeight:" + event?.componentHeight);
               }
-            })
+            }
           })
       }
       .margin({ top: 20 })
@@ -85,7 +85,7 @@ struct LoadStatePage {
       ImageKnifeComponent({ imageKnifeOption: this.ImageKnifeOption }).height(this.currentHeight).width(this.currentWidth)
         .margin({ top: 20 })
       Button($r('app.string.Custom_download_failed')).onClick(()=>{
-        this.imageKnifeOption1 = new ImageKnifeOption({
+        this.imageKnifeOption1 = {
           loadSrc: "abc",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
@@ -95,7 +95,7 @@ struct LoadStatePage {
               this.message = "err:" + err
             }
           }
-        })
+        }
       }).margin({ top: 20 })
       Text(this.message).fontSize(20).margin({ top: 20 })
       ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).height(this.currentHeight).width(this.currentWidth)

entry/src/main/ets/pages/LongImagePage.ets

@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife'
+import { ImageKnifeComponent } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct LongImagePage {
 
   build() {
@@ -25,13 +25,13 @@ struct LongImagePage {
 
    // Image($r("app.media.aaa")).objectFit(ImageFit.Auto).width(200)
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc:"https://wx2.sinaimg.cn/mw690/006HyQKGgy1hnqp08dw09j30u04twu0x.jpg",
           //src:$r("app.media.aaa"),
           placeholderSrc: $r("app.media.loading"),
           errorholderSrc: $r("app.media.failed"),
           objectFit: ImageFit.Auto
-        })
+        }
       })
     }
     .height('100%') .width('100%')

entry/src/main/ets/pages/ObjectFitPage.ets

@@ -15,49 +15,49 @@
 import { ImageKnife, ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct ObjectFitPage {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r("app.media.app_icon"),
     placeholderSrc: $r("app.media.loading"),
     errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Fill
-  })
+  }
 
   build() {
     Column() {
 
       Button($r('app.string.Main_image_Fill')).onClick(()=>{
-        this.imageKnifeOption = new ImageKnifeOption({
+        this.imageKnifeOption = {
           loadSrc: $r("app.media.app_icon"),
           placeholderSrc: $r("app.media.loading"),
           errorholderSrc: $r("app.media.app_icon"),
           objectFit: ImageFit.Fill
-        })
+        }
       })
 
       Button($r('app.string.Maintain_proportion_filling')).margin({top:10}).onClick(async () => {
         ImageKnife.getInstance().removeAllMemoryCache()
         await ImageKnife.getInstance().removeAllFileCache()
 
-        this.imageKnifeOption = new ImageKnifeOption({
+        this.imageKnifeOption = {
           loadSrc: "https://wx2.sinaimg.cn/mw690/006HyQKGgy1hnqp08dw09j30u04twu0x.jpg",
           placeholderSrc: $r("app.media.app_icon"),
           errorholderSrc: $r("app.media.app_icon"),
           objectFit: ImageFit.Fill,
           placeholderObjectFit: ImageFit.Contain
-        })
+        }
       })
 
 
       Button($r('app.string.Error_graph_None')).margin({top:10}).onClick(() => {
-        this.imageKnifeOption = new ImageKnifeOption({
+        this.imageKnifeOption = {
           loadSrc: "http://xxxxx",
           placeholderSrc: $r("app.media.loading"),
           errorholderSrc: $r("app.media.app_icon"),
           objectFit: ImageFit.Fill,
           errorholderObjectFit: ImageFit.None
-        })
+        }
       })
 
       ImageKnifeComponent({

entry/src/main/ets/pages/PrefetchAndCacheCount.ets

@@ -0,0 +1,39 @@
+/*
+ * 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 { router } from '@kit.ArkUI'
+
+@Entry
+@Component
+struct PrefetchAndCacheCount {
+  build() {
+    Column() {
+      Button("cacheCount == 5")
+        .onClick(()=>{
+          router.pushUrl({url:"pages/LazyForEachCache"})
+        })
+      Button("cacheCount == 30")
+        .margin({top:10})
+        .onClick(()=>{
+          router.pushUrl({url:"pages/LazyForEachCount"})
+        })
+      Button("prefetch + preload")
+        .margin({top:10})
+        .onClick(()=>{
+          router.pushUrl({url:"pages/PrefetchAndPreload"})
+        })
+    }.width("100%")
+    .height("100%")
+  }
+}

entry/src/main/ets/pages/PrefetchAndPreload.ets

@@ -0,0 +1,56 @@
+/*
+ * 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 { BasicPrefetcher } from '@kit.ArkUI';
+import DataSourcePrefetchingImageKnife, { InfoItem } from './model/DataSourcePrefetching';
+import { PageViewModel } from './model/PageViewModel';
+import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife';
+@Entry
+@Component
+export struct PrefetchAndPreload {
+  // 创建DataSourcePrefetchingImageKnife对象，具备任务预取、取消能力的数据源
+  private readonly dataSource = new DataSourcePrefetchingImageKnife(PageViewModel.getItems());
+  // 创建BasicPrefetcher对象，默认的动态预取算法实现
+  private readonly prefetcher = new BasicPrefetcher(this.dataSource);
+
+  build() {
+    Column() {
+      List({ space: 16 }) {
+        LazyForEach(this.dataSource, (item: InfoItem,index:number) => {
+          ListItem() {
+            Column({ space: 12 }) {
+              ImageKnifeComponent({
+                imageKnifeOption:{
+                  loadSrc: item.albumUrl,
+                  placeholderSrc:$r('app.media.loading')
+                }
+              }).width(100).height(100)
+              Text(`${index}`)
+            }.border({ width: 5 , color: "#000000"})
+          }
+          .reuseId('imageKnife')
+        })
+      }
+      .cachedCount(5)
+      .onScrollIndex((start: number, end: number) => {
+        // 列表滚动触发visibleAreaChanged，实时更新预取范围，触发调用prefetch、cancel接口
+        this.prefetcher.visibleAreaChanged(start, end)
+      })
+      .width("100%")
+      .height("100%")
+      .margin({ left: 10, right: 10 })
+      .layoutWeight(1)
+    }
+  }
+}

entry/src/main/ets/pages/SignatureTestPage.ets

@@ -16,18 +16,18 @@ import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife';
 
 
 @Entry
-@ComponentV2
+@Component
 struct SignatureTestPage {
-  @Local imageKnifeOption1: ImageKnifeOption =new ImageKnifeOption(
+  @State imageKnifeOption1: ImageKnifeOption =
     {
       loadSrc: $r('app.media.icon'),
       placeholderSrc:$r("app.media.loading"),
-    });
+    };
-  @Local imageKnifeOption2: ImageKnifeOption =new ImageKnifeOption(
+  @State imageKnifeOption2: ImageKnifeOption =
     {
       loadSrc: $r('app.media.icon'),
       placeholderSrc:$r("app.media.loading"),
-    });
+    };
 
   build() {
     Scroll() {
@@ -37,11 +37,11 @@ struct SignatureTestPage {
         Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
           Button($r('app.string.Load'))
             .onClick(() => {
-              this.imageKnifeOption1 = new ImageKnifeOption({
+              this.imageKnifeOption1 = {
                 loadSrc: 'https://img-blog.csdn.net/20140514114029140',
                 placeholderSrc:$r("app.media.loading"),
                 signature: "1"
-              })
+              }
             }).margin({ top: 5, left: 3 })
           ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).width(300).height(300)
         }.width('100%').backgroundColor(Color.Pink)
@@ -50,11 +50,11 @@ struct SignatureTestPage {
         Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
           Button($r('app.string.Load'))
             .onClick(() => {
-              this.imageKnifeOption2 = new ImageKnifeOption({
+              this.imageKnifeOption2 = {
                 loadSrc: 'https://img-blog.csdn.net/20140514114029140',
                 placeholderSrc:$r("app.media.loading"),
                 signature: new Date().getTime().toString()
-              })
+              }
             }).margin({ top: 5, left: 3 })
           ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption2 }).width(300).height(300)
         }.width('100%').backgroundColor(Color.Pink)

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

@@ -12,19 +12,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent,BlurTransformation,ImageKnifeOption } from '@ohos/libraryimageknife';
+import { ImageKnifeComponent,BlurTransformation } from '@ohos/libraryimageknife';
 import fs from '@ohos.file.fs';
 import image from '@ohos.multimedia.image';
 import { common2D, drawing } from '@kit.ArkGraphics2D';
 
 @Entry
-@ComponentV2
+@Component
 struct SingleImage {
   resource: string = "app.media.svgSample"
   scroller: Scroller = new Scroller;
   localFile: string = getContext(this).filesDir + "/icon.png"
-  @Local pixelMap:PixelMap | undefined = undefined;
+  @State pixelMap:PixelMap | undefined = undefined;
-  @Local DrawingColorFilter: ColorFilter | undefined = undefined
+  @State DrawingColorFilter: ColorFilter | undefined = undefined
   private color: common2D.Color = { alpha: 255, red: 255, green: 0, blue: 0 };
   aboutToAppear(): void {
     // 拷贝本地文件
@@ -46,12 +46,12 @@ struct SingleImage {
           .fontSize(30)
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
-          imageKnifeOption: new ImageKnifeOption({
+          imageKnifeOption: {
             loadSrc: $r("app.media.svgSample"),
             placeholderSrc: $r("app.media.loading"),
             errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain
-          })
+          }
         }).width(100).height(100)
           .onClick(()=>{
             this.DrawingColorFilter = drawing.ColorFilter.createBlendModeColorFilter(this.color, drawing.BlendMode.SRC_IN);
@@ -60,48 +60,52 @@ struct SingleImage {
           .fontSize(30)
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
-          imageKnifeOption: new ImageKnifeOption({
+          imageKnifeOption: {
             loadSrc: this.localFile,
             placeholderSrc: $r("app.media.loading"),
             errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain
-          })
+          }
         }).width(100).height(100)
         Text($r('app.string.Network_images'))
           .fontSize(30)
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
-          imageKnifeOption: new ImageKnifeOption({
+          imageKnifeOption: {
             loadSrc:"https://www.openharmony.cn/_nuxt/img/logo.dcf95b3.png",
             placeholderSrc: $r("app.media.loading"),
             errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain,
             progressListener:(progress:number)=>{console.info("ImageKnife:: call back progress = " + progress)}
-          })
+          }
         }).width(100).height(100)
         Text($r('app.string.Custom_network_download'))
           .fontSize(30)
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
-          imageKnifeOption: new ImageKnifeOption({
+          imageKnifeOption: {
             loadSrc: "https://file.atomgit.com/uploads/user/1704857786989_8994.jpeg",
             placeholderSrc: $r("app.media.loading"),
             errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain,
+            headerOption:[{
+              key:"refer",
+              value:"xx.xx.xx.xx"
+            }],
             customGetImage: custom,
             transformation: new BlurTransformation(10)
-          })
+          }
         }).width(100).height(100)
         Text($r('app.string.PixelMap_loads_images'))
           .fontSize(30)
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
-          imageKnifeOption: new ImageKnifeOption({
+          imageKnifeOption: {
             loadSrc: this.pixelMap!,
             placeholderSrc: $r("app.media.loading"),
             errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain,
-          })
+          }
         }).width(100).height(100)
       }
       .width('100%')
@@ -124,8 +128,9 @@ struct SingleImage {
 
 // 自定义下载方法
 @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)
+  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
 }

entry/src/main/ets/pages/TestCacheDataPage.ets

@@ -16,17 +16,17 @@
 import { ImageKnife, CacheStrategy, ImageKnifeComponent, ImageKnifeOption } from '@ohos/imageknife';
 
 @Entry
-@ComponentV2
+@Component
 struct TestCacheDataPage {
-  @Local cacheUpLimit: number = 0;
+  @State cacheUpLimit: number = 0;
-  @Local currentNum: number = 0;
+  @State currentNum: number = 0;
-  @Local currentSize: number = 0;
+  @State currentSize: number = 0;
-  @Local currentWidth: number = 200
+  @State currentWidth: number = 200
-  @Local currentHeight: number = 200
+  @State currentHeight: number = 200
-  @Local markersLimitText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
+  @State markersLimitText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
-  @Local markersNumText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
+  @State markersNumText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
-  @Local markersSizeText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
+  @State markersSizeText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
-  @Local ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State ImageKnifeOption: ImageKnifeOption = {
     loadSrc: "",
     objectFit: ImageFit.Contain,
     onLoadListener: {
@@ -38,7 +38,7 @@ struct TestCacheDataPage {
       },
     },
     border: { radius: 50 }
-  })
+  }
 
   aboutToAppear(): void {
     ImageKnife.getInstance().initFileCache(getContext(this), 256, 256 * 1024 * 1024, "ImageKnifeCache1")
@@ -55,21 +55,21 @@ struct TestCacheDataPage {
 
       Button($r('app.string.load_memory'))
         .onClick(() => {
-          this.ImageKnifeOption = new ImageKnifeOption({
+          this.ImageKnifeOption = {
             loadSrc: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg",
             objectFit: ImageFit.Contain,
             writeCacheStrategy: CacheStrategy.Memory,
             border: { radius: 50 },
-          })
+          }
         })
       Button($r('app.string.load_disk'))
         .onClick(() => {
-          this.ImageKnifeOption = new ImageKnifeOption({
+          this.ImageKnifeOption = {
             loadSrc: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg",
             objectFit: ImageFit.Contain,
             writeCacheStrategy: CacheStrategy.File,
             border: { radius: 50 },
-          })
+          }
         })
       Text($r('app.string.cur_cache_limit', this.markersLimitText, this.cacheUpLimit))
         .fontSize(20)

entry/src/main/ets/pages/TestChangeColorPage.ets

@@ -74,17 +74,17 @@ struct TestChangeColorPage {
 
       Text($r('app.string.master_image')).margin({ top: 20 })
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: this.src
-        })
+        }
       }).width(110).height(110)
 
       Text($r('app.string.click_img_to_change_color')).margin({ top: 30 })
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: this.src,
           drawingColorFilter: this.DrawingColorFilterFirst
-        })
+        }
       })
         .onClick(() => {
           this.DrawingColorFilterFirst =
@@ -93,18 +93,18 @@ struct TestChangeColorPage {
 
       Text($r('app.string.test_non_svg_color')).margin({ top: 30 })
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: $r('app.media.ic_test_change_color_png'),
           drawingColorFilter: drawing.ColorFilter.createBlendModeColorFilter(this.color, drawing.BlendMode.SRC_IN)
-        })
+        }
       }).width(110).height(110)
 
       Text($r('app.string.test_svg_color')).margin({ top: 30 })
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: $r("app.media.ic_test_change_color_svg"),
           drawingColorFilter: drawing.ColorFilter.createBlendModeColorFilter(this.color, drawing.BlendMode.SRC_IN)
-        })
+        }
       }).width(110).height(110)
 
     }.width('100%').height('100%')

entry/src/main/ets/pages/TestCommonImage.ets

@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent ,ImageKnifeOption} from '@ohos/libraryimageknife';
+import { ImageKnifeComponent } from '@ohos/libraryimageknife';
 
 @Entry
-@ComponentV2
+@Component
 struct TestCommonImage {
   private data: Array<string> = []
   aboutToAppear(): void {
@@ -30,13 +30,13 @@ struct TestCommonImage {
           FlowItem() {
             Column(){
               ImageKnifeComponent({
-                imageKnifeOption: new ImageKnifeOption({
+                imageKnifeOption: {
                   loadSrc: item,
                   placeholderSrc: $r("app.media.loading"),
                   errorholderSrc: $r("app.media.failed"),
                   objectFit: ImageFit.Contain,
                   signature: "aaa"
-                })
+                }
               }).width("50%").height(200)
             }
           }.height(200)

entry/src/main/ets/pages/TestErrorHolderPage.ets

@@ -12,34 +12,34 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife'
+import { ImageKnifeComponent } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestErrorHolderPage {
 
   build() {
     Column() {
       Text("ImageKnifeComponent1").fontSize(20)
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: "abc",
           errorholderSrc:$r('app.media.failed')
-        })
+        }
       }).width(200).height(200)
       Text("ImageKnifeComponent2").fontSize(20)
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: "abc",
           errorholderSrc:$r('app.media.startIcon')
-        })
+        }
       }).width(200).height(200)
       Text("ImageKnifeComponent2").fontSize(20)
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: "abc",
           errorholderSrc:$r('app.media.mask_starfish')
-        })
+        }
       }).width(200).height(200)
     }
     .height('100%') .width('100%')

entry/src/main/ets/pages/TestHeader.ets

@@ -15,9 +15,9 @@
 import { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestPrefetchToFileCachePage {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
     placeholderSrc:$r('app.media.loading'),
     headerOption:[
@@ -26,7 +26,7 @@ struct TestPrefetchToFileCachePage {
         value:"单个"
       }
     ]
-  })
+  }
 
   build() {
     Column() {

entry/src/main/ets/pages/TestHspPreLoadImage.ets

@@ -15,7 +15,7 @@
 import { IndexComponent } from "@ohos/libraryimageknife"
 
 @Entry
-@ComponentV2
+@Component
 struct TestHspPreLoadImage {
   build() {
     Column() {

entry/src/main/ets/pages/TestImageFlash.ets

@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife'
+import { ImageKnifeComponent } from '@ohos/libraryimageknife'
 
-@ObservedV2
+@Observed
 export class MsgModel {
   id: string
   cId: string
@@ -30,10 +30,10 @@ export class MsgModel {
 }
 
 
-// @Reusable
+@Reusable
-@ComponentV2
+@Component
 export struct MsgItem {
-  @Param count: number = 0
+  count: number = 0
   private data: Array<string> = [
     "http://e.hiphotos.baidu.com/image/pic/item/a1ec08fa513d2697e542494057fbb2fb4316d81e.jpg",
     "http://c.hiphotos.baidu.com/image/pic/item/30adcbef76094b36de8a2fe5a1cc7cd98d109d99.jpg",
@@ -59,37 +59,37 @@ export struct MsgItem {
   build(){
     if (this.count % 2 == 0 && this.count <6){
       ImageKnifeComponent({
-        imageKnifeOption:new ImageKnifeOption({
+        imageKnifeOption:{
           loadSrc:$r("app.media.startIcon"),
           placeholderSrc:$r("app.media.loading")
-        }),syncLoad:true
+        },syncLoad:true
       })
     }else if (this.count > 6 && this.count - 6 < this.data.length){
       ImageKnifeComponent({
-        imageKnifeOption:new ImageKnifeOption({
+        imageKnifeOption:{
           loadSrc:this.data[this.count - 6],
           placeholderSrc:$r("app.media.loading")
-        }),syncLoad:true
+        },syncLoad:true
       })
     }else {
       ImageKnifeComponent({
-        imageKnifeOption:new ImageKnifeOption({
+        imageKnifeOption:{
           loadSrc:$r("app.media.pngSample"),
           placeholderSrc:$r("app.media.loading")
-        }),syncLoad:true
+        },syncLoad:true
       })
     }
   }
 }
 
 @Entry
-@ComponentV2
+@Component
 struct ImageTestPage {
   count : number = 0
   rCount: number = 0
   scroller: Scroller = new Scroller()
-  @Local list: MsgModel[] = []
+  @State list: MsgModel[] = []
-  @Local imageSize: number =100
+  @State imageSize: number =100
   handAdd(){
     this.count++
     const msgItem = new MsgModel('add_id'+this.count, 'addBody'+this.count,'cId'+ this.count)

entry/src/main/ets/pages/TestIsUrlExist.ets

@@ -15,15 +15,15 @@
 import { ImageKnifeComponent, ImageKnife, ImageKnifeOption, CacheStrategy } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestIsUrlExist {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r('app.media.startIcon'),
     placeholderSrc: $r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
-  })
+  }
-  @Local source: PixelMap | string | Resource = $r("app.media.startIcon")
+  @State source: PixelMap | string | Resource = $r("app.media.startIcon")
-  @Local source1: PixelMap | string | Resource = $r("app.media.startIcon")
+  @State source1: PixelMap | string | Resource = $r("app.media.startIcon")
 
   build() {
     Column() {

entry/src/main/ets/pages/TestLoadCancelListenerPage.ets

@@ -15,18 +15,19 @@
 
 import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/imageknife';
 
+
 @Entry
-@ComponentV2
+@Component
 struct TestLoadCancelListenerPage {
-  @Local currentWidth: number = 200
+  @State currentWidth: number = 200
-  @Local currentHeight: number = 200
+  @State currentHeight: number = 200
-  @Local showChild: boolean = true;
+  @State showChild: boolean = true;
-  @Local text: string = "";
+  @State text: string = "";
-  @Local ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State ImageKnifeOption: ImageKnifeOption = {
     loadSrc: "",
     objectFit: ImageFit.Contain,
     border: { radius: 50 }
-  })
+  };
 
   build() {
     Column() {
@@ -34,7 +35,7 @@ struct TestLoadCancelListenerPage {
       Button($r('app.string.rm_component_of_net'))
         .margin(20)
         .onClick(() => {
-          this.ImageKnifeOption = new ImageKnifeOption({
+          this.ImageKnifeOption = {
             loadSrc: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg",
             objectFit: ImageFit.Contain,
             onLoadListener: {
@@ -47,23 +48,23 @@ struct TestLoadCancelListenerPage {
               }
             },
             border: { radius: 50 }
-          })
+          }
         })
 
       Button($r('app.string.component_display'))
         .margin(20).onClick(() => {
         this.text = "";
         this.showChild = true;
-        this.ImageKnifeOption = new ImageKnifeOption({
+        this.ImageKnifeOption = {
           loadSrc: "",
           objectFit: ImageFit.Contain,
           border: { radius: 50 }
-        })
+        }
       })
       Button($r('app.string.rm_component_of_local'))
         .margin(20)
         .onClick(() => {
-          this.ImageKnifeOption = new ImageKnifeOption({
+          this.ImageKnifeOption = {
             loadSrc: $r('app.media.loading'),
             objectFit: ImageFit.Contain,
             onLoadListener: {
@@ -76,7 +77,7 @@ struct TestLoadCancelListenerPage {
               }
             },
             border: { radius: 50 }
-          })
+          }
         })
 
       if (this.showChild) {

entry/src/main/ets/pages/TestPrefetchToFileCache.ets

@@ -15,19 +15,19 @@
 import { ImageKnifeComponent,ImageKnife,ImageKnifeOption } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestPrefetchToFileCachePage {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc:$r('app.media.startIcon'),
     placeholderSrc:$r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
-  })
+  }
   async preload(url:string) {
     let fileCachePath = await ImageKnife.getInstance().preLoadCache(url)
     console.log("preload-fileCachePath=="+ fileCachePath)
   }
   async preload1(url:string) {
-    let fileCachePath = await ImageKnife.getInstance().preLoadCache(new ImageKnifeOption({ loadSrc: url }))
+    let fileCachePath = await ImageKnife.getInstance().preLoadCache({ loadSrc: url })
     console.log("preload-fileCachePath1=="+ fileCachePath)
   }
   build() {

entry/src/main/ets/pages/TestRemoveCache.ets

@@ -15,16 +15,16 @@
 import { ImageKnifeComponent, ImageKnife, ImageKnifeOption, CacheStrategy } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestRemoveCache {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r('app.media.startIcon'),
     placeholderSrc: $r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
-  })
+  }
-  @Local source: PixelMap | string | Resource = $r("app.media.startIcon");
+  @State source: PixelMap | string | Resource = $r("app.media.startIcon");
-  @Local source1: PixelMap | string | Resource = $r("app.media.startIcon");
+  @State source1: PixelMap | string | Resource = $r("app.media.startIcon");
-  @Local url: string = '';
+  @State url: string = '';
 
   build() {
     Column() {

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

@@ -15,42 +15,40 @@
 import { ImageKnifeComponent, ImageKnife, ImageKnifeOption } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestSetCustomImagePage {
-
+  @State imageKnifeOption: ImageKnifeOption = {
-  getResourceString(res:Resource){
-    return getContext().resourceManager.getStringSync(res.id)
-  }
-
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
     loadSrc: $r('app.media.startIcon'),
     placeholderSrc: $r('app.media.loading')
-  })
+  }
   aboutToAppear(): void {
     ImageKnife.getInstance().setCustomGetImage(custom)
   }
   aboutToDisappear(): void {
     ImageKnife.getInstance().setCustomGetImage()
   }
+  getResourceString(res:Resource){
+    return getContext().resourceManager.getStringSync(res.id)
+  }
   build() {
     Column() {
       Button(this.getResourceString($r('app.string.Custom_network_download')) + " a").onClick(()=>{
-        this.imageKnifeOption = new ImageKnifeOption({
+        this.imageKnifeOption ={
           loadSrc: "aaa",
           placeholderSrc: $r('app.media.loading')
-        })
+        }
       })
       Button(this.getResourceString($r('app.string.Custom_network_download')) + " b").onClick(()=>{
-        this.imageKnifeOption = new ImageKnifeOption({
+        this.imageKnifeOption = {
           loadSrc: "bbb",
           placeholderSrc: $r('app.media.loading')
-        })
+        }
       })
       Button(this.getResourceString($r('app.string.Custom_network_download')) + " c").onClick(()=>{
-        this.imageKnifeOption = new ImageKnifeOption({
+        this.imageKnifeOption = {
           loadSrc: "ccc",
           placeholderSrc: $r('app.media.loading')
-        })
+        }
       })
       ImageKnifeComponent({
         imageKnifeOption: this.imageKnifeOption

entry/src/main/ets/pages/TestTaskResourcePage.ets

@@ -24,12 +24,12 @@ export struct ZuImage {
     if (this.src) {
       //当前版本存在bug
       ImageKnifeComponent({
-        imageKnifeOption: new ImageKnifeOption({
+        imageKnifeOption: {
           loadSrc: this.src,
           placeholderSrc: this.placeholderSrc,
           errorholderSrc: this.errorholderSrc ?? this.placeholderSrc,
           objectFit: ImageFit.Cover
-        })
+        }
       })
     } else {
       Image(this.placeholderSrc)

entry/src/main/ets/pages/TestWriteCacheStage.ets

@@ -15,55 +15,55 @@
 import { ImageKnifeComponent,CacheStrategy,ImageKnifeOption } from '@ohos/libraryimageknife'
 
 @Entry
-@ComponentV2
+@Component
 struct TestWriteCacheStage {
-  @Local imageKnifeOption1: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption1: ImageKnifeOption = {
     loadSrc:$r('app.media.startIcon'),
     placeholderSrc:$r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
-  })
+  }
-  @Local imageKnifeOption2: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption2: ImageKnifeOption = {
     loadSrc:$r('app.media.startIcon'),
     placeholderSrc:$r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
-  })
+  }
-  @Local imageKnifeOption3: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption3: ImageKnifeOption = {
     loadSrc:$r('app.media.startIcon'),
     placeholderSrc:$r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
-  })
+  }
 
   build() {
     Column() {
       Button($r('app.string.Write_memory_and_file')).margin({top:10}).onClick(async ()=>{
-        this.imageKnifeOption1 = new ImageKnifeOption({
+        this.imageKnifeOption1 = {
           loadSrc:'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           writeCacheStrategy:CacheStrategy.Default
-        })
+        }
       })
       ImageKnifeComponent({
         imageKnifeOption: this.imageKnifeOption1
       }).width(200).height(200).margin({top:10})
       Button($r('app.string.Write_memory')).margin({top:10}).onClick(async ()=>{
-        this.imageKnifeOption2 = new ImageKnifeOption({
+        this.imageKnifeOption2 = {
           loadSrc:"https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           writeCacheStrategy:CacheStrategy.Memory
-        })
+        }
       })
       ImageKnifeComponent({
         imageKnifeOption: this.imageKnifeOption2
       }).width(200).height(200).margin({top:10})
       Button($r('app.string.Write_file')).margin({top:10}).onClick(async ()=>{
-        this.imageKnifeOption3 = new ImageKnifeOption({
+        this.imageKnifeOption3 = {
           loadSrc:'https://img-blog.csdn.net/20140514114029140',
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           writeCacheStrategy:CacheStrategy.File
-        })
+        }
       })
       ImageKnifeComponent({
         imageKnifeOption: this.imageKnifeOption3

entry/src/main/ets/pages/TransformPage.ets

@@ -17,17 +17,17 @@ import matrix4 from '@ohos.matrix4'
 
 
 @Entry
-@ComponentV2
+@Component
 struct TransformPage {
   private custom_scale:number = 1
-  @Local matrix1:object = matrix4.identity().scale({ x: 1, y: 1 })
+  @State matrix1:object = matrix4.identity().scale({ x: 1, y: 1 })
-  @Local ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State ImageKnifeOption: ImageKnifeOption = {
     loadSrc: $r("app.media.rabbit"),
     placeholderSrc: $r("app.media.loading"),
     errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Contain,
     border: { radius: 50 }
-  })
+  }
 
   build() {
     Column() {

entry/src/main/ets/pages/User.ets

@@ -15,50 +15,24 @@
 import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife'
 
 // const logger = new imUtils.logger.IMLogger('Avatar')
-@ObservedV2
+
-export class MyStorage {
+class MyImageOption extends ImageKnifeOption {
-  static instance:MyStorage | undefined = undefined
+  account?: string
-  static getInstance(){
-    if(MyStorage.instance == undefined) {
-      MyStorage.instance = new MyStorage()
-    }
-    return MyStorage.instance
-  }
-  @Trace WeLink_Mob_fontSize_multiple: number = 1
 }
 
-@ComponentV2
+@Component
 export struct UserAvatar {
+  @Prop @Watch('userInfoUpdate') userInfo: string = ""
   // @Prop userInfo: string = ""
   imgSize: number = 100
   radius: number = 12
   borderSize: number = 0
   imgSizes: number = 1
-  @Local ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption()
+  @State ImageKnifeOption: ImageKnifeOption = new ImageKnifeOption()
+  @StorageProp('WeLink_Mob_fontSize_multiple') @Watch('updateImgSize') WeLink_Mob_fontSize_multiple: number = 0
   scalable: boolean = true;
-  @Local calcImgSize: number = 100
+  @State calcImgSize: number = 100
-  @Param userInfo: string = ""
+
-  @Monitor('userInfo')
-  userInfoUpdate() {
-    // if (uri === 'userInfo' && this.imageKnifeOption.account !== this.userInfo.contactId) return;
-    // // logger.info(`userInfoUpdate uri=${uri} oldAcc=${this.imageKnifeOption.loadSrc} nowAcc=${this.userInfo.externalHeadUrl}`)
-    // if (this.userInfo.externalHeadUrl === this.imageKnifeOption.loadSrc && this.userInfo.infoUpdateTime.getTime()
-    //   .toString() === this.imageKnifeOption?.signature?.getKey()) return;
-    this.ImageKnifeOption = new ImageKnifeOption({
-      //TODO:写死loadSRC，场景：变更组件大小，所有图片不显示
-      loadSrc: this.userInfo,
-      placeholderSrc: $r('app.media.loading'),
-      errorholderSrc: $r('app.media.failed'),
-      border: { radius:20,width:5,color:$r('app.color.start_window_background') },
-      objectFit:ImageFit.Contain
-      // signature: new ObjectKey(this.userInfo.infoUpdateTime.getTime().toString())
-    })
-  }
-  @Local storage: MyStorage = MyStorage.getInstance()
-  @Monitor('storage.WeLink_Mob_fontSize_multiple')
-  updateImgSize() {
-    this.setImageSize()
-  }
   aboutToAppear(): void {
     this.userInfoUpdate()
     this.setImageSize()
@@ -67,19 +41,39 @@ export struct UserAvatar {
   setImageSize() {
     if (!this.scalable) {
       this.calcImgSize = this.imgSize
-    } else if (this.storage.WeLink_Mob_fontSize_multiple < 0.9) {
+    } else if (this.WeLink_Mob_fontSize_multiple < 0.9) {
       this.calcImgSize = this.imgSize * 0.9
-    } else if (this.storage.WeLink_Mob_fontSize_multiple > 1.6) {
+    } else if (this.WeLink_Mob_fontSize_multiple > 1.6) {
       this.calcImgSize = this.imgSize * 1.6
     } else {
-      this.calcImgSize = this.imgSize * this.storage.WeLink_Mob_fontSize_multiple
+      this.calcImgSize = this.imgSize * this.WeLink_Mob_fontSize_multiple
     }
   }
 
+  updateImgSize() {
+    this.setImageSize()
+  }
+
   aboutToReuse(param: ESObject) {
     this.userInfoUpdate()
   }
 
+  userInfoUpdate() {
+    // if (uri === 'userInfo' && this.imageKnifeOption.account !== this.userInfo.contactId) return;
+    // // logger.info(`userInfoUpdate uri=${uri} oldAcc=${this.imageKnifeOption.loadSrc} nowAcc=${this.userInfo.externalHeadUrl}`)
+    // if (this.userInfo.externalHeadUrl === this.imageKnifeOption.loadSrc && this.userInfo.infoUpdateTime.getTime()
+    //   .toString() === this.imageKnifeOption?.signature?.getKey()) return;
+    this.ImageKnifeOption = {
+      //TODO:写死loadSRC，场景：变更组件大小，所有图片不显示
+      loadSrc: this.userInfo,
+      placeholderSrc: $r('app.media.loading'),
+      errorholderSrc: $r('app.media.failed'),
+      border: { radius:20,width:5,color:$r('app.color.start_window_background') },
+      objectFit:ImageFit.Contain
+      // signature: new ObjectKey(this.userInfo.infoUpdateTime.getTime().toString())
+    }
+  }
+
   build() {
     Row() {
       // Image(this.imageKnifeOption.loadSrc)

entry/src/main/ets/pages/UserPage.ets

@@ -12,52 +12,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { MyStorage, UserAvatar } from './User'
+import { CommonDataSource } from './model/CommonDataSource'
+import { UserAvatar } from './User'
 
-class CommonDataSource <T> implements IDataSource {
-  private dataArray: T[] = []
-  private listeners: DataChangeListener[] = []
-
-  constructor(element: []) {
-    this.dataArray = element
-  }
-
-  public getData(index: number) {
-    return this.dataArray[index]
-  }
-
-  public totalCount(): number {
-    return this.dataArray.length
-  }
-
-  public addData(index: number, data: T[]): void {
-    this.dataArray = this.dataArray.concat(data)
-    this.notifyDataAdd(index)
-  }
-
-  unregisterDataChangeListener(listener: DataChangeListener): void {
-    const pos = this.listeners.indexOf(listener);
-    if (pos >= 0) {
-      this.listeners.splice(pos, 1);
-    }
-  }
-
-  registerDataChangeListener(listener: DataChangeListener): void {
-    if (this.listeners.indexOf(listener) < 0) {
-      this.listeners.push(listener)
-    }
-  }
-
-  notifyDataAdd(index: number): void {
-    this.listeners.forEach((listener: DataChangeListener) => {
-      listener.onDataAdd(index)
-    })
-  }
-}
 @Entry
-@ComponentV2
+@Component
 struct Index {
-  @Local hotCommendList:CommonDataSource<string> = new CommonDataSource<string>([])
+  @State hotCommendList:CommonDataSource<string> = new CommonDataSource<string>([])
   private data:string[] = [
     "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg",
     "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/e2/v3/4zI1Xm_3STmV30aZXWRrKw/6aN7WodDRUiBApgffiLPCg.jpg",
@@ -85,42 +46,26 @@ struct Index {
     'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
   ]
   aboutToAppear(): void {
-    MyStorage.getInstance().WeLink_Mob_fontSize_multiple = 1
+    this.hotCommendList.addData(this.hotCommendList.totalCount(),this.data)
+    AppStorage.set("WeLink_Mob_fontSize_multiple",1)
   }
 
   build() {
     Column() {
       Button("bigger").onClick(()=>{
-        MyStorage.getInstance().WeLink_Mob_fontSize_multiple = 1.6
+        AppStorage.set("WeLink_Mob_fontSize_multiple",1.6)
       })
       Button("small").onClick(()=>{
-        MyStorage.getInstance().WeLink_Mob_fontSize_multiple = 0.8
+        AppStorage.set("WeLink_Mob_fontSize_multiple",0.8)
       })
       List(){
-        // LazyForEach(this.hotCommendList,(item:string)=>{
+        LazyForEach(this.hotCommendList,(item:string)=>{
-        //   ListItem(){
+          ListItem(){
-        //     ReuseImage({
+            ReuseImage({
-        //       userInfo:item
+              userInfo:item
-        //     }).width("100%").height("100%").backgroundColor(Color.Yellow)
+            }).width("100%").height("100%").backgroundColor(Color.Yellow)
-        //   }.width(200).height(200).margin({bottom:5})
+          }.width(200).height(200).margin({bottom:5})
-        // })
+        })
-        Repeat(this.data)
-          .each((repeatItem)=>{
-            ListItem(){
-              ReuseImage({
-                userInfo:repeatItem.item
-              }).width("100%").height("100%").backgroundColor(Color.Yellow)
-            }.width(200).height(200).margin({bottom:5}).key("reuse")
-          })
-          .key(item => item+"reuse")
-          .virtualScroll()
-          .template("1",(repeatItem)=>{
-            ListItem(){
-              ReuseImage({
-                userInfo:repeatItem.item
-              }).width("100%").height("100%").backgroundColor(Color.Yellow)
-            }.width(200).height(200).margin({bottom:5}).key("reuse")
-          })
       }
       // .cachedCount(20)
       .width("100%")
@@ -131,13 +76,13 @@ struct Index {
 }
 
 
-// @Reusable
+@Reusable
-@ComponentV2
+@Component
 struct ReuseImage {
-  @Param userInfo:string = ""
+  @State userInfo:string = ""
-  // aboutToReuse(params: ESObject): void {
+  aboutToReuse(params: ESObject): void {
-  //   this.userInfo = params.userInfo
+    this.userInfo = params.userInfo
-  // }
+  }
 
   build() {
     Column(){

entry/src/main/ets/pages/dataShareUriLoadPage.ets

@@ -18,15 +18,15 @@ import { photoAccessHelper } from '@kit.MediaLibraryKit';
 
 
 @Entry
-@ComponentV2
+@Component
 struct DataShareUriLoadPage {
-  @Local imageKnifeOption1: ImageKnifeOption =
+  @State imageKnifeOption1: ImageKnifeOption =
-    new ImageKnifeOption({
+    {
       loadSrc: $r('app.media.icon'),
 
       placeholderSrc: $r('app.media.loading'),
       errorholderSrc: $r('app.media.failed')
-    });
+    };
 
 
   build() {
@@ -43,10 +43,10 @@ struct DataShareUriLoadPage {
               let photoViewPicker = new photoAccessHelper.PhotoViewPicker();
               let photoSelectResult: photoAccessHelper.PhotoSelectResult = await photoViewPicker.select(photoSelectOptions);
               uris = photoSelectResult.photoUris;
-              this.imageKnifeOption1 = new ImageKnifeOption({
+              this.imageKnifeOption1 = {
                 loadSrc: uris[0],
                 placeholderSrc:$r('app.media.loading')
-              })
+              }
             }).margin({ top: 5, left: 3 })
           ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).width(300).height(300)
         }.width('100%').backgroundColor(Color.Pink)

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

@@ -0,0 +1,54 @@
+/*
+ * 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.
+ */
+export class CommonDataSource <T> implements IDataSource {
+  private dataArray: T[] = []
+  private listeners: DataChangeListener[] = []
+
+  constructor(element: []) {
+    this.dataArray = element
+  }
+
+  public getData(index: number) {
+    return this.dataArray[index]
+  }
+
+  public totalCount(): number {
+    return this.dataArray.length
+  }
+
+  public addData(index: number, data: T[]): void {
+    this.dataArray = this.dataArray.concat(data)
+    this.notifyDataAdd(index)
+  }
+
+  unregisterDataChangeListener(listener: DataChangeListener): void {
+    const pos = this.listeners.indexOf(listener);
+    if (pos >= 0) {
+      this.listeners.splice(pos, 1);
+    }
+  }
+
+  registerDataChangeListener(listener: DataChangeListener): void {
+    if (this.listeners.indexOf(listener) < 0) {
+      this.listeners.push(listener)
+    }
+  }
+
+  notifyDataAdd(index: number): void {
+    this.listeners.forEach((listener: DataChangeListener) => {
+      listener.onDataAdd(index)
+    })
+  }
+}

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

@@ -0,0 +1,93 @@
+/*
+ * 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 {ImageKnife, ImageKnifeRequest} from "@ohos/libraryimageknife"
+import { IDataSourcePrefetching } from '@kit.ArkUI';
+import { HashMap } from '@kit.ArkTS';
+
+const IMADE_UNAVAILABLE = $r('app.media.failed')
+export interface InfoItem {
+  albumUrl: string | Resource
+}
+export default class DataSourcePrefetchingImageKnife implements IDataSourcePrefetching {
+  private dataArray: Array<InfoItem>
+  private readonly  requestList: HashMap<number,ImageKnifeRequest> = new HashMap()
+  private listeners: DataChangeListener[] = [];
+
+  constructor(dataArray: Array<InfoItem>) {
+    this.dataArray = dataArray;
+  }
+  public getData(index: number) {
+    return this.dataArray[index]
+  }
+
+  public totalCount(): number {
+    return this.dataArray.length
+  }
+
+  public addData(index: number, data: InfoItem[]): void {
+    this.dataArray = this.dataArray.concat(data)
+    this.notifyDataAdd(index)
+  }
+
+  unregisterDataChangeListener(listener: DataChangeListener): void {
+    const pos = this.listeners.indexOf(listener);
+    if (pos >= 0) {
+      this.listeners.splice(pos, 1);
+    }
+  }
+
+  registerDataChangeListener(listener: DataChangeListener): void {
+    if (this.listeners.indexOf(listener) < 0) {
+      this.listeners.push(listener)
+    }
+  }
+
+  notifyDataAdd(index: number): void {
+    this.listeners.forEach((listener: DataChangeListener) => {
+      listener.onDataAdd(index)
+    })
+  }
+  async prefetch(index: number): Promise<void> {
+    let item = this.dataArray[index]
+    if (typeof item.albumUrl == "string") {
+      // 图片预加载
+      let request = ImageKnife.getInstance().preload({
+        loadSrc:item.albumUrl,
+        onLoadListener:{
+          onLoadSuccess:()=>{
+            // 预加载成功，删除成功请求
+            this.requestList.remove(index)
+          },
+          onLoadFailed:()=>{
+            // 移除失败请求
+            this.requestList.remove(index)
+          }
+        }
+      })
+      this.requestList.set(index,request)
+    }
+  }
+  // 取消请求处理
+  cancel(index: number) {
+    if(this.requestList.hasKey(index)) {
+      // 返回MAP对象指定元素
+      const request = this.requestList.get(index)
+      // 取消请求
+      ImageKnife.getInstance().cancel(request)
+      // 移除被取消的请求对象
+      this.requestList.remove(index)
+    }
+  }
+}

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

@@ -0,0 +1,146 @@
+/*
+ * 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 './DataSourcePrefetching'
+
+export class PageViewModel {
+  private static dataArray: Array<InfoItem> = [
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/e2/v3/4zI1Xm_3STmV30aZXWRrKw/6aN7WodDRUiBApgffiLPCg.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/42/v3/2dSQCqERTP2TTPyssOMEbQ/zL1ebnKKQ_ilqTDcwCAkOw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/78/v3/qQJpAtRGQe2e_VhbGHDgIw/b3zlit99S6GybD3XdNwqJw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/55/v3/5DZ2LLqYSsK85-shqgLveQ/7ZXcyCWNTvOzQP5FFLBGkg.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/25/v3/jgB2ekkTRX-3yTYZalnANQ/xff_x9cbSPqb7fbNwgJa7A.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fb/v3/alXwXLHKSyCAIWt_ydgD2g/BCCuu25TREOitQxM7eYOEw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/63/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/16/v3/fm2tO4TsRH6mv_D_nSSd5w/FscLpLwQQ-KuV7oaprFK2Q.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/89/v3/UAUvtPHqRD-GWWANsEC57Q/zcRJCQebQ322Aby4jzmwmQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/tUUzzx73R4yp8G--lMhuWQ/EBbcu_dLTT-Jj68XAh6mtA.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/37/v3/12rH1yiEQmK9wlOOcy5avQ/RzBXiEBRRqOC7LRkwNj6VA.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/9a/v3/TpRN4AIzRoyUXIqWdKoE0g/ShOnD_tfS46HDbpSWhbCkQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/03/v3/H3X17s8eTdS2w56JgbB5jQ/a45sT-j8Sbe8sSQXTzeYvQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/96/v3/rMJJoAflTDSWa1z2pHs2wg/8dOqD0GlQBOCL5AvQok9FQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/ed/v3/KMO4D6D2QGuVOCLX4AhOFA/ef51xAaLQuK7BsnuD9abog.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/d9/v3/FSZH0aTdSqWxeAaxoPvi0g/RqxPxUCXQFiTMBfKTF9kkw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/bf/v3/lSjrRwFcS-ez6jp1ALSQFg/0n7R7XinSPyrYLqDu_1dfw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/8a/v3/ZKzYV5BJTuCk5hCE0y_xNA/8JT95OQnSZSd6_xQQUONhQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/1/v3/sTXb_I7URBKjdMyLDYa19w/qpcwa_FNQmi3-EzjbGsJ8A.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/e5/v3/m7wFvw_eQIuDV0Mk0IKi8g/gJU4migzTHKYk5KrgdZbBw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3f/v3/k_UWbB5_RGW7JemQZ0OQdw/_DUdmaZRQyG-Oyvkb663Bw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/39/v3/rFRN7G_VSo-p4mBjTZtkRw/gBwTI-ieSIqSsSmLNBEcgw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/04/v3/6K8BPYKVQFOr7KCuAG9nog/qKd3pZlrQy2M-feB3ycVPA.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/7d/v3/f0GQFzm1T6eduVeMUhO3Wg/-4cvzIJiRCegjIno3ofIbQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/e4/v3/C0xxsSeySxW-2iYR5OEbpQ/f1GlaD3zTeKPX8Vd-M1oVQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/c2/v3/32LCyXN4TuWKWcdf9gAwWw/ej14_BCJQNCaWOKoI9aZAw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fd/v3/LyYJMdMmQNaC5GyBYEZ5Pw/uFLiovypRSagKyIS-UJPVw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/15/v3/MHM9KaWGTgubn6M8-B_6nw/1YO9JyYhTHSBWsoiqYkGZw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/4c/v3/UdYfbv1_QYqn_ulDHp89OA/VkjexMluTqGO3yt3gPK1DA.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/e8/v3/N8blT_7qSK-tRtahIyov7g/M_kjGEEmSzOlTc47Zrfozg.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/28/v3/VS_h3m4YRrSgbgxnqE3vtQ/h-2Q1Qy2SSGEuXM36-Rq_w.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/2e/v3/R-BaM5ToRNGq5rwtNTcnww/Q2e01VHiR2y9KtFaZmpmNQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/88/v3/3djkAJKKTdC539XqMdstSg/wHO7DxvXQS2xbt2Y_-4BNg.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fb/v3/guw4eiggR3uWjscFTxITYg/TzRB35iPTdCztrZUUaNuFg.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/93/v3/UvSh_f1LT66i0-3hvsYN_A/eYnE3Z8YT5Sk7F-vS2ZmCQ.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/5/v3/tv8Vqf9hQrKpozGeZWg2mw/VEICB-bmQYi0Iv6TGADbhw.jpg"
+    },
+    {
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/4v1Ot5BRR6OFVQ9MGn9Xxg/xrPgRn0LS1ep-r7ewIuwiw.jpg"
+    },
+  ]
+  static getItems() {
+    return PageViewModel.dataArray
+  }
+}

entry/src/main/module.json5

@@ -5,8 +5,9 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "default",
+      "phone",
-      "tablet"
+      "tablet",
+      "2in1"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,
@@ -42,6 +43,15 @@
           ],
           "when": "always"
         }
+      },
+      {
+        "name": "ohos.permission.GET_NETWORK_INFO",
+        "usedScene": {
+          "abilities": [
+            "EntryAbility"
+          ],
+          "when": "always"
+        }
       }
     ]
   }

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

@@ -369,20 +369,12 @@
       "value": "Please shut down the network first and ensure that there is no cache of images from this network in the test failure scenario locally"
     },
     {
-      "name": "Image_Downsampling_Functionality",
+      "name": "Network_reload",
-      "value": "Downscale Image effect"
+      "value": "Network recovery reload"
     },
     {
-      "name": "Sampling_pecification",
+      "name": "preloading_prefetch",
-      "value": "降采样规格"
+      "value": "Dynamic preloading prefetch"
-    },
-    {
-      "name": "Unreal_samples",
-      "value": "未降采样大小"
-    },
-    {
-      "name": "After_the_sampling",
-      "value": "降采样后大小"
     },
     {
       "name": "image_format",

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

@@ -3,6 +3,7 @@
     "pages/Index",
     "pages/ListPage",
     "pages/SingleImage",
+    "pages/ManyPhotoShowPage",
     "pages/LongImagePage",
     "pages/TransformPage",
     "pages/UserPage",
@@ -23,7 +24,11 @@
     "pages/TestSetCustomImagePage",
     "pages/TestErrorHolderPage",
     "pages/TestTaskResourcePage",
-    "pages/DownSamplePage",
+    "pages/ImageKnifeReload",
+    "pages/LazyForEachCount",
+    "pages/LazyForEachCache",
+    "pages/PrefetchAndCacheCount",
+    "pages/PrefetchAndPreload",
     "pages/TestCacheDataPage",
     "pages/TestChangeColorPage",
     "pages/TestLoadCancelListenerPage"

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

@@ -19,6 +19,362 @@
     {
       "name": "app_permission_READ_IMAGEVIDEO",
       "value": "获取读媒体资源权限"
+    },
+    {
+      "name": "Test_ImageAnimator",
+      "value": "Test ImageAnimator component"
+    },
+    {
+      "name": "Test_multiple_images",
+      "value": "Test loading multiple identical images"
+    },
+    {
+      "name": "Test_Task_error",
+      "value": "Test placeholder map Task error"
+    },
+    {
+      "name": "Test_HSP",
+      "value": "Test HSP scene preloading"
+    },
+    {
+      "name": "Test_SingleImage",
+      "value": "SingleImage"
+    },
+    {
+      "name": "Test_custom_download",
+      "value": "Global custom download"
+    },
+    {
+      "name": "Multiple_images",
+      "value": "Multiple images"
+    },
+    {
+      "name": "Display_long_image",
+      "value": "Display long image"
+    },
+    {
+      "name": "Image_scaling",
+      "value": "Image scaling"
+    },
+    {
+      "name": "Message_list",
+      "value": "Message list"
+    },
+    {
+      "name": "Custom_cache_key",
+      "value": "Custom cache key"
+    },
+    {
+      "name": "Preloading_images_to_cache",
+      "value": "Preloading images to file cache"
+    },
+    {
+      "name": "Retrieve_image_display_from_cache",
+      "value": "Retrieve image display from cache"
+    },
+    {
+      "name": "Test_single_request_header",
+      "value": "Test a single request header"
+    },
+    {
+      "name": "Test_write_cache_strategy",
+      "value": "Test write cache strategy"
+    },
+    {
+      "name": "Image_Transformation",
+      "value": "Image Transformation"
+    },
+    {
+      "name": "Different_ObjectFit",
+      "value": "Different ObjectFit"
+    },
+    {
+      "name": "Test_image_loading_success_or_failure_events",
+      "value": "Test image loading success/failure events"
+    },
+    {
+      "name": "Test_removing_image_cache_interface",
+      "value": "Test removing image cache interface"
+    },
+    {
+      "name": "Test_error_image_display",
+      "value": "Test error image display"
+    },
+    {
+      "name": "Test_media_URL",
+      "value": "Test media URL"
+    },
+    {
+      "name": "Display_the_first_frame",
+      "value": "Display the first frame of the animation"
+    },
+    {
+      "name": "Display_the_last_frame",
+      "value": "Display the last frame of the animation"
+    },
+    {
+      "name": "Play",
+      "value": "Play"
+    },
+    {
+      "name": "Pause",
+      "value": "Pause"
+    },
+    {
+      "name": "Stop",
+      "value": "Stop"
+    },
+    {
+      "name": "Infinite_loop",
+      "value": "Infinite loop"
+    },
+    {
+      "name": "Play_once",
+      "value": "Play once"
+    },
+    {
+      "name": "Play_twice",
+      "value": "Play twice"
+    },
+    {
+      "name": "Local_SVG",
+      "value": "Local SVG image"
+    },
+    {
+      "name": "Under_context_file",
+      "value": "Files under context file"
+    },
+    {
+      "name": "Network_images",
+      "value": "Network images"
+    },
+    {
+      "name": "Custom_network_download",
+      "value": "Custom network download"
+    },
+    {
+      "name": "PixelMap_loads_images",
+      "value": "PixelMap loads images"
+    },
+    {
+      "name": "Enlarge",
+      "value": "Enlarge"
+    },
+    {
+      "name": "Reduce",
+      "value": "Reduce"
+    },
+    {
+      "name": "Click_on_add",
+      "value": "Click on the size to add 50"
+    },
+    {
+      "name": "Click_on_reduce",
+      "value": "Click to reduce size by 50"
+    },
+    {
+      "name": "The_key_fixed_1",
+      "value": "The key is fixed at 1"
+    },
+    {
+      "name": "The_key_changes_timestamp",
+      "value": "Key changes every time: timestamp"
+    },
+    {
+      "name": "Load",
+      "value": "Load"
+    },
+    {
+      "name": "Preloading_images_to_file_cache_using_URL",
+      "value": "Preloading images to file cache using URL"
+    },
+    {
+      "name": "Preloading_images_to_file_cache_using_option",
+      "value": "Preloading images to file cache using option"
+    },
+    {
+      "name": "Load_image_offline_after_preloading",
+      "value": "Load image (can be loaded offline after preloading)"
+    },
+    {
+      "name": "Preloading_GIF",
+      "value": "Preloading GIF"
+    },
+    {
+      "name": "Retrieve_GIF_from_memory",
+      "value": "Retrieve GIF from memory cache"
+    },
+    {
+      "name": "Retrieve_GIF_from_disk",
+      "value": "Retrieve GIF from disk cache"
+    },
+    {
+      "name": "Preloading_static_images",
+      "value": "Preloading static images"
+    },
+    {
+      "name": "Retrieve_images_from_memory",
+      "value": "Retrieve images from memory cache"
+    },
+    {
+      "name": "Retrieve_images_from_disk",
+      "value": "Retrieve images from memory disk"
+    },
+    {
+      "name": "Write_memory_and_file",
+      "value": "Write to memory and file cache"
+    },
+    {
+      "name": "Write_memory",
+      "value": "Write to memory cache"
+    },
+    {
+      "name": "Write_file",
+      "value": "Write to file cache"
+    },
+    {
+      "name": "Main_image_Fill",
+      "value": "Main image Fill Stretch Fill"
+    },
+    {
+      "name": "Maintain_proportion_filling",
+      "value": "Maintain proportion filling in the placeholder map 'Include'"
+    },
+    {
+      "name": "Error_graph_None",
+      "value": "Error graph None remains unchanged"
+    },
+    {
+      "name": "Test_failure_success",
+      "value": "Test failure/success"
+    },
+    {
+      "name": "Custom_download_failed",
+      "value": "Custom download failed"
+    },
+    {
+      "name": "Retrieve_media_gallery",
+      "value": "Retrieve the URI of the media gallery and display it using ImageKnife"
+    },
+    {
+      "name": "Click_load_Uri",
+      "value": "Click to load Uri and display"
+    },
+    {
+      "name": "Delete_all_caches",
+      "value": "Delete all caches"
+    },
+    {
+      "name": "Delete_all_memory_caches",
+      "value": "Delete all memory caches"
+    },
+    {
+      "name": "Delete_all_file_caches",
+      "value": "Delete all file caches"
+    },
+    {
+      "name": "Delete_all_custom_memory_caches",
+      "value": "Delete all custom memory caches"
+    },
+    {
+      "name": "Delete_all_custom_file_caches",
+      "value": "Delete all custom file caches"
+    },
+    {
+      "name": "Blur_effect",
+      "value": "Blur effect"
+    },
+    {
+      "name": "Highlighting_effect",
+      "value": "Highlighting effect"
+    },
+    {
+      "name": "Ashing_effect",
+      "value": "Ashing effect"
+    },
+    {
+      "name": "Inverse_effect",
+      "value": "Inverse effect"
+    },
+    {
+      "name": "Animation_filter_effect",
+      "value": "Animation filter effect"
+    },
+    {
+      "name": "Crop_circular_effect",
+      "value": "Crop circular effect"
+    },
+    {
+      "name": "Crop_circular_with_border_effect",
+      "value": "Crop circular with border effect"
+    },
+    {
+      "name": "Contrast_effect",
+      "value": "Contrast effect"
+    },
+    {
+      "name": "Black_ink_filtering_effect",
+      "value": "Black ink filtering effect"
+    },
+    {
+      "name": "Rotate",
+      "value": "Rotate"
+    },
+    {
+      "name": "Corners",
+      "value": "Corners"
+    },
+    {
+      "name": "Kuwahara_Filter_effect",
+      "value": "Kuwahara filter effect"
+    },
+    {
+      "name": "Pixelated_Filter_effect",
+      "value": "Pixelated filtering effect"
+    },
+    {
+      "name": "Sketch_Filter_effect",
+      "value": "Sketch Filter effect"
+    },
+    {
+      "name": "Distortion_Filter_effect",
+      "value": "Distortion Filter effect"
+    },
+    {
+      "name": "Decorative_Filter_effect",
+      "value": "Decorative Filter effect"
+    },
+    {
+      "name": "Square_cutting_effect",
+      "value": "Square cutting effect"
+    },
+    {
+      "name": "Top_cutting_effect",
+      "value": "Top cutting effect"
+    },
+    {
+      "name": "Middle_cutting_effect",
+      "value": "Middle cutting effect"
+    },
+    {
+      "name": "Bottom_cutting_effect",
+      "value": "Bottom cutting effect"
+    },
+    {
+      "name": "Mask_effect",
+      "value": "Mask effect"
+    },
+    {
+      "name": "TIPS",
+      "value": "Please shut down the network first and ensure that there is no cache of images from this network in the test failure scenario locally"
+    },
+    {
+      "name": "Network_reload",
+      "value": "Network recovery reload"
+    },
+    {
+      "name": "preloading_prefetch",
+      "value": "Dynamic preloading prefetch"
     }
   ]
 }

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

@@ -365,20 +365,12 @@
       "value": "测试失败场景请先关闭网络，并保证本地没有此网络图片的缓存"
     },
     {
-    "name": "Image_Downsampling_Functionality",
+      "name": "Network_reload",
-    "value": "降采样功能"
+      "value": "网络恢复reload"
     },
     {
-      "name": "Sampling_pecification",
+      "name": "preloading_prefetch",
-      "value": "降采样规格"
+      "value": "动态预加载prefetch"
-    },
-    {
-      "name": "Unreal_samples",
-      "value": "未降采样大小"
-    },
-    {
-      "name": "After_the_sampling",
-      "value": "降采样后大小"
     },
     {
       "name": "image_format",

entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets

@@ -70,10 +70,10 @@ export default function DefaultJobQueueTest() {
 }
 
 function makeRequest(src: string, context: common.UIAbilityContext, priority?: taskpool.Priority): ImageKnifeRequest {
-  let option: ImageKnifeOption = new ImageKnifeOption({
+  let option: ImageKnifeOption = {
     loadSrc: src,
     priority: priority
-  })
+  }
   return new ImageKnifeRequest(
     option,
     context,

entry/src/ohosTest/ets/test/FileLruCache.test.ets

@@ -153,9 +153,9 @@ export default function FileLruCacheTest() {
     });
     it('fileCacheEngineKey', 0, () => {
       let engineKey: IEngineKey = new DefaultEngineKey()
-      let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+      let imageKnifeOption: ImageKnifeOption = {
         loadSrc:"abc"
-      })
+      }
       let imageKey = engineKey.generateFileKey(imageKnifeOption.loadSrc,"")
       let imageAnimatorKey = engineKey.generateFileKey(imageKnifeOption.loadSrc,"",true)
       expect(imageKey == imageAnimatorKey).assertFalse()

entry/src/ohosTest/ets/test/ImageKnife.test.ets

@@ -40,10 +40,10 @@ export default function ImageKnifeTest() {
 
     it('removeMemoryCache', 0, async () => {
       let a = 'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp';
-        let option: ImageKnifeOption = new ImageKnifeOption({
+        let option: ImageKnifeOption = {
           loadSrc: 'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
           signature: ''
-        })
+        }
         let key = ImageKnife.getInstance()
           .getEngineKeyImpl()
           .generateMemoryKey('https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp', ImageKnifeRequestSource.SRC, option)

entry/src/ohosTest/ets/test/ImageKnifeOption.test.ets

@@ -44,7 +44,7 @@ export default function ImageKnifeOptionTest() {
         imageWidth: 0,
         imageHeight: 0,
       }
-      let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+      let ImageKnifeOption: ImageKnifeOption = {
         loadSrc: $r("app.media.rabbit"),
         onLoadListener: {
           onLoadFailed: (err) => {
@@ -58,10 +58,10 @@ export default function ImageKnifeOptionTest() {
             return data;
           },
         },
-      })
+      }
-      if (imageKnifeOption.onLoadListener && imageKnifeOption.onLoadListener.onLoadSuccess && imageKnifeOption.onLoadListener.onLoadFailed) {
+      if (ImageKnifeOption.onLoadListener && ImageKnifeOption.onLoadListener.onLoadSuccess && ImageKnifeOption.onLoadListener.onLoadFailed) {
-        imageKnifeOption.onLoadListener.onLoadSuccess(a,imageData);
+        ImageKnifeOption.onLoadListener.onLoadSuccess(a,imageData);
-        imageKnifeOption.onLoadListener.onLoadFailed(a);
+        ImageKnifeOption.onLoadListener.onLoadFailed(a);
       }
       expect(a).assertEqual(b);
     });

entry/src/ohosTest/ets/test/List.test.ets

@@ -18,7 +18,6 @@ import ImageKnifeOptionTest from './ImageKnifeOption.test';
 import MemoryLruCacheTest from './MemoryLruCache.test';
 import ImageKnifeTest from './ImageKnife.test';
 import Transform from './transform.test';
-import SamplingTest from './SamplingTest.test';
 import imageFormatAndSize from  './imageFormatAndSize.test'
 
 export default function testsuite() {
@@ -28,6 +27,5 @@ export default function testsuite() {
   ImageKnifeOptionTest();
   ImageKnifeTest();
   Transform();
-  SamplingTest()
   imageFormatAndSize();
 }

entry/src/ohosTest/ets/test/MemoryLruCache.test.ets

@@ -122,9 +122,9 @@ export default function MemoryLruCacheTest() {
 
     it('memoryCacheEngineKey', 0, () => {
       let engineKey: IEngineKey = new DefaultEngineKey()
-      let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+      let imageKnifeOption: ImageKnifeOption = {
         loadSrc:"abc"
-      })
+      }
       let imageKey = engineKey.generateMemoryKey(imageKnifeOption.loadSrc,ImageKnifeRequestSource.SRC,imageKnifeOption)
       let imageAnimatorKey = engineKey.generateMemoryKey(imageKnifeOption.loadSrc,ImageKnifeRequestSource.SRC,imageKnifeOption,true)
       expect(imageKey == imageAnimatorKey).assertFalse()

entry/src/ohosTest/ets/test/SamplingTest.test.ets

@@ -1,79 +0,0 @@
-/*
- * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import { image } from '@kit.ImageKit'
-import { BusinessError } from '@kit.BasicServicesKit'
-import { calculateScaleType, Downsampler } from '@ohos/imageknife/src/main/ets/downsampling/Downsampler'
-import { DownsampleStrategy } from '@ohos/imageknife'
-
-export default function SamplingTest() {
-  describe('SamplingTest', () => {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll(() => {
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
-    })
-    beforeEach(() => {
-      // Presets an action, which is performed before each unit test case starts.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: preset action function.
-    })
-    afterEach(() => {
-      // Presets a clear action, which is performed after each unit test case ends.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: clear action function.
-    })
-    afterAll(() => {
-      // Presets a clear action, which is performed after all test cases of the test suite end.
-      // This API supports only one parameter: clear action function.
-    })
-    it('NONE', 0, () => {
-      let reqSize: calculateScaleType =
-        new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.NONE,)
-      let req = (reqSize.targetWidth == 1024 && reqSize.targetHeight == 1024)
-      expect(req).assertEqual(true);
-    })
-    it('AT_MOST', 1, () => {
-      let reqSize: calculateScaleType =
-        new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.AT_MOST)
-      let req = (reqSize.targetWidth < 1024 && reqSize.targetHeight < 1024)
-      expect(req).assertEqual(true);
-    })
-    it('FIT_CENTER', 2, () => {
-      let reqSize: calculateScaleType =
-        new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.FIT_CENTER_MEMORY)
-      let req = (reqSize.targetWidth < 1024 && reqSize.targetHeight < 1024)
-      expect(req).assertEqual(true);
-    })
-    it('CENTER_OUTSIDE', 3, () => {
-      let reqSize: calculateScaleType =
-        new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.CENTER_OUTSIDE_MEMORY)
-      let req = (reqSize.targetWidth < 1024 && reqSize.targetHeight < 1024)
-      expect(req).assertEqual(true);
-    })
-    it('AT_LEAST', 4, () => {
-      let reqSize: calculateScaleType =
-        new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.AT_LEAST)
-      let req = (reqSize.targetWidth < 1024 && reqSize.targetHeight < 1024)
-      expect(req).assertEqual(true);
-    })
-
-  })
-}

entry/src/ohosTest/ets/test/SendableData.test.ets

@@ -1,52 +0,0 @@
-/*
- * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import { SendableData } from '@ohos/imageknife/src/main/ets/components/imageknife/SendableData'
-
-export default function SendableDataTest() {
-  describe('SendableDataTest',  ()=> {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll( ()=> {
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
-    })
-    beforeEach( ()=> {
-      // Presets an action, which is performed before each unit test case starts.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: preset action function.
-    })
-    afterEach( ()=> {
-      // Presets a clear action, which is performed after each unit test case ends.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: clear action function.
-    })
-    afterAll( ()=> {
-      // Presets a clear action, which is performed after all test cases of the test suite end.
-      // This API supports only one parameter: clear action function.
-    })
-    it('TestPlaceHolderCacheKey', 0, () => {
-      let value: string = "placeholderRegisterCacheKey";
-      let data: SendableData = new SendableData();
-      data.setPlaceHolderRegisterCacheKey(value);
-      expect(data.getPlaceHolderRegisterCacheKey()).assertEqual(value);
-    })
-    it('TestPlaceHolderMemoryCacheKey', 1, () => {
-      let value: string = "placeholderRegisterMemoryCacheKey";
-      let data: SendableData = new SendableData();
-      data.setPlaceHolderRegisterMemoryCacheKey(value);
-      expect(data.getPlaceHolderRegisterMemoryCacheKey()).assertEqual(value);
-    })
-  })
-}

entry/src/ohosTest/ets/test/customdatafetchclient.test.ets

@@ -1,106 +0,0 @@
-/*
- * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import { DownloadClient } from '@ohos/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient';
-import common from '@ohos.app.ability.common';
-import { GlobalContext } from '../testability/GlobalContext';
-import { CustomDataFetchClient, DataFetchResult, ImageKnifeGlobal, RequestOption } from '@ohos/imageknife';
-
-const BASE_COUNT: number = 2000;
-
-export default function CustomDataFetchClientTest() {
-  describe('CustomDataFetchClientTest', () => {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll(() => {
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
-    })
-    beforeEach(() => {
-      // Presets an action, which is performed before each unit test case starts.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: preset action function.
-    })
-    afterEach(() => {
-      // Presets a clear action, which is performed after each unit test case ends.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: clear action function.
-    })
-    afterAll(() => {
-      // Presets a clear action, which is performed after all test cases of the test suite end.
-      // This API supports only one parameter: clear action function.
-    })
-    it('TestIsLocalLoadSrc', 0, () => {
-      let path = 'invalid path';
-      let client = new DownloadClient()
-      expect(client.isLocalLoadSrc(undefined, path)).assertFalse();
-      let context: object | undefined = GlobalContext.getInstance().getObject("hapContext");
-      if (context != undefined) {
-        let loadSrc1 = (context as common.UIAbilityContext).filesDir + 'a.jpg';
-        let loadSrc2 = (context as common.UIAbilityContext).cacheDir + 'b.jpg';
-        expect(client.isLocalLoadSrc(context, loadSrc1)).assertTrue();
-        expect(client.isLocalLoadSrc(context, loadSrc2)).assertTrue();
-      }
-    })
-    it('TestLoadData', 1, async () => {
-      let client = new CustomDataFetchClient();
-      let request = new RequestOption();
-      request.loadSrc = $r('app.media.icon');
-      let error = (await client.loadData(request) as DataFetchResult).error as String;
-      expect(error).assertEqual('CustomDataFetchClient request or loadSrc error.');
-    })
-    it('TestLoadData_customGetImage', 2, async () => {
-      let client = new CustomDataFetchClient();
-      let request = new RequestOption();
-      request.loadSrc = 'http://e.hiphotos.baidu.com/image/pic/item/4e4a20a4462309f7e41f5cfe760e0cf3d6cad6ee.jpg';
-      request.customGetImage = (context: Context, src: string) => {
-        // 这里是模拟的customGetImage逻辑
-        return Promise.resolve(new DataFetchResult());
-      }
-      console.log('LXH', 'TestLoadData 2 --1 customGetImage is undefined ?' + (request.customGetImage == undefined));
-      let context: object | undefined = GlobalContext.getInstance().getObject("hapContext");
-      let result = await client.loadData(request);
-      if (context != undefined) {
-        console.log('LXH', 'TestLoadData 2 --2');
-        expect(typeof result)
-          .assertEqual(typeof (await request?.customGetImage(context as common.UIAbilityContext, request.loadSrc)));
-      }
-    })
-    it('TestLoadData_combineArrayBuffers', 3, () => {
-      // 创建几个ArrayBuffer作为测试数据
-      const arrayBuffer1 = new ArrayBuffer(4);
-      const uint8Array1 = new Uint8Array(arrayBuffer1);
-      uint8Array1[0] = 1;
-      uint8Array1[1] = 2;
-      uint8Array1[2] = 3;
-      uint8Array1[3] = 4;
-
-      const arrayBuffer2 = new ArrayBuffer(2);
-      const uint8Array2 = new Uint8Array(arrayBuffer2);
-      uint8Array2[0] = 5;
-      uint8Array2[1] = 6;
-      let client = new CustomDataFetchClient();
-      const combinedArrayBuffer = client.combineArrayBuffers([arrayBuffer1, arrayBuffer2]);
-      expect(combinedArrayBuffer.byteLength).assertEqual(6);
-      const combinedUint8Array = new Uint8Array(combinedArrayBuffer);
-      for (let i = 0; i < 4; i++) {
-        expect(combinedUint8Array[i]).assertEqual(uint8Array1[i]);
-      }
-      for (let i = 0; i < 2; i++) {
-        expect(combinedUint8Array[i + 4]).assertEqual(uint8Array2[i]);
-      }
-    });
-  })
-}
-

entry/src/ohosTest/ets/test/imageFormatAndSize.test.ets

@@ -49,9 +49,9 @@ export default function imageFormatAndSize() {
       let imageFormat: string = "";
       let url: string =
         "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/ed/v3/KMO4D6D2QGuVOCLX4AhOFA/ef51xAaLQuK7BsnuD9abog.jpg"
-      let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+      let imageKnifeOption: ImageKnifeOption = {
         loadSrc: url,
-      })
+      }
       await new Promise<string>((resolve, reject) => {
         imageKnifeOption.onLoadListener = {
           onLoadSuccess: (data, imageknifeData) => {

entry/src/ohosTest/ets/test/imageknifeOption.test.ets

@@ -1,69 +0,0 @@
-/*
- * 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 { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
-import { ImageKnifeOption,ImageKnifeData } from "@ohos/imageknife"
-
-export default function ImageKnifeOptionTest() {
-  describe('ImageKnifeOptionTest',() => {
-    // Defines a test suite. Two parameters are supported: test suite name and test suite function.
-    beforeAll(() => {
-      // Presets an action, which is performed only once before all test cases of the test suite start.
-      // This API supports only one parameter: preset action function.
-    });
-    beforeEach(() => {
-      // Presets an action, which is performed before each unit test case starts.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: preset action function.
-    });
-    afterEach(() => {
-      // Presets a clear action, which is performed after each unit test case ends.
-      // The number of execution times is the same as the number of test cases defined by **it**.
-      // This API supports only one parameter: clear action function.
-    });
-    afterAll(() => {
-      // Presets a clear action, which is performed after all test cases of the test suite end.
-      // This API supports only one parameter: clear action function.
-    });
-    it('onLoadListener', 0, () => {
-      let a = 'abc';
-      let b: string = '';
-      let imageData:ImageKnifeData = {
-        source: "",
-        imageWidth: 0,
-        imageHeight: 0,
-      }
-      let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
-        loadSrc: $r("app.media.rabbit"),
-        onLoadListener: {
-          onLoadFailed: (err) => {
-            console.error("Load Failed Reason: " + err);
-          },
-          onLoadSuccess: (data,imageknifeData) => {
-            if(typeof data == 'string') {
-              return b = data;
-            }
-            imageData = imageknifeData
-            return data;
-          },
-        },
-      })
-      if (imageKnifeOption.onLoadListener && imageKnifeOption.onLoadListener.onLoadSuccess && imageKnifeOption.onLoadListener.onLoadFailed) {
-        imageKnifeOption.onLoadListener.onLoadSuccess(a,imageData);
-        imageKnifeOption.onLoadListener.onLoadFailed(a);
-      }
-      expect(a).assertEqual(b);
-    });
-  });
-}

entry/src/ohosTest/module.json5

@@ -5,8 +5,9 @@
     "description": "$string:module_test_desc",
     "mainElement": "TestAbility",
     "deviceTypes": [
-      "default",
+      "phone",
-      "tablet"
+      "tablet",
+      "2in1"
     ],
     "deliveryWithInstall": true,
     "installationFree": false,

gpu_transform/CHANGELOG.md

@@ -1,10 +1,6 @@
-## 1.0.4
-- 修改门禁编译问题 修改点如下
-- 修改src/main/cpp/boundscheck/CMakeLists.txt文件中的内容
-- 修改src/main/cpp/util/DebugLog.h文件中hilog的大小写
-
 ## 1.0.3
-- 安全编译开启Strip和Ftrapv
+- 修改门禁编译问题 修改点如下
+- 修改src/main/cpp/util/DebugLog.h文件中hilog的大小写
 
 ## 1.0.2
 - 支持x86编译

gpu_transform/build-profile.json5

@@ -3,7 +3,7 @@
   "buildOption": {
     "externalNativeOptions": {
       "path": "./src/main/cpp/CMakeLists.txt",
-      "arguments": " -DCMAKE_BUILD_TYPE=Release",
+      "arguments": "",
       "abiFilters": [
         "armeabi-v7a",
         "arm64-v8a",

gpu_transform/oh-package.json5

@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-tpc/ImageKnife",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.3",
   "tags": [
     "Tool"
   ],

gpu_transform/src/main/cpp/CMakeLists.txt

@@ -11,11 +11,8 @@ include_directories(${NATIVERENDER_ROOT_PATH}
                     ${NATIVERENDER_ROOT_PATH}/common
                     ${NATIVERENDER_ROOT_PATH}/render
                     ${NATIVERENDER_ROOT_PATH}/constant
-                    ${NATIVERENDER_ROOT_PATH}/boundscheck
                     )
 
-add_subdirectory(boundscheck)
-
 add_library(nativeGpu SHARED
                     ${NATIVERENDER_ROOT_PATH}/napi/napi_init.cpp
                     ${NATIVERENDER_ROOT_PATH}/render/EGLRender.cpp
@@ -33,4 +30,4 @@ find_library (
             GLES-lib
             GLESv3 )
 
-target_link_libraries(nativeGpu PUBLIC boundscheck ${hilog-lib} ${EGL-lib} ${GLES-lib} libace_napi.z.so -s -ftrapv)
+target_link_libraries(nativeGpu PUBLIC ${hilog-lib} ${EGL-lib} ${GLES-lib} libace_napi.z.so libc++.a)

gpu_transform/src/main/cpp/boundscheck/CMakeLists.txt

@@ -1,27 +0,0 @@
-# the minimum version of CMake.
-cmake_minimum_required(VERSION 3.4.1)
-
-set(can_use_assembler TRUE)
-enable_language(ASM)
-IF("${OHOS_ARCH}" STREQUAL "arm64-v8a")
- SET(ASM_OPTIONS "-x assembler-with-cpp")
- SET(CMAKE_ASM_FLAGS "${CFLAGS} ${ASM_OPTIONS} -march=armv8+crypto -D__OHOS__")
-ENDIF()
-
-project(boundscheck)
-
-set(TAGET_BOUNDSCHECK_SRC_PATH ${CMAKE_CURRENT_SOURCE_DIR}/third_party_bounds_checking_function/src)
-
-add_library(boundscheck
-            STATIC
-            ${TAGET_BOUNDSCHECK_SRC_PATH}/memcpy_s.c
-            ${TAGET_BOUNDSCHECK_SRC_PATH}/memset_s.c
-            ${TAGET_BOUNDSCHECK_SRC_PATH}/securecutil.c)
-
-target_precompile_headers(boundscheck PUBLIC ${CMAKE_SYSROOT}/usr/include/stdint.h)
-
-include_directories(${TAGET_BOUNDSCHECK_SRC_PATH}
-                    ${CMAKE_CURRENT_SOURCE_DIR}/third_party_bounds_checking_function/include
-                    )
-
-target_link_libraries(boundscheck)

gpu_transform/src/main/cpp/boundscheck/third_party_bounds_checking_function

@@ -1 +0,0 @@
-Subproject commit a45b3aceed2c0138babc951850445d1cd010ce48

gpu_transform/src/main/cpp/render/EGLRender.cpp

@@ -535,10 +535,7 @@ void EGLRender::SetImageData(uint8_t *pData, int width, int height)
         m_RenderImage.height = height;
         m_RenderImage.format = IMAGE_FORMAT_RGBA;
         NativeImageUtil::AllocNativeImage(&m_RenderImage);
-        if (memcpy_s(m_RenderImage.ppPlane[0],
+        memcpy(m_RenderImage.ppPlane[0], pData, width * height * DEFAULT_FOUR);
-            width * height * DEFAULT_FOUR, pData, width * height * DEFAULT_FOUR) != EOK) {
-            return;
-        }
         
         glBindTexture(GL_TEXTURE_2D, m_ImageTextureId);
         glTexImage2D(GL_TEXTURE_2D,

gpu_transform/src/main/cpp/util/NapiUtil.cpp

@@ -26,7 +26,6 @@
 #include <string>
 #include <string.h>
 #include "DebugLog.h"
-#include "third_party_bounds_checking_function/include/securec.h"
 
 const int32_t MAX_STR_LENGTH = 1024;
 
@@ -42,7 +41,7 @@ void NapiUtil::JsValueToString(const napi_env &env, const napi_value &value, con
         LOGI("%s nullptr js object to string malloc failed", __func__);
         return;
     }
-    (void) memset_s(buf.get(), bufLen, 0, bufLen);
+    (void) memset(buf.get(), 0, bufLen);
     size_t result = 0;
     napi_get_value_string_utf8(env, value, buf.get(), bufLen, &result);
     target = buf.get();

gpu_transform/src/main/cpp/util/NativeImage.h

@@ -30,7 +30,6 @@
 #include <string.h>
 #include "DebugLog.h"
 #include "constant/constant_shape.h"
-#include "third_party_bounds_checking_function/include/securec.h"
 
 #define IMAGE_FORMAT_RGBA           0x01
 #define IMAGE_FORMAT_NV21           0x02
@@ -49,7 +48,7 @@
 #define IMAGE_FORMAT_GRAY_EXT       "GRAY"
 #define IMAGE_FORMAT_I444_EXT       "I444"
 #define IMAGE_FORMAT_P010_EXT       "P010" // 16bit NV21
-#define EOK 0
+
 
 struct NativeImage {
     int width;
@@ -141,9 +140,7 @@ public:
             if (napi_create_arraybuffer(env, srcLen, &nativePtr, res) != napi_ok || nativePtr == nullptr) {
                 return false;
             }
-            if (memcpy_s(nativePtr, srcLen, src, srcLen) != EOK) {
+            memcpy(nativePtr, src, srcLen);
-                return false;
-            }
             return true;
         }
     
@@ -152,17 +149,10 @@ public:
             int totalLength = width * height * DEFAULT_FOUR;
             int oneLineLength = width * DEFAULT_FOUR;
             uint8_t* tmp = (uint8_t*)malloc(totalLength);
-            if (memcpy_s(tmp, totalLength, *buf, totalLength) != EOK) {
+            memcpy(tmp, *buf, totalLength);
-                return;
+            memset(*buf, DEFAULT_ZERO, sizeof(uint8_t)*totalLength);
-            }
-            if (memset_s(*buf, sizeof(uint8_t)*totalLength, DEFAULT_ZERO, sizeof(uint8_t)*totalLength) != EOK) {
-                return;
-            }
             for (int i = 0; i < height; i++) {
-                if (memcpy_s(*buf + oneLineLength * i, oneLineLength,
+                memcpy(*buf + oneLineLength * i, tmp + totalLength - oneLineLength * (i+1), oneLineLength);
-                             tmp + totalLength - oneLineLength * (i+1), oneLineLength) != EOK) {
-                    break;
-                }
             }
             free(tmp);
         }

hvigor/hvigor-config.json5

@@ -1,7 +1,6 @@
 {
-  "hvigorVersion": "4.0.2",
+  "modelVersion": "5.0.0",
   "dependencies": {
-    "@ohos/hvigor-ohos-plugin": "4.0.2"
   },
   "execution": {
     // "analyze": "default",                    /* Define the build analyze mode. Value: [ "default" | "verbose" | false ]. Default: "default" */
@@ -19,4 +18,4 @@
   "nodeOptions": {
     // "maxOldSpaceSize": 4096                  /* Enable nodeOptions maxOldSpaceSize compilation. Unit M. Used for the daemon process */
   }
-}
+}

hvigorw

@@ -1,48 +0,0 @@
-#!/bin/bash
-
-# ----------------------------------------------------------------------------
-#  Hvigor startup script, version 1.0.0
-# 
-#  Required ENV vars:
-#  ------------------
-#    NODE_HOME - location of a Node home dir
-#    or 
-#    Add /usr/local/nodejs/bin to the PATH environment variable
-# ----------------------------------------------------------------------------
-
-HVIGOR_APP_HOME=$(dirname $(readlink -f $0))
-HVIGOR_WRAPPER_SCRIPT=${HVIGOR_APP_HOME}/hvigor/hvigor-wrapper.js
-warn() {
-	echo ""
-	echo -e "\033[1;33m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
-}
-
-error() {
-	echo ""
-	echo -e "\033[1;31m`date '+[%Y-%m-%d %H:%M:%S]'`$@\033[0m"
-}
-
-fail() {
-	error "$@"
-	exit 1
-}
-
-# Determine node to start hvigor wrapper script
-if [ -n "${NODE_HOME}" ];then
-   EXECUTABLE_NODE="${NODE_HOME}/bin/node"
-   if [ ! -x "$EXECUTABLE_NODE" ];then
-       fail "ERROR: NODE_HOME is set to an invalid directory,check $NODE_HOME\n\nPlease set NODE_HOME in your environment to the location where your nodejs installed"
-   fi
-else
-   EXECUTABLE_NODE="node"
-   which ${EXECUTABLE_NODE} > /dev/null 2>&1 || fail "ERROR: NODE_HOME is not set and not 'node' command found in your path"
-fi
-
-# Check hvigor wrapper script
-if [ ! -r "$HVIGOR_WRAPPER_SCRIPT" ];then
-	fail "ERROR: Couldn't find hvigor/hvigor-wrapper.js in ${HVIGOR_APP_HOME}"
-fi
-
-# start hvigor-wrapper script
-exec "${EXECUTABLE_NODE}" \
-	"${HVIGOR_WRAPPER_SCRIPT}" "$@"

hvigorw.bat

@@ -1,57 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Hvigor startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-set WRAPPER_MODULE_PATH=%APP_HOME%\hvigor\hvigor-wrapper.js
-set NODE_EXE=node.exe
-
-goto start
-
-:start
-@rem Find node.exe
-if defined NODE_HOME goto findNodeFromNodeHome
-
-%NODE_EXE% --version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
-
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:findNodeFromNodeHome
-set NODE_HOME=%NODE_HOME:"=%
-set NODE_EXE_PATH=%NODE_HOME%/%NODE_EXE%
-
-if exist "%NODE_EXE_PATH%" goto execute
-echo.
-echo ERROR: NODE_HOME is not set and no 'node' command could be found in your PATH.
-echo.
-echo Please set the NODE_HOME variable in your environment to match the
-echo location of your NodeJs installation.
-
-goto fail
-
-:execute
-@rem Execute hvigor
-"%NODE_EXE%" %WRAPPER_MODULE_PATH% %*
-
-:fail
-exit /b 1

library/index.ets

@@ -66,6 +66,4 @@ export { CropTransformation } from './src/main/ets/transform/CropTransformation'
 
 export { MaskTransformation } from './src/main/ets/transform/MaskTransformation'
 
-export { SepiaTransformation } from './src/main/ets/transform/SepiaTransformation'
+export { SepiaTransformation } from './src/main/ets/transform/SepiaTransformation'
-
-export { DownsampleStrategy } from './src/main/ets/downsampling/DownsampleStartegy'

library/oh-package.json5

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

library/src/main/ets/ImageKnife.ets

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeRequest } from './model/ImageKnifeRequest';
+import { ImageKnifeRequest, ImageKnifeRequestState } from './model/ImageKnifeRequest';
 import { CacheStrategy, ImageKnifeData, ImageKnifeRequestSource } from './model/ImageKnifeData';
 import { MemoryLruCache } from './cache/MemoryLruCache';
 import { IMemoryCache } from './cache/IMemoryCache'
@@ -80,7 +80,15 @@ export class ImageKnife {
   public isFileCacheInit(): boolean {
     return this.fileCache === undefined ? false : this.fileCache.isFileCacheInit()
   }
-
+  /**
+   * 重新加载
+   */
+  reload(request: ImageKnifeRequest) {
+    if (request.requestState == ImageKnifeRequestState.ERROR) {
+      request.requestState = ImageKnifeRequestState.PROGRESS
+      ImageKnife.getInstance().execute(request)
+    }
+  }
   /**
    * 全局添加单个请求头header
    * @param key 请求头属性
@@ -137,8 +145,39 @@ export class ImageKnife {
     let key = this.getEngineKeyImpl().generateMemoryKey(imageKnifeOption.loadSrc, ImageKnifeRequestSource.SRC, imageKnifeOption);
     this.memoryCache.remove(key);
   }
-
+  /**
-
+   * 预加载
+   * @param loadSrc 图片地址url
+   * @returns 图片请求request
+   */
+  preload(loadSrc:string | ImageKnifeOption):ImageKnifeRequest{
+    let imageKnifeOption = new ImageKnifeOption()
+    if (typeof loadSrc == "string") {
+      imageKnifeOption.loadSrc = loadSrc
+    } else {
+      imageKnifeOption = loadSrc;
+    }
+    let request = new ImageKnifeRequest(
+      imageKnifeOption,
+      imageKnifeOption.context !== undefined ? imageKnifeOption.context : getContext(this) as common.UIAbilityContext,
+      0,
+      0,
+      0,
+      {
+        showPixelMap(version: number, pixelMap: PixelMap | string) {
+        }
+      }
+    )
+    this.execute(request)
+    return request
+  }
+  /**
+   * 取消图片请求
+   * @param request 图片请求request
+   */
+  cancel(request:ImageKnifeRequest) {
+    request.requestState = ImageKnifeRequestState.DESTROY
+  }
   /**
    * 预加载图片到文件缓存
    * @param loadSrc 图片地址url
@@ -191,10 +230,10 @@ export class ImageKnife {
    */
   getCacheImage(loadSrc: string,
                 cacheType: CacheStrategy = CacheStrategy.Default, signature?: string): Promise<ImageKnifeData | undefined> {
-    let option: ImageKnifeOption = new ImageKnifeOption({
+    let option: ImageKnifeOption = {
       loadSrc: loadSrc,
       signature:signature
-    })
+    }
     let engineKeyImpl: IEngineKey = this.getEngineKeyImpl();
 
     return new Promise((resolve, reject) => {
@@ -218,7 +257,7 @@ export class ImageKnife {
    */
   putCacheImage(url: string, pixelMap: PixelMap, cacheType: CacheStrategy = CacheStrategy.Default, signature?: string) {
     let memoryKey = this.getEngineKeyImpl()
-      .generateMemoryKey(url, ImageKnifeRequestSource.SRC, new ImageKnifeOption({ loadSrc: url, signature: signature }));
+      .generateMemoryKey(url, ImageKnifeRequestSource.SRC, { loadSrc: url, signature: signature });
     let fileKey = this.getEngineKeyImpl().generateFileKey(url, signature);
     let imageKnifeData: ImageKnifeData = { source: pixelMap, imageWidth: 0, imageHeight: 0 };
     switch (cacheType) {
@@ -252,9 +291,9 @@ export class ImageKnife {
     if (url instanceof ImageKnifeOption) {
       imageKnifeOption = url;
     } else {
-      imageKnifeOption = new ImageKnifeOption({
+      imageKnifeOption = {
         loadSrc: url
-      });
+      };
     }
     let key = this.getEngineKeyImpl().generateFileKey(imageKnifeOption.loadSrc, imageKnifeOption.signature);
     if (this.fileCache !== undefined) {
@@ -362,7 +401,6 @@ export class ImageKnife {
     }
   }
 
-
   private pixelMapToArrayBuffer(pixelMap: PixelMap): ArrayBuffer {
     let imageInfo = pixelMap.getImageInfoSync();
     let readBuffer: ArrayBuffer = new ArrayBuffer(imageInfo.size.height * imageInfo.size.width * 4);
@@ -444,10 +482,10 @@ export class ImageKnife {
    * 全局设置自定义下载
    * @param customGetImage 自定义请求函数
    */
-  setCustomGetImage(customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>) {
+  setCustomGetImage(customGetImage?: (context: Context, src: string | PixelMap | Resource,headers?: Record<string, Object>) => Promise<ArrayBuffer | undefined>) {
     this.customGetImage = customGetImage
   }
-  getCustomGetImage(): undefined | ((context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>){
+  getCustomGetImage(): undefined | ((context: Context, src: string | PixelMap | Resource,headers?: Record<string, Object>) => Promise<ArrayBuffer | undefined>){
     return this.customGetImage
   }
 }

library/src/main/ets/ImageKnifeDispatcher.ets

@@ -35,7 +35,6 @@ import {
 } from './model/ImageKnifeData'
 import { BusinessError } from '@kit.BasicServicesKit';
 import { ImageKnifeLoader } from './ImageKnifeLoader'
-import { DownsampleStrategy } from './downsampling/DownsampleStartegy';
 
 
 export class ImageKnifeDispatcher {
@@ -184,10 +183,7 @@ export class ImageKnifeDispatcher {
       fileCacheFolder: ImageKnife.getInstance().getFileCache()?.getCacheFolder(),
       isAnimator:isAnimator,
       moduleName: moduleName == "" ? undefined : moduleName,
-      resName: resName == "" ? undefined : resName,
+      resName: resName == "" ? undefined : resName
-      targetWidth: currentRequest.componentWidth,
-      targetHeight: currentRequest.componentHeight,
-      downsampType: currentRequest.imageKnifeOption.downsampleOf==undefined?DownsampleStrategy.NONE:currentRequest.imageKnifeOption.downsampleOf,
     }
 
     if(request.customGetImage == undefined) {
@@ -264,7 +260,7 @@ export class ImageKnifeDispatcher {
         if (requestWithSource.source === ImageKnifeRequestSource.SRC &&
           requestWithSource.request.imageKnifeOption.onLoadListener?.onLoadFailed !== undefined &&
         requestJobResult.loadFail) {
-          requestWithSource.request.imageKnifeOption.onLoadListener.onLoadFailed(requestJobResult.loadFail);
+          requestWithSource.request.imageKnifeOption.onLoadListener.onLoadFailed(requestJobResult.loadFail,requestWithSource.request);
           LogUtil.log("ImageKnife_DataTime_getAndShowImage_onLoadFailed:"+currentRequest.imageKnifeOption.loadSrc)
         }
         if (requestWithSource.source === ImageKnifeRequestSource.SRC &&

library/src/main/ets/ImageKnifeLoader.ets

@@ -28,8 +28,6 @@ import emitter from '@ohos.events.emitter';
 import image from '@ohos.multimedia.image';
 import { RequestJobResult } from './model/ImageKnifeData'
 import util from '@ohos.util';
-import { DownsampleStrategy } from './downsampling/DownsampleStartegy';
-import { Downsampler } from './downsampling/Downsampler';
 
 class RequestData {
   receiveSize: number = 2000
@@ -75,15 +73,6 @@ export class ImageKnifeLoader {
     }
 
     let size = (await imageSource.getImageInfo()).size
-    try {
-      if ((request.downsampType !== DownsampleStrategy.NONE) &&
-        request.requestSource == ImageKnifeRequestSource.SRC) {
-        decodingOptions = ImageKnifeLoader.getDownsamplerDecodingOptions(typeValue, request, size, ImageKnifeRequestSource.SRC)
-      }
-    } catch (err) {
-      return  ImageKnifeLoader.makeEmptyResult(err)
-    }
-
     await imageSource.createPixelMap(decodingOptions)
       .then((pixelmap: PixelMap) => {
         resPixelmap = pixelmap
@@ -121,14 +110,6 @@ export class ImageKnifeLoader {
       editable: true,
       desiredSize: defaultSize
     };
-    try {
-      if ((request.downsampType !== DownsampleStrategy.NONE) &&
-        request.requestSource == ImageKnifeRequestSource.SRC) {
-        opts = ImageKnifeLoader.getDownsamplerDecodingOptions(typeValue, request, size)
-      }
-    } catch (err) {
-       return ImageKnifeLoader.makeEmptyResult(err)
-    }
     await imageSource.createPixelMap(opts)
       .then((pixelmap: PixelMap) => {
         resPixelmap = pixelmap
@@ -212,7 +193,19 @@ export class ImageKnifeLoader {
       return ImageKnifeLoader.makeEmptyResult("ImageKnifeAnimatorComponent组件仅支持动态图")
     }
   }
-
+  static getHeaderObj(request:RequestJobRequest){
+    const headerObj: Record<string, Object> = {}
+    if (request.headers != undefined) {
+      request.headers.forEach((value) => {
+        headerObj[value.key] = value.value
+      })
+    } else if (request.allHeaders.size > 0) {
+      request.allHeaders.forEach((value, key) => {
+        headerObj[key] = value
+      })
+    }
+    return headerObj
+  }
   // 获取图片资源
   static async getImageArrayBuffer(request: RequestJobRequest, requestList: List<ImageKnifeRequestWithSource> | undefined,fileKey:string): Promise<ArrayBuffer> {
     let resBuf: ArrayBuffer | undefined
@@ -224,7 +217,8 @@ export class ImageKnifeLoader {
       if (resBuf === undefined) {
         LogUtil.log("start customGetImage src=" + request.src)
         try {
-          resBuf = await request.customGetImage(request.context, request.src)
+          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)
@@ -253,16 +247,7 @@ export class ImageKnifeLoader {
             let httpRequest = http.createHttp();
             let progress: number = 0
             let arrayBuffers = new Array<ArrayBuffer>()
-            const headerObj: Record<string, object> = {}
+            const headerObj: Record<string, Object> = ImageKnifeLoader.getHeaderObj(request)
-            if (request.headers != undefined) {
-              request.headers.forEach((value) => {
-                headerObj[value.key] = value.value
-              })
-            } else if (request.allHeaders.size > 0) {
-              request.allHeaders.forEach((value, key) => {
-                headerObj[key] = value
-              })
-            }
             httpRequest.on("dataReceive", (data: ArrayBuffer) => {
               arrayBuffers.push(data)
             });
@@ -373,30 +358,4 @@ export class ImageKnifeLoader {
     }
     return resBuf
   }
-
+}
-    static getDownsamplerDecodingOptions(typeValue: string, request: RequestJobRequest, size: Size,
-    SRC?: ImageKnifeRequestSource):image.DecodingOptions {
-    let reqSize =
-      new Downsampler().calculateScaling(typeValue, size.width, size.height, request.targetWidth, request.targetHeight,
-        request.downsampType)
-    if (typeValue == "svg") {
-      return {
-        editable: true,
-        desiredSize: {
-          height: vp2px(reqSize.height),
-          width: vp2px(reqSize.width)
-        }
-
-      }
-    } else {
-      return {
-        editable: request.requestSource === SRC && request.transformation !== undefined ? true : false,
-        desiredSize:{
-          width: reqSize.width,
-          height: reqSize.height
-        }
-      }
-    }
-  }
-}
-

library/src/main/ets/components/ImageKnifeAnimatorComponent.ets

@@ -19,14 +19,15 @@ import { ImageKnife } from '../ImageKnife';
 import { LogUtil } from '../utils/LogUtil';
 import { ImageKnifeRequestSource } from '../model/ImageKnifeData';
 
-@ComponentV2
+@Component
 export struct ImageKnifeAnimatorComponent {
-  @Param animatorOption: AnimatorOption = new AnimatorOption();
+  @Watch('watchImageKnifeOption') @ObjectLink imageKnifeOption: ImageKnifeOption;
-  @Local pixelMap: PixelMap | string | undefined = undefined
+  @State animatorOption: AnimatorOption = new AnimatorOption();
-  @Local imageAnimator: Array<ImageFrameInfo> | undefined = undefined
+  @State pixelMap: PixelMap | string | undefined = undefined
-  @Local adaptiveWidth: Length = '100%'
+  @State imageAnimator: Array<ImageFrameInfo> | undefined = undefined
-  @Local adaptiveHeight: Length = '100%'
+  @State adaptiveWidth: Length = '100%'
-  @Local objectFit: ImageFit = ImageFit.Contain
+  @State adaptiveHeight: Length = '100%'
+  @State objectFit: ImageFit = ImageFit.Contain
   private request: ImageKnifeRequest | undefined
   private lastWidth: number = 0
   private lastHeight: number = 0
@@ -34,17 +35,7 @@ export struct ImageKnifeAnimatorComponent {
   private currentHeight: number = 0
   private componentVersion: number = 0
   private currentContext: common.UIAbilityContext | undefined = undefined
-  @Param imageKnifeOption: ImageKnifeOption = new ImageKnifeOption();
+
-  @Monitor('imageKnifeOption',
-  "imageKnifeOption.loadSrc","imageKnifeOption.signature","imageKnifeOption.transformation","imageKnifeOption.border","imageKnifeOption.objectFit")
-  watchImageKnifeOption() {
-    if (this.request !== undefined) {
-      this.request.requestState = ImageKnifeRequestState.DESTROY
-    }
-    this.request = undefined
-    this.componentVersion++
-    ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight))
-  }
   aboutToAppear(): void {
     this.objectFit = this.imageKnifeOption.objectFit === undefined ? ImageFit.Contain : this.imageKnifeOption.objectFit
   }
@@ -95,6 +86,15 @@ export struct ImageKnifeAnimatorComponent {
       .onRepeat(this.animatorOption.onRepeat)
   }
 
+  watchImageKnifeOption() {
+    if (this.request !== undefined) {
+      this.request.requestState = ImageKnifeRequestState.DESTROY
+    }
+    this.request = undefined
+    this.componentVersion++
+    ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight),true)
+  }
+
   getCurrentContext(): common.UIAbilityContext {
     if (this.currentContext == undefined) {
       this.currentContext = getContext(this) as common.UIAbilityContext

library/src/main/ets/components/ImageKnifeComponent.ets

@@ -21,13 +21,14 @@ import { ImageKnifeData, ImageKnifeRequestSource } from '../model/ImageKnifeData
 import { IEngineKey } from '../key/IEngineKey';
 import { DefaultEngineKey } from '../key/DefaultEngineKey';
 
-@ComponentV2
+@Component
 export struct ImageKnifeComponent {
-  @Local pixelMap: PixelMap | string | undefined = undefined
+  @Watch('watchImageKnifeOption') @ObjectLink imageKnifeOption: ImageKnifeOption;
-  @Param syncLoad: boolean = false
+  @State pixelMap: PixelMap | string | undefined = undefined
-  @Local adaptiveWidth: Length = '100%'
+  @State syncLoad: boolean = false
-  @Local adaptiveHeight: Length = '100%'
+  @State adaptiveWidth: Length = '100%'
-  @Local objectFit: ImageFit = ImageFit.Contain
+  @State adaptiveHeight: Length = '100%'
+  @State objectFit: ImageFit = ImageFit.Contain
   private request: ImageKnifeRequest | undefined
   private lastWidth: number = 0
   private lastHeight: number = 0
@@ -35,20 +36,6 @@ export struct ImageKnifeComponent {
   private currentHeight: number = 0
   private componentVersion: number = 0
   private currentContext: common.UIAbilityContext | undefined = undefined
-  @Param imageKnifeOption: ImageKnifeOption = new ImageKnifeOption();
-
-  @Monitor('imageKnifeOption',
-  "imageKnifeOption.loadSrc","imageKnifeOption.signature","imageKnifeOption.transformation","imageKnifeOption.border","imageKnifeOption.objectFit",'imageKnifeOption.downsampleOf')
-  watchImageKnifeOption() {
-    this.clearLastRequest()
-    this.componentVersion++
-    this.objectFit = this.imageKnifeOption.objectFit === undefined ? ImageFit.Contain : this.imageKnifeOption.objectFit
-    LogUtil.log("watchImageKnifeOption execute request:width=" + this.currentWidth + " height= " + this.currentHeight
-      + " loadSrc = " + this.request?.imageKnifeOption.loadSrc
-      + " placeholderSrc = " + this.request?.imageKnifeOption.placeholderSrc
-      + " errorholderSrc = " + this.request?.imageKnifeOption.errorholderSrc)
-    ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight))
-  }
 
   aboutToAppear(): void {
     this.objectFit = this.imageKnifeOption.objectFit === undefined ? ImageFit.Contain : this.imageKnifeOption.objectFit
@@ -83,7 +70,6 @@ export struct ImageKnifeComponent {
   aboutToRecycle() {
     this.clearLastRequest()
   }
-
   /**
    * 对已DESTROY的组件不再发起请求
    */
@@ -93,7 +79,6 @@ export struct ImageKnifeComponent {
       this.request = undefined
     }
   }
-
   build() {
     Image(this.pixelMap)
       .colorFilter(this.imageKnifeOption.drawingColorFilter)
@@ -109,19 +94,29 @@ export struct ImageKnifeComponent {
         this.currentHeight = newValue.height as number
         this.lastWidth = oldValue.width as number
         this.lastHeight = oldValue.height as number
-
+        if (this.currentWidth <= 0 || this.currentHeight <= 0) {
-        // 条件1: 宽高值均有效,值>0. 条件2：当前宽高与上一次宽高不同
+          // 存在宽或者高为0,此次重回无意义,无需进行request请求
-        if (this.currentWidth > 0 && this.currentHeight > 0 &&
+        } else {
-          (this.currentHeight != this.lastHeight || this.currentWidth != this.lastWidth)) {
+          // 前提：宽高值均有效,值>0. 条件1：当前宽高与上一次宽高不同  条件2:当前是第一次绘制
-          LogUtil.log("onSizeChange execute request:width=" + this.currentWidth + " height= " + this.currentHeight
+          if (this.currentHeight != this.lastHeight || this.currentWidth != this.lastWidth) {
-            + " loadSrc = " + this.request?.imageKnifeOption.loadSrc
+            LogUtil.log("execute request:width=" + this.currentWidth + " height= " + this.currentHeight)
-            + " placeholderSrc = " + this.request?.imageKnifeOption.placeholderSrc
+            ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight))
-            + " errorholderSrc = " + this.request?.imageKnifeOption.errorholderSrc)
+          }
-          ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight))
         }
       })
   }
 
+  watchImageKnifeOption() {
+    this.clearLastRequest()
+    this.componentVersion++
+    this.objectFit = this.imageKnifeOption.objectFit === undefined ? ImageFit.Contain : this.imageKnifeOption.objectFit
+    LogUtil.log("watchImageKnifeOption execute request:width=" + this.currentWidth + " height= " + this.currentHeight
+      + " loadSrc = " + this.request?.imageKnifeOption.loadSrc
+      + " placeholderSrc = " + this.request?.imageKnifeOption.placeholderSrc
+      + " errorholderSrc = " + this.request?.imageKnifeOption.errorholderSrc)
+    ImageKnife.getInstance().execute(this.getRequest(this.currentWidth, this.currentHeight))
+  }
+
   getCurrentContext(): common.UIAbilityContext {
     if (this.currentContext == undefined) {
       this.currentContext = getContext(this) as common.UIAbilityContext
@@ -143,10 +138,24 @@ export struct ImageKnifeComponent {
               return //针对reuse场景，不显示历史图片
             }
             this.pixelMap = pixelMap
-            if (typeof this.pixelMap !== 'string' && this.imageKnifeOption.objectFit === ImageFit.Auto) { //针对静态图高度自适应
+            if (typeof this.pixelMap !== 'string') {
-              let info = await this.pixelMap.getImageInfo()
+              if (this.imageKnifeOption.objectFit === ImageFit.Auto) {
-              this.adaptiveWidth = this.currentWidth
+                let info = await this.pixelMap.getImageInfo()
-              this.adaptiveHeight = info.size.height * this.currentWidth / info.size.width
+
+                this.adaptiveWidth = this.currentWidth
+                this.adaptiveHeight = info.size.height * this.currentWidth / info.size.width
+
+                // if (this.currentWidth / this.currentHeight > info.size.width / info.size.height) {
+                //   this.adaptiveWidth = this.currentWidth
+                //   this.adaptiveHeight = info.size.height * this.currentWidth / this.currentHeight
+                // }
+                // else {
+                //   this.adaptiveWidth = info.size.width * this.currentWidth / this.currentHeight
+                //   this.adaptiveHeight = this.currentHeight
+                // }
+              }
+            } else {
+              //console.info("KKKKKKKKKKK:" + pixelMap)
             }
 
             if (requestSource == ImageKnifeRequestSource.SRC) {
@@ -165,4 +174,8 @@ export struct ImageKnifeComponent {
 
     return this.request
   }
+}
+
+interface KeyCanvas {
+  keyId: string
 }

library/src/main/ets/downsampling/BaseDownsampling.ets

@@ -1,23 +0,0 @@
-/*
- * 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 { DownsampleStrategy } from './DownsampleStartegy';
-
-import { SampleSizeRounding } from './DownsampleUtils';
-
-export interface BaseDownsampling {
-  getName(): string
-
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestWidth: number, requestHeight: number,downsampType?:DownsampleStrategy): number
-}

library/src/main/ets/downsampling/DownsampleStartegy.ets

@@ -1,148 +0,0 @@
-/*
- * 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 { BaseDownsampling } from './BaseDownsampling';
-import { getScale, highestOneBit, round, SampleSizeRounding } from './DownsampleUtils';
-
-export class FitCenter implements BaseDownsampling {
-  getName() {
-    return "FitCenter"
-  }
-
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
-    downsampType: DownsampleStrategy
-  ): number {
-    //重新计算宽高比;
-    let outSize: Size = {
-      width: round(getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType) * sourceWidth),
-      height:round(getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType) * sourceHeight)
-    }
-    let scaleFactor = downsampType === DownsampleStrategy.FIT_CENTER_QUALITY?
-    Math.max(1, highestOneBit(Math.max(sourceWidth / outSize.width, sourceHeight / outSize.height))) :
-    Math.max(1, highestOneBit(Math.min(sourceWidth / outSize.width, sourceHeight / outSize.height)))//将整型的缩放因子转换为2的次幂采样大小
-
-    if (downsampType === DownsampleStrategy.FIT_CENTER_MEMORY
-      && (scaleFactor < (1 / getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType)))) {
-      scaleFactor = scaleFactor << 1;
-    }
-    return scaleFactor
-  }
-}
-
-
-/*宽高进行等比缩放宽高里面最小的比例先放进去
-然后再更据原图的缩放比去适配另一边*/
-
-export class AtLeast implements BaseDownsampling {
-  getName() {
-    return "AtLeast"
-  }
-
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number): number {
-    const widthPercentage = requestedWidth / sourceWidth;
-    const heightPercentage = requestedHeight / sourceHeight;
-    //返回宽度和高度比例中最大的值
-    let outSize: Size = {
-      width: round(Math.max(widthPercentage, heightPercentage) * sourceWidth),
-      height:round(Math.max(widthPercentage, heightPercentage) * sourceHeight)
-    }
-    let scaleFactor = Math.max(1, highestOneBit(Math.max(sourceWidth / outSize.width, sourceHeight / outSize.height)))
-
-    return scaleFactor
-  }
-}
-
-/*请求尺寸大于实际尺寸不进行放大,按照原图展示*/
-
-export class AtMost implements BaseDownsampling {
-  getName() {
-    return "AtMost"
-  }
-
-
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number): number {
-    const maxIntegerFactor = Math.ceil(Math.max(sourceHeight / requestedHeight, sourceWidth / requestedWidth));
-    let lesserOrEqualSampleSize = Math.max(1, highestOneBit(maxIntegerFactor));
-    let greaterOrEqualSampleSize = lesserOrEqualSampleSize
-    if (lesserOrEqualSampleSize < maxIntegerFactor) {
-      greaterOrEqualSampleSize = lesserOrEqualSampleSize <<= 1;
-    }
-    greaterOrEqualSampleSize = lesserOrEqualSampleSize << (lesserOrEqualSampleSize < maxIntegerFactor ? 1 : 0)
-
-    let outSize: Size = {
-      width: round((1 / greaterOrEqualSampleSize) * sourceWidth),
-      height:round((1 / greaterOrEqualSampleSize) * sourceHeight)
-    }
-    let scaleFactor = Math.max(1, highestOneBit(Math.min(sourceWidth / outSize.width, sourceHeight / outSize.height)))
-    if ((scaleFactor < greaterOrEqualSampleSize)) {
-      scaleFactor = scaleFactor << 1;
-    }
-    return scaleFactor
-  }
-}
-
-/*宽高进行等比缩放宽高里面最大的比例先放进去
-然后再更据原图的缩放比去适配另一边*/
-export class CenterInside implements BaseDownsampling {
-  getName() {
-    return "CenterInside"
-  }
-  getScaleFactor(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
-    downsampType: DownsampleStrategy
-  ): number {
-    let outSize: Size = {
-      width: round(Math.min(1, getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType)) * sourceWidth),
-      height:round(Math.min(1, getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType)) * sourceHeight)
-    }
-    //将整型的缩放因子转换为2的次幂采样大小
-    let scaleFactor = this.getSampleSizeType(sourceWidth, sourceHeight, requestedWidth, requestedHeight,
-    downsampType) == SampleSizeRounding.QUALITY ?
-    Math.max(1, highestOneBit(Math.max(sourceWidth / outSize.width, sourceHeight / outSize.height))) :
-    Math.max(1, highestOneBit(Math.min(sourceWidth / outSize.width, sourceHeight / outSize.height)))
-    if (this.getSampleSizeType(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType)
-      == SampleSizeRounding.MEMORY  && (scaleFactor < (1 / Math.min(1, getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType))))) {
-      scaleFactor = scaleFactor << 1;
-    }
-    return scaleFactor
-
-  }
-
-  getSampleSizeType(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
-    downsampType: DownsampleStrategy
-  ): SampleSizeRounding {
-    //如果缩放因子为 1，表示没有缩放，优先选择质量
-    if (Math.min(1, getScale(sourceWidth, sourceHeight, requestedWidth, requestedHeight, downsampType)) === 1) {
-      return SampleSizeRounding.QUALITY
-    }
-    //否则，使用 FIL_CENTER 的 SampleSizeRounding 值
-    return downsampType === DownsampleStrategy.CENTER_OUTSIDE_MEMORY?SampleSizeRounding.MEMORY:SampleSizeRounding.QUALITY
-  }
-}
-
-export enum DownsampleStrategy {
-  //请求尺寸大于实际尺寸不进行放大
-  AT_MOST,
-  //两边自适应内存优先
-  FIT_CENTER_MEMORY,
-  //两边自适应质量优先
-  FIT_CENTER_QUALITY,
-  //按照宽高比的最大比进行适配内存优先
-  CENTER_OUTSIDE_MEMORY,
-  //按照宽高比的最大比进行适配质量优先
-  CENTER_OUTSIDE_QUALITY,
-  //宽高进行等比缩放宽高里面最小的比例先放进去，然后再根据原图的缩放比去适配
-  AT_LEAST,
-  //不进行降采样
-  NONE,
-}

library/src/main/ets/downsampling/DownsampleUtils.ets

@@ -1,58 +0,0 @@
-/*
- * 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 { DownsampleStrategy } from './DownsampleStartegy';
-
-export enum SampleSizeRounding {
-  /**
-   * Prefer to round the sample size up so that the image is downsampled to smaller than the
-   * requested size to use less memory.
-   */
-  //（内存优先）
-  MEMORY,
-  /**
-   * Prefer to round the sample size down so that the image is downsampled to larger than the
-   * requested size to maintain quality at the expense of extra memory usage.
-   */
-  //（质量优先）
-  QUALITY
-}
-//找出给定整数 i 中最高位的1（即最左边的1）所代表的值
-export function highestOneBit(i: number): number {
-  i |= (i >> 1);
-  i |= (i >> 2);
-  i |= (i >> 4);
-  i |= (i >> 8);
-  i |= (i >> 16);
-  return i - (i >>> 1);
-}
-
-
-export function getScale(sourceWidth: number, sourceHeight: number, requestedWidth: number, requestedHeight: number,
-  downsampType: DownsampleStrategy
-): number {
-  if (downsampType === DownsampleStrategy.FIT_CENTER_MEMORY) {
-    const widthPercentage = requestedWidth / sourceWidth
-    const heightPercentage = requestedHeight / sourceHeight
-    return Math.min(widthPercentage, heightPercentage)
-  } else {
-    const maxIntegerFactor = Math.max(sourceHeight / requestedHeight, sourceWidth / requestedWidth);
-    return maxIntegerFactor === 0 ? 1 : 1 / highestOneBit(maxIntegerFactor);
-
-  }
-}
-//四舍五入
-export function  round(value: number): number {
-  return Math.floor(value + 0.5);
-}

library/src/main/ets/downsampling/Downsampler.ets

@@ -1,73 +0,0 @@
-/*
- * 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 {
-  AtMost,
-  CenterInside,
-  AtLeast,
-  DownsampleStrategy,
-  FitCenter,
-} from './DownsampleStartegy';
-export class Downsampler {
-  calculateScaling(
-    typeValue: string,
-    sourceWidth: number, //原始宽高
-    sourceHeight: number, //原始宽高
-    requestWidth: number, //请求宽高
-    requestHeight: number, //请求宽高
-    downsampType: DownsampleStrategy,
-  ): Size {
-
-    if (sourceHeight <= 0 || sourceWidth <= 0) {
-      throw new Error(`Invalid width and height, sourceHeight:${sourceHeight}+ sourceWidth:${sourceWidth}`)
-    }
-    let downsampler = this.getDownsampler(downsampType);
-    let scaleFactor: number =
-      downsampler.getScaleFactor(sourceWidth, sourceHeight, requestWidth, requestHeight, downsampType);//缩放比
-    //基于上一步得出的采样大小，根据不同的图片类型，计算采样后的图片尺寸
-    if (typeValue === "png") {
-      return {
-        width: Math.floor(sourceWidth / scaleFactor),
-        height: Math.floor(sourceHeight / scaleFactor)
-      }
-    } else if (typeValue === "webp") {
-      return {
-        width: Math.round(sourceWidth / scaleFactor),
-        height: Math.round(sourceHeight / scaleFactor)
-      }
-    } else {
-      return {
-        width: sourceWidth / scaleFactor,
-        height: sourceHeight / scaleFactor
-
-      }
-    }
-  }
-  getDownsampler(downsampType: DownsampleStrategy) {
-    switch (downsampType) {
-      case DownsampleStrategy.FIT_CENTER_MEMORY:
-      case DownsampleStrategy.FIT_CENTER_QUALITY:
-        return new FitCenter();
-      case DownsampleStrategy.AT_MOST:
-        return new AtMost();
-      case DownsampleStrategy.CENTER_OUTSIDE_MEMORY:
-      case DownsampleStrategy.CENTER_OUTSIDE_QUALITY:
-        return new CenterInside();
-      case DownsampleStrategy.AT_LEAST:
-        return new AtLeast();
-      default:
-        throw new Error('Unsupported downsampling strategy');
-    }
-  }
-}

library/src/main/ets/key/DefaultEngineKey.ets

@@ -17,7 +17,6 @@ import { ImageKnifeOption } from '../model/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 {
@@ -32,9 +31,6 @@ export class DefaultEngineKey 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
   }

library/src/main/ets/model/ImageKnifeData.ets

@@ -18,7 +18,6 @@ import { IEngineKey } from '../key/IEngineKey'
 import { PixelMapTransformation } from '../transform/PixelMapTransformation'
 import common from '@ohos.app.ability.common';
 import { Size } from '@kit.ArkUI'
-import { DownsampleStrategy } from '../downsampling/DownsampleStartegy'
 
 export interface ImageKnifeData {
   source: PixelMap | string,
@@ -92,7 +91,7 @@ export interface RequestJobRequest {
   allHeaders: Map<string, Object>,
   componentWidth: number,
   componentHeight: number,
-  customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>,
+  customGetImage?: (context: Context, src: string | PixelMap | Resource ,headers?: Record<string, Object>) => Promise<ArrayBuffer | undefined>,
   onlyRetrieveFromCache?: boolean
   requestSource: ImageKnifeRequestSource
   transformation?: PixelMapTransformation
@@ -104,9 +103,6 @@ export interface RequestJobRequest {
   fileCacheFolder: string,
   isAnimator?: boolean,
   moduleName?:string,
-  resName?: string,
+  resName?: string
-  targetWidth: number
-  targetHeight: number
-  downsampType: DownsampleStrategy
 }
 

library/src/main/ets/model/ImageKnifeOption.ets

@@ -17,101 +17,52 @@ import common from '@ohos.app.ability.common'
 import { CacheStrategy, ImageKnifeData,EventImage } from './ImageKnifeData';
 import { PixelMapTransformation } from '../transform/PixelMapTransformation';
 import { drawing } from '@kit.ArkGraphics2D';
-import { DownsampleStrategy } from '../downsampling/DownsampleStartegy';
+import { ImageKnifeRequest } from './ImageKnifeRequest';
 
 export interface HeaderOptions {
   key: string;
   value: Object;
 }
-interface AnimatorType {
+
-  state?: AnimationStatus
+@Observed
-  iterations?: number
-  reverse?: boolean
-  onStart?:()=>void
-  onFinish?:()=>void
-  onPause?:()=>void
-  onCancel?:()=>void
-  onRepeat?:()=>void
-}
-@ObservedV2
 export class AnimatorOption {
-  @Trace
+  @Track
   state?: AnimationStatus = AnimationStatus.Running
-  @Trace
+  @Track
   iterations?: number = -1
-  @Trace
+  @Track
   reverse?: boolean = false
-  @Trace
+  @Track
   onStart?:()=>void
-  @Trace
+  @Track
   onFinish?:()=>void
-  @Trace
+  @Track
   onPause?:()=>void
-  @Trace
+  @Track
   onCancel?:()=>void
-  @Trace
+  @Track
   onRepeat?:()=>void
-  constructor(option?:AnimatorType) {
-    this.state = option?.state
-    this.iterations = option?.iterations
-    this.reverse = option?.reverse
-    this.onStart = option?.onStart
-    this.onFinish = option?.onFinish
-    this.onPause = option?.onPause
-    this.onCancel = option?.onCancel
-    this.onRepeat = option?.onRepeat
-  }
 }
-interface ImageOption {
+
-  // 主图资源
+@Observed
-  loadSrc: string | PixelMap | Resource
-  // 占位图
-  placeholderSrc?: string | PixelMap | Resource
-  // 失败占位图
-  errorholderSrc?: string | PixelMap | Resource
-  headerOption?: Array<HeaderOptions>;
-  // 自定义缓存关键字
-  signature?: string
-  // 主图填充效果
-  objectFit?: ImageFit
-  // 占位图填充效果
-  placeholderObjectFit?: ImageFit
-  // 错误图填充效果
-  errorholderObjectFit?: ImageFit
-  customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>
-  border?: BorderOptions
-  // 缓存策略
-  writeCacheStrategy?: CacheStrategy
-  // 仅使用缓存加载数据
-  onlyRetrieveFromCache?: boolean;
-  priority?: taskpool.Priority
-  context?: common.UIAbilityContext;
-  progressListener?: (progress: number) => void;
-  transformation?: PixelMapTransformation
-  onLoadListener?: OnLoadCallBack | undefined;
-  onComplete?:(event:EventImage | undefined) => void
-  drawingColorFilter?: ColorFilter | drawing.ColorFilter
-  downsampleOf?: DownsampleStrategy
-}
-@ObservedV2
 export class ImageKnifeOption {
   // 主图资源
-  @Trace loadSrc: string | PixelMap | Resource = "";
+  loadSrc: string | PixelMap | Resource = "";
   // 占位图
   placeholderSrc?: string | PixelMap | Resource;
   // 失败占位图
   errorholderSrc?: string | PixelMap | Resource;
   headerOption?: Array<HeaderOptions>;
   // 自定义缓存关键字
-  @Trace signature?: string;
+  signature?: string;
   // 主图填充效果
-  @Trace objectFit?: ImageFit
+  objectFit?: ImageFit
   // 占位图填充效果
   placeholderObjectFit?: ImageFit
   // 错误图填充效果
   errorholderObjectFit?: ImageFit
-  customGetImage?: (context: Context, src: string | PixelMap | Resource) => Promise<ArrayBuffer | undefined>
+  customGetImage?: (context: Context, src: string | PixelMap | Resource,headers?: Record<string, Object>) => Promise<ArrayBuffer | undefined>
-  @Trace border?: BorderOptions
+  border?: BorderOptions
   // 缓存策略
   writeCacheStrategy?: CacheStrategy
   // 仅使用缓存加载数据
@@ -119,33 +70,12 @@ export class ImageKnifeOption {
   priority?: taskpool.Priority = taskpool.Priority.LOW
   context?: common.UIAbilityContext;
   progressListener?: (progress: number) => void;
-  @Trace transformation?: PixelMapTransformation
+  transformation?: PixelMapTransformation
   onLoadListener?: OnLoadCallBack | undefined;
   onComplete?:(event:EventImage | undefined) => void
   drawingColorFilter?: ColorFilter | drawing.ColorFilter
-  // 下采样
+  constructor() {
-  @Trace downsampleOf: DownsampleStrategy = DownsampleStrategy.NONE
+
-  constructor(option?:ImageOption) {
-    this.loadSrc = option?.loadSrc == undefined ? "" : option?.loadSrc
-    this.placeholderSrc = option?.placeholderSrc
-    this.errorholderSrc = option?.errorholderSrc
-    this.headerOption = option?.headerOption
-    this.signature = option?.signature
-    this.objectFit = option?.objectFit
-    this.placeholderObjectFit = option?.placeholderObjectFit
-    this.errorholderObjectFit = option?.errorholderObjectFit
-    this.customGetImage = option?.customGetImage
-    this.border = option?.border
-    this.writeCacheStrategy = option?.writeCacheStrategy
-    this.onlyRetrieveFromCache = option?.onlyRetrieveFromCache
-    this.priority = option?.priority
-    this.context = option?.context
-    this.progressListener = option?.progressListener
-    this.transformation = option?.transformation
-    this.onLoadListener = option?.onLoadListener
-    this.onComplete = option?.onComplete
-    this.drawingColorFilter = option?.drawingColorFilter
-    this.downsampleOf = option?.downsampleOf==undefined?DownsampleStrategy.NONE:option?.downsampleOf
   }
 }
 
@@ -160,7 +90,7 @@ export interface OnLoadCallBack {
   onLoadSuccess?: (data: string | PixelMap | undefined, imageKnifeData: ImageKnifeData) => void;
 
   // 请求结束
-  onLoadFailed?: (err: string) => void;
+  onLoadFailed?: (err: string,request?: ImageKnifeRequest) => void;
   // 请求取消
   onLoadCancel?: (reason: string) => void;
 }

library/src/main/ets/model/ImageKnifeRequest.ets

@@ -15,7 +15,6 @@
 import { ImageKnifeOption } from './ImageKnifeOption';
 import common from '@ohos.app.ability.common';
 import { ImageKnifeRequestSource } from './ImageKnifeData';
-import { DownsampleStrategy } from '../downsampling/DownsampleStartegy';
 
 
 export class ImageKnifeRequest {
@@ -28,22 +27,18 @@ export class ImageKnifeRequest {
   ImageKnifeRequestCallback: ImageKnifeRequestCallback
   componentVersion: number = 0
   headers: Map<string,Object> = new Map<string,Object>()
-  downsampType?: DownsampleStrategy
   constructor(option: ImageKnifeOption,
               uIAbilityContext: common.UIAbilityContext,
               width: number,
               height: number,
               version: number,
-              ImageKnifeRequestCallback: ImageKnifeRequestCallback,
+              ImageKnifeRequestCallback: ImageKnifeRequestCallback) {
-              downsampType?: DownsampleStrategy
-  ) {
     this.imageKnifeOption = option
     this.context = uIAbilityContext
     this.componentWidth = width
     this.componentHeight = height
     this.componentVersion = version
     this.ImageKnifeRequestCallback = ImageKnifeRequestCallback
-    this.downsampType = downsampType
   }
   // RequestOption调用header对于的方法
   addHeader(key: string, value: Object) {

library/src/main/ets/utils/FileUtils.ets

@@ -176,6 +176,7 @@ export class FileUtils {
       let length = stat.size;
       let buf = new ArrayBuffer(length);
       await fs.read(fd, buf);
+      await fs.close(fd)
       return buf
     } catch (error) {
       let err: BusinessError = error as BusinessError;

oh-package.json5

@@ -1,11 +1,16 @@
 {
-  "license": "ISC",
+  "modelVersion": "5.0.0",
-  "devDependencies": {
-    "@ohos/hypium": "1.0.6"
-  },
   "name": "imageknife",
-  "description": "example description",
+  "version": "1.0.0",
-  "repository": {},
+  "description": "Please describe the basic information.",
-  "version": "",
+  "main": "",
-  "dependencies": {}
+  "author": "",
-}
+  "license": "",
+  "dependencies": {
+    "@ohos/gpu_transform": "^1.0.2"
+  },
+  "devDependencies": {
+    "@ohos/hypium": "1.0.16"
+  },
+  "dynamicDependencies": {}
+}

sharedlibrary/src/main/ets/pages/Index.ets

@@ -14,14 +14,14 @@
  */
 import { ImageKnife , ImageKnifeComponent ,ImageKnifeOption } from "@ohos/imageknife"
 
-@ComponentV2
+@Component
 export struct IndexComponent {
-  @Local imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({
+  @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r('app.media.startIcon')
-  })
+  }
   build() {
     Column() {
-      Button($r('app.string.Preload')).onClick((event: ClickEvent) => {
+      Button("preload").onClick((event: ClickEvent) => {
         ImageKnife.getInstance()
           .preLoadCache('https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp')
           .then((data) => {

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

@@ -3,10 +3,6 @@
     {
       "name": "shared_desc",
       "value": "description"
-    },
-    {
-      "name": "Preload",
-      "value": "Preload"
     }
   ]
 }

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

@@ -1,8 +0,0 @@
-{
-  "string": [
-    {
-      "name": "Preload",
-      "value": "预加载"
-    }
-  ]
-}