.gitee/ISSUE_TEMPLATE.zh-CN.md

@@ -1,13 +0,0 @@
-### 该问题是怎么引起的？
-
-
-
-### 重现步骤
-
-
-
-### 报错信息
-
-
-
-

.gitee/ISSUE_TEMPLATE/bug-report.yml

@@ -1,47 +0,0 @@
-name: 缺陷反馈|Bug
-description: 当您发现了一个缺陷，需要向社区反馈时，请使用此模板。
-title: "[Bug]: "
-labels: ["bug"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢对OpenHarmony社区的支持与关注，欢迎反馈缺陷。
-  - type: textarea
-    attributes:
-      label: 发生了什么问题？
-      description: 提供尽可能多的信息描述产生了什么问题。
-      placeholder: ""
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 期望行为是什么？
-      description: 描述期望的行为应该是什么样子的。
-      placeholder: ""
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 如何复现该缺陷
-      description: 提供尽可能多的信息描述如何复现该缺陷。
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 其他补充信息
-      description: 补充下其他您认为需要提供的信息。
-    validations:
-      required: false
-  - type: checkboxes
-    attributes:
-      label: 版本或分支信息
-      description: 在哪些版本、分支存在该缺陷的？
-      options:
-        - label: master
-        - label: Release 3.2
-        - label: Release 3.1
-        - label: Release 3.0
-        - label: Release 2.x
-    validations:
-      required: true

.gitee/ISSUE_TEMPLATE/config.yml

@@ -1 +0,0 @@
-blank_issues_enabled: false

.gitee/ISSUE_TEMPLATE/feature-request.yml

@@ -1,21 +0,0 @@
-name: 新需求|Feature
-description: 您需要反馈或实现一个新需求时，使用此模板。
-title: "[新需求]: "
-labels: ["enhancement"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢提出新需求。
-  - type: textarea
-    attributes:
-      label: 新需求提供了什么功能？
-      description: 请描述下新需求的功能是什么，解决了什么问题
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 该需求带来的价值、应用场景？
-      description: 请描述下该需求的价值，应用场景等。
-    validations:
-      required: false

.gitee/ISSUE_TEMPLATE/question.yml

@@ -1,15 +0,0 @@
-name: 问题咨询|Question
-description: 如果您对OpenHarmony社区有疑问，欢迎反馈咨询。
-title: "[问题咨询]: "
-labels: ["question"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢提出问题，我们将安排人答复！
-  - type: textarea
-    attributes:
-      label: 问题描述
-      description: 请描述下您的问题
-    validations:
-      required: true

.gitee/ISSUE_TEMPLATE/security-issue.yml

@@ -1,72 +0,0 @@
-name: 安全问题|Security Issue
-description: 当您发现安全问题时，使用此模板反馈。
-title: "[安全问题]: "
-labels: ["SIG_Security"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        感谢对OpenHarmony社区的支持与关注，欢迎反馈安全问题。
-  - type: input
-    attributes:
-      label: 漏洞编号：
-      description: 请描述下漏洞编号。
-      placeholder: ""
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: 漏洞归属组件
-      description: 请描述下漏洞归属组件。
-      placeholder: ""
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: 漏洞归属版本
-      description: 请描述下漏洞归属版本。
-      placeholder: ""
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: CVSS V3.0分值
-      description: 请描述下CVSS V3.0分值。
-      placeholder: ""
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: 漏洞简述
-      description: 请提供下漏洞的描述信息。
-      placeholder: ""
-    validations:
-      required: true
-  - type: textarea
-    attributes:
-      label: 影响性分析说明
-      description: 请描述下该漏洞的影响。
-      placeholder: ""
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: 原理分析
-      description: 请分析下该漏洞的原理。
-      placeholder: ""
-    validations:
-      required: false
-  - type: input
-    attributes:
-      label: 受影响版本
-      description: 请描述下该漏洞的影响版本。
-      placeholder: ""
-    validations:
-      required: false
-  - type: textarea
-    attributes:
-      label: 规避方案或消减措施
-      description: 请描述下该漏洞的规避方案或消减措施。
-      placeholder: ""
-    validations:
-      required: false

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

@@ -1,8 +0,0 @@
-### 一、修改说明
-
-
-### 二、变更内容
-
-
-### 三、测试建议
-

.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,54 +1,3 @@
-## 3.2.2-rc.1
-- Support EXIF metadata carried by images as display orientation
-
-## 3.2.2-rc.0
-- Add ImageKnifeComponent to destroy network request interruption
-- Code refactoring during the download of image resources stage
-
-## 3.2.1
-- Release official version
-
-## 3.2.1-rc.0
-- Fix bug: CropTransformation is used to crop the original image
-- Fix bug: After calling the clear all file cache interfaces, the file cache becomes invalid 
-- Optimize the efficiency of file cache initialization.
-- Add protection at the location where loadSrc is passed in the pixelmap type
-
-## 3.2.0
-- When successfully requesting the network, return the httpcode as well
-- Fix bug: Network error code httpCode returns no data
-- Modify implementation of ImageFit.Auto: do not modify image height
-- Modify memory cache limit and file cache limit
-- Fix record decodeEndTime in imageKinfaData
-- Add image buffersize in memory cache
-- Optimize the magic number of heif format image files
-- Fix bug: The width and height of the downsampling component are inconsistent with the image resolution unit
-
-## 3.2.0-rc.6
-- Support LogUtil to turn off log
-- Support set network request readTimeout and connectTimeout through ImageKnifeOption
-
-## 3.2.0-rc.5
-- Enhance: ImageFit.Auto support adaptive height after component width change
-- Fix bug: call onLoadStart 2 times(import from 3.2.0-rc.0)
-- Change the initial value of the PixelMap component of ImageKnife to ImageContent EMPTY
-- Clear memory cache, cancel pixel map release
-- Loading process log modification
-- Change the network request readTimeout to 30s
-
-## 3.2.0-rc.4
-- Support ICO format images
-- Fix bug: call reload problem in onLoadFailed
-- Provide default downsampling strategy to prevent slow loading for large images
-
-## 3.2.0-rc.3
-- Fix bug: PixelMap size exceeds the maximum value of memory cache and is not cached
-- Dealing with exception scenarios where imageSource.getImageInfo return undefined
-- Fix inability to parse Resource format images of other modules
-- Improve the error logs
-- Fix callback onLoadFailed when taskpool exception occurs
-- ImageKnife AnimatorComponent component adds rounded corner function
-
 ## 3.2.0-rc.2
 - Added callback information for image loading
 - Added the interface for obtaining the upper limit and size of the current cache and the number of images corresponding to the current cache
@@ -67,33 +16,6 @@
 - Fixed bug for receive only the first onLoadStart for concurrent identical requests
 - Modify the condition for determining whether to queue to be greater than or equal to maxRequests
 
-## 3.1.1-rc.1
-- Photo reduction sampling
-
-## 3.1.1-rc.0
-- 重构代码：抽取ImageKnifeDispatcher子线程requestJob相关代码到ImageKnifeLoader中，降低函数复杂度
-
-## 3.1.0
-- 部分静态webp图片有delay属性导致识别成动图,改用getFrameCount识别
-- 修复加载错误图后未去请求排队队列中的请求
-- 子线程本地Resource参数类型转换成number
-- 修改使用hilog记录日志，默认打开debug级别的日志
-- file格式图片，fd同步close
-- 解码pixelMap默认不可编辑，图形变化可编辑
-- 修改网络请求超时设置
-
-## 3.1.0-rc.2
-- 修复宽高不等svg图片显示有毛边
-
-## 3.1.0-rc.1
-- ImageKnifeAnimatorComponent新增开始、结束、暂停的回调事件
-- 文件缓存数量负数和超过INT最大值时默认为INT最大值
-
-## 3.1.0-rc.0
-- ComponentV2装饰器适配
-- imageKnifeOption={...}用法改为new ImageKnifeOption({...})
-- animatorOption={...}用法改为new AnimatorOption({...})
-
 ## 3.0.3
 - Released version 3.0.3
 

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>
@@ -27,7 +10,6 @@
             <filteritem type="filename" name="hvigorw" desc="hvigorw配置文件，DevEco Studio自动生成，不手动修改"/>
             <filteritem type="filename" name="hvigorw.bat" desc="hvigorw配置文件，DevEco Studio自动生成，不手动修改"/>
             <filteritem type="filename" name="hvigor-wrapper.js" desc="hvigorw配置文件，DevEco Studio自动生成，不手动修改"/>
-            <filteritem type="filename" name=".gitmodules" desc="git配置文件，不添加版权头"/>
             <filteritem type="filepath" name="library/src/main/ets/3rd_party/.*" desc="第三方开源软件源码，不修改版权头，以防有修改版权风险"/>
         </filefilter>
         <filefilter name="defaultPolicyFilter" desc="Filters for compatibility，license header policies">
@@ -38,7 +20,6 @@
             <filteritem type="filename" name="hvigorw" desc="hvigorw配置文件，DevEco Studio自动生成，不手动修改"/>
             <filteritem type="filename" name="hvigorw.bat" desc="hvigorw配置文件，DevEco Studio自动生成，不手动修改"/>
             <filteritem type="filename" name="hvigor-wrapper.js" desc="hvigorw配置文件，DevEco Studio自动生成，不手动修改"/>
-            <filteritem type="filename" name=".gitmodules" desc="git配置文件，不添加版权头"/>
             <filteritem type="filepath" name="library/src/main/ets/3rd_party/.*" desc="第三方开源软件源码，不修改版权头，以防有修改版权风险"/>
         </filefilter>
         <filefilter name="binaryFileTypePolicyFilter" desc="Filters for binary file policies">
@@ -50,7 +31,6 @@
             <filteritem type="filename" name="*.gif" desc="gif图片格式文件,用于展示示例"/>
             <filteritem type="filename" name="*.jpg" desc="jpg图片格式文件,用于展示示例"/>
             <filteritem type="filename" name="*.jpeg" desc="jpeg图片格式文件,用于展示示例"/>
-            <filteritem type="filename" name="*.heic" desc="heic图片格式文件,用于展示示例"/>
             <filteritem type="filename" name="*.json5" desc="hvigor配置文件"/>
         </filefilter>
         <filefilter name="defaultFilter" desc="Files not to check">

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

@@ -1,9 +1,3 @@
-## 🚨 **重要提示 | IMPORTANT**
->
-> **⚠️ 此代码仓已归档。新地址请访问 [ImageKnife](https://gitcode.com/openharmony-tpc/ImageKnife)。| ⚠️ This repository has been archived. For the new address, please visit [ImageKnife](https://gitcode.com/openharmony-tpc/ImageKnife).**
->
----
->
 # ImageKnife
 
 ImageKnife is a specially crafted image loading and caching library for OpenHarmony, optimized for efficiency, lightness, and simplicity.
@@ -367,14 +361,6 @@ This project has been verified in the following version:
 
 DevEco Studio: NEXT Beta1-5.0.3.806, SDK: API12 Release(5.0.0.66)
 
-## About obfuscation
-- Code obfuscation, please see[Code Obfuscation](https://docs.openharmony.cn/pages/v5.0/zh-cn/application-dev/arkts-utils/source-obfuscation.md)
-- If you want the imageknife library not to be obfuscated during code obfuscation, you need to add corresponding exclusion rules in the obfuscation rule configuration file obfuscation-rules.txt：
-```
--keep
-./oh_modules/@ohos/imageknife
-```
-
 ## How to Contribute
 
 If you find any problem during the use, submit an [Issue](https://gitee.com/openharmony-tpc/ImageKnife/issues) or a [PR](https://gitee.com/openharmony-tpc/ImageKnife/issues) to us.

README_zh.md

@@ -1,9 +1,3 @@
-## 🚨 **重要提示 | IMPORTANT**
->
-> **⚠️ 此代码仓已归档。新地址请访问 [ImageKnife](https://gitcode.com/openharmony-tpc/ImageKnife)。| ⚠️ This repository has been archived. For the new address, please visit [ImageKnife](https://gitcode.com/openharmony-tpc/ImageKnife).**
->
----
->
 # ImageKnife
 
 **专门为OpenHarmony打造的一款图像加载缓存库，致力于更高效、更轻便、更简单。**
@@ -273,21 +267,21 @@ ImageKnifeAnimatorComponent({
 
 #### 11.加载图片回调信息数据 示例
 ```
-ImageKnifeComponent({ ImageKnifeOption: = {
+ImageKnifeComponent({ ImageKnifeOption: = new ImageKnifeOption({
                 loadSrc: $r('app.media.pngSample'),
                 objectFit: ImageFit.Contain,
                 onLoadListener: {
                   onLoadStart: (req) => {
-                    let startCallBackData = JSON.stringify(req?.imageKnifeData);
+                    let startCallBackData = JSON.stringify(req?.getImageKnifeData());
                   },
                   onLoadFailed: (res, req) => {
-                    let failedBackData = res + ";" + JSON.stringify(req?.imageKnifeData);
+                    let failedBackData = res + ";" + JSON.stringify(req?.getImageKnifeData());
                   },
                   onLoadSuccess: (data, imageData, req) => {
-                    let successBackData = JSON.stringify(req?.imageKnifeData);
+                    let successBackData = JSON.stringify(req?.getImageKnifeData());
                   },
                   onLoadCancel: (res, req) => {
-                    let cancelBackData = res + ";" + JSON.stringify(req?.imageKnifeData);
+                    let cancelBackData = res + ";" + JSON.stringify(req?.getImageKnifeData());
                   }
                 },
                 border: { radius: 50 },
@@ -296,7 +290,7 @@ ImageKnifeComponent({ ImageKnifeOption: = {
                     let render_success = JSON.stringify(Date.now())
                   }
                 }
-              }
+              })
 }).width(100).height(100)
 ```
 #### 12.图片降采样 示例
@@ -310,33 +304,6 @@ ImageKnifeComponent({
         }
       }).width(300).height(300)
 ```
-#### 13.rcp自定义网络请求
-```
-ImageKnifeComponent({
-    loadSrc:"http//xx.xx",
-    customGetImage:custom
-})
-// 自定义下载方法
-@Concurrent
-async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
-  return new Promise((resolve,reject)=>{
-    if (typeof src == "string") {
-      let session = GetSession.session
-      let req = new rcp.Request(src,"GET");
-      session.fetch(req).then((response)=>{
-        if(response.statusCode == 200) {
-          let buffer = response.body
-          resolve(buffer)
-        } else {
-          reject("rcp code:"+response.statusCode)
-        }
-      }).catch((err:BusinessError)=>{
-        reject("error rcp src:"+src+",err:"+JSON.stringify(err))
-      })
-    }
-  })
-}
-```
 
 #### 复用场景
 在aboutToRecycle生命周期清空组件内容；通过watch监听触发图片的加载。
@@ -361,40 +328,39 @@ async function custom(context: Context, src: string | PixelMap | Resource,header
 
 ### ImageKnifeOption参数列表
 
-| 参数名称                  | 入参内容                                                                                                                                                                                                                                                                                            | 功能简介            |
-|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|-----------------|
-| loadSrc               | string、PixelMap、Resource                                                                                                                                                                                                                                                                        | 主图展示            |
-| placeholderSrc        | PixelMap、Resource                                                                                                                                                                                                                                                                               | 占位图图展示（可选）      |
-| errorholderSrc        | PixelMap、Resource                                                                                                                                                                                                                                                                               | 错误图展示（可选）       |
-| objectFit             | ImageFit                                                                                                                                                                                                                                                                                        | 主图填充效果（可选）      |
-| placeholderObjectFit  | ImageFit                                                                                                                                                                                                                                                                                        | 占位图填充效果（可选）     |
-| errorholderObjectFit  | ImageFit                                                                                                                                                                                                                                                                                        | 错误图填充效果（可选）     |
-| writeCacheStrategy    | CacheStrategyType                                                                                                                                                                                                                                                                               | 写入缓存策略(可选)      |
-| onlyRetrieveFromCache | boolean                                                                                                                                                                                                                                                                                         | 是否跳过网络和本地请求（可选） |
-| customGetImage        | customGetImage?:(context: Context, src: string、PixelMap、Resource ,headers?: Record<string, Object>) => Promise<ArrayBuffer、undefined>                                                                                                                                                           | 自定义下载图片（可选）     |                                                                                                                                                                              | Resource                                      | 错误占位图数据源                    |
-| border                | BorderOptions                                                                                                                                                                                                                                                                                   | 边框圆角（可选）        |
-| priority              | taskpool.Priority                                                                                                                                                                                                                                                                               | 加载优先级（可选）       | 
-| context               | common.UIAbilityContext                                                                                                                                                                                                                                                                         | 上下文（可选）         |
-| progressListener      | (progress: number)=>void                                                                                                                                                                                                                                                                        | 进度（可选）          |
-| signature             | String                                                                                                                                                                                                                                                                                          | 自定义缓存关键字（可选）    | 
-| headerOption          | Array<HeaderOptions>                                                                                                                                                                                                                                                                            | 设置请求头（可选）       |
-| transformation        | PixelMapTransformation                                                                                                                                                                                                                                                                          | 图片变换（可选）        |
-| drawingColorFilter    | ColorFilter、drawing.ColorFilter                                                                                                                                                                                                                                                                 | 颜色滤镜效果（可选）      |
-| onComplete            | (event:EventImage、undefined) => void                                                                                                                                                                                                                                                            | 图片成功回调事件(可选)    |
-| onLoadListener        | onLoadStart?: (req?: ImageKnifeRequest) => void,onLoadSuccess?: (data: string \| PixelMap \| undefined, imageData: ImageKnifeData, req?: ImageKnifeRequest) => void,onLoadFailed?: (err: string, req?: ImageKnifeRequest) => void,onLoadCancel?: (res: string, req?: ImageKnifeRequest) => void | 监听图片加载成功与失败     |
-| downsampleOf          | DownsampleStrategy                                                                                                                                                                                                                                                                              | 降采样（可选）         |
-| httpOption             | HttpRequestOption                                                                                                                                                                                                                                                                               | 网络请求配置（可选）      | 
+| 参数名称                  | 入参内容                                                                                                                                                                                                                                                                                            | 功能简介                |
+|-----------------------|-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------|
+| loadSrc               | string、PixelMap、Resource                                                                                                                                                                                                                                                                        | 主图展示                |
+| placeholderSrc        | PixelMap、Resource                                                                                                                                                                                                                                                                               | 占位图图展示（可选）          |
+| errorholderSrc        | PixelMap、Resource                                                                                                                                                                                                                                                                               | 错误图展示（可选）           |
+| objectFit             | ImageFit                                                                                                                                                                                                                                                                                        | 主图填充效果（可选）          |
+| placeholderObjectFit  | ImageFit                                                                                                                                                                                                                                                                                        | 占位图填充效果（可选）         |
+| errorholderObjectFit  | ImageFit                                                                                                                                                                                                                                                                                        | 错误图填充效果（可选）         |
+| writeCacheStrategy    | CacheStrategyType                                                                                                                                                                                                                                                                               | 写入缓存策略(可选)          |
+| onlyRetrieveFromCache | boolean                                                                                                                                                                                                                                                                                         | 是否跳过网络和本地请求（可选）     |
+| customGetImage        | customGetImage?:(context: Context, src: string、PixelMap、Resource ,headers?: Record<string, Object>) => Promise<ArrayBuffer、undefined>                                                                                                                                                           | 自定义下载图片（可选）         |                                                                                                                                                                              | Resource                                      | 错误占位图数据源                    |
+| border                | BorderOptions                                                                                                                                                                                                                                                                                   | 边框圆角（可选）            |
+| priority              | taskpool.Priority                                                                                                                                                                                                                                                                               | 加载优先级（可选）           | 
+| context               | common.UIAbilityContext                                                                                                                                                                                                                                                                         | 上下文（可选）             |
+| progressListener      | (progress: number)=>void                                                                                                                                                                                                                                                                        | 进度（可选）              |
+| signature             | String                                                                                                                                                                                                                                                                                          | 自定义缓存关键字（可选）        | 
+| headerOption          | Array<HeaderOptions>                                                                                                                                                                                                                                                                            | 设置请求头（可选）           |
+| transformation        | PixelMapTransformation                                                                                                                                                                                                                                                                          | 图片变换（可选）            |
+| drawingColorFilter    | ColorFilter、drawing.ColorFilter                                                                                                                                                                                                                                                                 | 图片变换（可选）        |
+| onComplete            | (event:EventImage、undefined) => void                                                                                                                                                                                                                                                            | 颜色滤镜效果（可选）        |
+| onLoadListener        | onLoadStart?: (req?: ImageKnifeRequest) => void,onLoadSuccess?: (data: string \| PixelMap \| undefined, imageData: ImageKnifeData, req?: ImageKnifeRequest) => void,onLoadFailed?: (err: string, req?: ImageKnifeRequest) => void,onLoadCancel?: (res: string, req?: ImageKnifeRequest) => void | 监听图片加载成功与失败         |
+| downsampleOf          | DownsampleStrategy                                                                                                                                                                                                                                                                              | 降采样（可选）             |
 
 ### 降采样类型
-| 类型                     | 相关描述              |
-|------------------------|-------------------|
-| NONE                   | 不进行降采样            |
-| AT_MOST                | 请求尺寸大于实际尺寸不进行放大   |
-| FIT_CENTER_MEMORY      | 两边自适应内存优先             |
-| FIT_CENTER_QUALITY     | 两边自适应质量优先             |
-| CENTER_INSIDE_MEMORY   | 宽高缩放比最大的比例，进行缩放适配内存优先 |
-| CENTER_INSIDE_QUALITY | 宽高缩放比最大的比例，进行缩放适配质量优先 |
-| AT_LEAST               | 根据宽高的最小的比例，进行适配   |
+| 类型                  | 相关描述              |
+|---------------------|-------------------|
+| NONE                | 不进行降采样            |
+| AT_MOST             | 请求尺寸大于实际尺寸不进行放大   |
+| FIT_CENTER_MEMORY          | 两边自适应内存优先             |
+| FIT_CENTER_QUALITY          | 两边自适应质量优先             |
+| CENTER_OUTSIDE_MEMORY       | 宽高缩放比最大的比例，进行缩放适配内存优先 |
+| CENTER_OUTSIDE_QUALITY       | 宽高缩放比最大的比例，进行缩放适配质量优先 |
+| AT_LEAST      | 根据宽高的最小的比例，进行适配   |
 
 ### ImageKnife接口
 
@@ -463,14 +429,6 @@ async function custom(context: Context, src: string | PixelMap | Resource,header
 在下述版本验证通过：  
 DevEco Studio: NEXT Beta1-5.0.3.806, SDK: API12 Release(5.0.0.66)
 
-## 关于混淆
-- 代码混淆，请查看[代码混淆简介](https://docs.openharmony.cn/pages/v5.0/zh-cn/application-dev/arkts-utils/source-obfuscation.md)
-- 如果希望imageknife库在代码混淆过程中不会被混淆，需要在混淆规则配置文件obfuscation-rules.txt中添加相应的排除规则：
-
-```
--keep
-./oh_modules/@ohos/imageknife
-```
 ## 贡献代码
 
 使用过程中发现任何问题都可以提 [issue](https://gitee.com/openharmony-tpc/ImageKnife/issues)
@@ -483,3 +441,4 @@ DevEco Studio: NEXT Beta1-5.0.3.806, SDK: API12 Release(5.0.0.66)
 ## 遗留问题
 
 - ImageKnifeAnimator组件无法设置ImageFit属性
+- ImageKnifeAnimator组件设置border属性无法将图片变为圆角

build-profile.json5

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

entry/obfuscation-rules.txt

@@ -16,6 +16,3 @@
 # Keep options:
 # -keep-property-name: specifies property names that you want to keep
 # -keep-global-name: specifies names that you want to keep in the global scope
-
--keep
-./oh_modules/@ohos/imageknife

entry/src/main/ets/pages/AutoImageFit.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 { ImageKnifeComponent } from '@ohos/libraryimageknife';
-import { display } from '@kit.ArkUI';
-
-@Entry
-@Component
-struct AutoImageFit {
-  @State imageWidth: number = 200;
-  private maxWidth: number = px2vp(display.getDefaultDisplaySync().width);
-
-  build() {
-
-    Column() {
-      this.Slider()
-      Column() {
-        Text('Image')
-        Image('https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg')
-          .width('100%')
-          .objectFit(ImageFit.Auto)
-        Text('ImageKnife')
-        ImageKnifeComponent({
-          imageKnifeOption: {
-            loadSrc: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg',
-            objectFit: ImageFit.Auto,
-          }
-        }).width('100%')
-      }.width(this.imageWidth).border({ width: 1 })
-    }
-  }
-
-  @Builder
-  Slider() {
-    Slider({
-      value: this.imageWidth,
-      min: 100,
-      max: this.maxWidth,
-      style: SliderStyle.OutSet
-    })
-      .blockColor(Color.White)
-      .width('100%')
-      .onChange((value: number) => {
-        this.imageWidth = value;
-      })
-  }
-}

entry/src/main/ets/pages/CustomNetImagePage.ets

@@ -0,0 +1,78 @@
+/*
+ * 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, ImageKnife } from '@ohos/libraryimageknife';
+import { CommonDataSource, GetSession } from './model/CommonDataSource';
+import { rcp } from '@kit.RemoteCommunicationKit';
+import { BusinessError } from '@kit.BasicServicesKit';
+
+@Entry
+@Component
+export struct CustomNetImagePage {
+  @State hotCommendList:CommonDataSource<InfoItem> = new CommonDataSource<InfoItem>([])
+  aboutToAppear(): void {
+    ImageKnife.getInstance().setMaxRequests(32)
+    this.hotCommendList.addData(this.hotCommendList.totalCount(),PageViewModel.getItems())
+  }
+  aboutToDisappear(): void {
+    ImageKnife.getInstance().setMaxRequests(8)
+  }
+  build() {
+    Column() {
+      WaterFlow() {
+        LazyForEach(this.hotCommendList,(item: InfoItem)=>{
+          FlowItem() {
+            Column(){
+              ImageKnifeComponent({
+                imageKnifeOption: {
+                  loadSrc: item.albumUrl,
+                  placeholderSrc: $r("app.media.loading"),
+                  errorholderSrc: $r("app.media.failed"),
+                  customGetImage:custom
+                }
+              }).width("50%").height(200)
+            }
+          }.height(200)
+          .backgroundColor("#95efd2")
+        },(item: string) => item)
+      }.columnsTemplate("1fr 1fr")
+      .columnsGap(10)
+      .rowsGap(5)
+      .backgroundColor(0xFAEEE0)
+      .width("100%").height("100%")
+    }
+  }
+}
+// 自定义下载方法
+@Concurrent
+async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
+  return new Promise((resolve,reject)=>{
+    if (typeof src == "string") {
+      let session = GetSession.session
+      let req = new rcp.Request(src,"GET");
+      session.fetch(req).then((response)=>{
+        if(response.statusCode == 200) {
+          let buffer = response.body
+          resolve(buffer)
+        } else {
+          reject("rcp code:"+response.statusCode)
+        }
+      }).catch((err:BusinessError)=>{
+        reject("error rcp src:"+src+",err:"+JSON.stringify(err))
+      })
+    }
+  })
+}

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

@@ -24,8 +24,8 @@ import { FileTypeUtil } from '@ohos/imageknife/src/main/ets/utils/FileTypeUtil';
 struct DownSamplePage {
   @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r('app.media.startIcon'),
-    placeholderSrc: $r('app.media.loading'),
-    errorholderSrc: $r('app.media.app_icon'),
+    placeholderSrc: $r("app.media.loading"),
+    errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Contain
   }
   isBrightness: boolean = false
@@ -33,14 +33,14 @@ struct DownSamplePage {
   @State afterSampling: number = 0
   @State SamplingList: SamplingType[] = [
 
-    new SamplingType(7, 'AT_LEAST'),
-    new SamplingType(1, 'AT_MOST'),
+    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_INSIDE_MEMORY'),
-    new SamplingType(6, 'CENTER_INSIDE_QUALITY'),
-    new SamplingType(0, 'NONE'),
+    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"),
 
   ]
   @State checked: boolean = false
@@ -49,8 +49,8 @@ struct DownSamplePage {
     if (value === 'NONE') {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
         downsampleOf: DownsampleStrategy.NONE
       }
@@ -59,8 +59,8 @@ struct DownSamplePage {
     } else if (value === 'AT_MOST') {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
         downsampleOf: DownsampleStrategy.AT_MOST
       }
@@ -69,8 +69,8 @@ struct DownSamplePage {
     } else if (value === 'FIT_CENTER_MEMORY') {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
         downsampleOf: DownsampleStrategy.FIT_CENTER_MEMORY
       }
@@ -79,38 +79,38 @@ struct DownSamplePage {
     } else if (value === 'FIT_CENTER_QUALITY') {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
         downsampleOf: DownsampleStrategy.FIT_CENTER_QUALITY
       }
       this.originalPixMap($r('app.media.pngSample'))
       this.afterSamplingFunc($r('app.media.pngSample'))
-    } else if (value === 'CENTER_INSIDE_MEMORY') {
+    } else if (value === 'CENTER_OUTSIDE_MEMORY') {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
-        downsampleOf: DownsampleStrategy.CENTER_INSIDE_MEMORY
+        downsampleOf: DownsampleStrategy.CENTER_OUTSIDE_MEMORY
       }
       this.originalPixMap($r('app.media.pngSample'))
       this.afterSamplingFunc($r('app.media.pngSample'))
-    } else if (value === 'CENTER_INSIDE_QUALITY') {
+    } else if (value === 'CENTER_OUTSIDE_QUALITY') {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
-        downsampleOf: DownsampleStrategy.CENTER_INSIDE_QUALITY
+        downsampleOf: DownsampleStrategy.CENTER_OUTSIDE_QUALITY
       }
       this.originalPixMap($r('app.media.pngSample'))
       this.afterSamplingFunc($r('app.media.pngSample'))
     } else {
       this.imageKnifeOption = {
         loadSrc: $r('app.media.pngSample'),
-        placeholderSrc: $r('app.media.loading'),
-        errorholderSrc: $r('app.media.app_icon'),
+        placeholderSrc: $r("app.media.loading"),
+        errorholderSrc: $r("app.media.app_icon"),
         objectFit: ImageFit.Contain,
         downsampleOf: DownsampleStrategy.AT_LEAST
       }
@@ -145,12 +145,9 @@ struct DownSamplePage {
 
     // 创建pixelMap
     imageSource.createPixelMap(decodingOptions).then((pixelMap: image.PixelMap) => {
-      imageSource.release()
       this.afterSampling = pixelMap.getPixelBytesNumber()
-      pixelMap.release()
     }).catch((err: BusinessError) => {
-      imageSource.release()
-      console.error('Failed to create PixelMap')
+      console.error("Failed to create PixelMap")
     });
   }
 
@@ -163,12 +160,9 @@ struct DownSamplePage {
     }
     // 创建pixelMap
     imageSource.createPixelMap(decodingOptions).then((pixelMap: image.PixelMap) => {
-      imageSource.release()
       this.beforeSampling = pixelMap.getPixelBytesNumber()
-      pixelMap.release()
     }).catch((err: BusinessError) => {
-      imageSource.release()
-      console.error('Failed to create PixelMap')
+      console.error("Failed to create PixelMap")
     });
   }
   getResourceString(res:Resource){
@@ -197,8 +191,8 @@ struct DownSamplePage {
         ImageKnifeComponent({
           imageKnifeOption: this.imageKnifeOption
         })
-          .height(px2vp(300))
-          .width(px2vp(300))
+          .height(300)
+          .width(300)
           .borderWidth(1)
           .borderColor(Color.Pink)
       }

entry/src/main/ets/pages/ErrorMessageDownload.ets

@@ -1,93 +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 { ImageKnifeComponent } from '@ohos/libraryimageknife'
-@Entry
-@Component
-struct ErrorMessageDownload {
-  @State httpCode: string = ''
-  @State httpError: string = ''
-  @State storageError: string = ''
-  @State fileError: string = ''
-  @State notPic: string = ''
-  build() {
-    Column() {
-      Text(this.httpCode)
-      ImageKnifeComponent({
-        imageKnifeOption:{
-          loadSrc:'https://gitee.com/openharmony-tpc/ImageKnife/issues/1111111',
-          errorholderSrc:$r('app.media.failed'),
-          onLoadListener:{
-            onLoadFailed:(err)=>{
-              this.httpCode = err
-            }
-          }
-        }
-      }).width(100).height(100).margin({bottom:10})
-
-      Text(this.httpError)
-      ImageKnifeComponent({
-        imageKnifeOption:{
-          loadSrc:'https://xx.xx.xx',
-          errorholderSrc:$r('app.media.failed'),
-          onLoadListener:{
-            onLoadFailed:(err)=>{
-              this.httpError = err
-            }
-          }
-        }
-      }).width(100).height(100).margin({bottom:10})
-
-      Text(this.storageError)
-      ImageKnifeComponent({
-        imageKnifeOption:{
-          loadSrc:'/data/storage/el2/base/haps/entry/cache/a/b',
-          errorholderSrc:$r('app.media.failed'),
-          onLoadListener:{
-            onLoadFailed:(err)=>{
-              this.storageError = err
-            }
-          }
-        }
-      }).width(100).height(100).margin({bottom:10})
-
-      Text(this.fileError)
-      ImageKnifeComponent({
-        imageKnifeOption:{
-          loadSrc:'file://xx.xx.xx',
-          errorholderSrc:$r('app.media.failed'),
-          onLoadListener:{
-            onLoadFailed:(err)=>{
-              this.fileError = err
-            }
-          }
-        }
-      }).width(100).height(100).margin({bottom:10})
-
-      Text(this.notPic)
-      ImageKnifeComponent({
-        imageKnifeOption:{
-          loadSrc:'xx.xx.xx',
-          errorholderSrc:$r('app.media.failed'),
-          onLoadListener:{
-            onLoadFailed:(err)=>{
-              this.notPic = err
-            }
-          }
-        }
-      }).width(100).height(100).margin({bottom:10})
-    }
-  }
-}

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

@@ -12,91 +12,82 @@
  * 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
 @Component
 struct ImageAnimatorPage {
   @State animatorOption: AnimatorOption = {
     state: AnimationStatus.Running,
-    iterations: -1,
-    onFinish: () => {
-      console.log('ImageKnifeAnimatorComponent animatorOption onFinish')
+    iterations: 1,
+    onFinish:()=>{
+      console.log("ImageKnifeAnimatorComponent animatorOption onFinish")
     },
-    onStart: () => {
-      console.log('ImageKnifeAnimatorComponent animatorOption onStart')
+    onStart:()=>{
+      console.log("ImageKnifeAnimatorComponent animatorOption onStart")
     },
-    onPause: () => {
-      console.log('ImageKnifeAnimatorComponent animatorOption onPause')
+    onPause:()=>{
+      console.log("ImageKnifeAnimatorComponent animatorOption onPause")
     },
-    onCancel: () => {
-      console.log('ImageKnifeAnimatorComponent animatorOption onCancel')
+    onCancel:()=>{
+      console.log("ImageKnifeAnimatorComponent animatorOption onCancel")
     },
-    onRepeat: () => {
-      console.log('ImageKnifeAnimatorComponent animatorOption onRepeat')
+    onRepeat:()=>{
+      console.log("ImageKnifeAnimatorComponent animatorOption onRepeat")
     }
   }
-  @State animatorOptionFirstFrame: AnimatorOption = {
+  @State animatorOption1: AnimatorOption = {
     state: AnimationStatus.Initial
   }
-  @State animatorOptionLastFrame: AnimatorOption = {
+  @State animatorOption2: AnimatorOption = {
     state: AnimationStatus.Initial,
     reverse: true
   }
-  @State imageKnifeOption: ImageKnifeOption = {
-    loadSrc: 'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
-    placeholderSrc: $r('app.media.loading'),
-    errorholderSrc: $r('app.media.failed')
-  }
-
   build() {
-    Column() {
-      Row() {
-        Button($r('app.string.Play')).onClick(() => {
+    Column(){
+      Flex(){
+        Button($r('app.string.Play')).onClick(()=>{
           this.animatorOption.state = AnimationStatus.Running
         })
-        Button($r('app.string.Pause')).onClick(() => {
+        Button($r('app.string.Pause')).onClick(()=>{
           this.animatorOption.state = AnimationStatus.Paused
         })
-        Button($r('app.string.Stop')).onClick(() => {
+        Button($r('app.string.Stop')).onClick(()=>{
           this.animatorOption.state = AnimationStatus.Stopped
         })
-      }
-
-      Row() {
-        Button($r('app.string.Infinite_loop')).onClick(() => {
+        Button($r('app.string.Infinite_loop')).onClick(()=>{
           this.animatorOption.iterations = -1
         })
-        Button($r('app.string.Play_once')).onClick(() => {
+        Button($r('app.string.Play_once')).onClick(()=>{
           this.animatorOption.iterations = 1
         })
-        Button($r('app.string.Play_twice')).onClick(() => {
+        Button($r('app.string.Play_twice')).onClick(()=>{
           this.animatorOption.iterations = 2
         })
       }
-
       ImageKnifeAnimatorComponent({
-        imageKnifeOption: this.imageKnifeOption,
-        animatorOption: this.animatorOption
-      }).width(300).height(300).backgroundColor(Color.Orange).margin({ top: 30 })
-
-      Row({ space: 10 }) {
-        Column() {
-          Text($r('app.string.Display_the_first_frame')).fontSize(20)
-          ImageKnifeAnimatorComponent({
-            imageKnifeOption: this.imageKnifeOption,
-            animatorOption: this.animatorOptionFirstFrame
-          }).width(120).height(120).backgroundColor(Color.Orange)
-        }
-
-        Column() {
-          Text($r('app.string.Display_the_last_frame')).fontSize(20)
-          ImageKnifeAnimatorComponent({
-            imageKnifeOption: this.imageKnifeOption,
-            animatorOption: this.animatorOptionLastFrame
-          }).width(120).height(120).backgroundColor(Color.Orange)
-        }
-      }.margin({ top: 50 }).padding(10)
-    }.width('100%').height('100%')
+        imageKnifeOption:{
+          loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
+          placeholderSrc:$r('app.media.loading'),
+          errorholderSrc:$r('app.media.failed')
+        },animatorOption:this.animatorOption
+      }).width(300).height(300).backgroundColor(Color.Orange).margin({top:30})
+      Text($r('app.string.Display_the_first_frame')).fontSize(20)
+      ImageKnifeAnimatorComponent({
+        imageKnifeOption:{
+          loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
+          placeholderSrc:$r('app.media.loading'),
+          errorholderSrc:$r('app.media.failed')
+        },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:{
+          loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
+          placeholderSrc:$r('app.media.loading'),
+          errorholderSrc:$r('app.media.failed')
+        },animatorOption:this.animatorOption2
+      }).width(200).height(200).backgroundColor(Color.Orange).margin({top:30})
+    }.width("100%").height("100%")
   }
 }

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

@@ -19,7 +19,6 @@ import { ImageKnifeRequest,ImageKnife,ImageKnifeComponent } from '@ohos/libraryi
 @Entry
 @Component
 struct ImageKnifeReload {
-  @State index: number = 0
   aboutToAppear(): void {
     NetWatchState.init()
   }
@@ -27,7 +26,7 @@ struct ImageKnifeReload {
     Column() {
       ImageKnifeComponent({
         imageKnifeOption:{
-          loadSrc:'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
+          loadSrc:"https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           onLoadListener:{
@@ -39,7 +38,7 @@ struct ImageKnifeReload {
       }).width(200).height(200)
       ImageKnifeComponent({
         imageKnifeOption:{
-          loadSrc:'https://img-blog.csdn.net/20140514114029140',
+          loadSrc:"https://img-blog.csdn.net/20140514114029140",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           onLoadListener:{
@@ -49,24 +48,8 @@ struct ImageKnifeReload {
           }
         }
       }).width(200).height(200).margin({top:10})
-      Text("重试5次：" + this.index)
-      ImageKnifeComponent({
-        imageKnifeOption:{
-          loadSrc:'https://img-blog.csdn.net/20140514114029140',
-          placeholderSrc:$r('app.media.loading'),
-          errorholderSrc:$r('app.media.failed'),
-          onLoadListener:{
-            onLoadFailed:(err,request) => {
-              this.index++
-              if(request != undefined && this.index < 5) {
-                ImageKnife.getInstance().reload(request)
-              }
-            }
-          }
-        }
-      }).width(200).height(200).margin({top:10})
-    }.width('100%')
-    .height('100%')
+    }.width("100%")
+    .height("100%")
   }
 }
 
@@ -80,7 +63,7 @@ class NetWatchState {
     NetWatchState.netConnection.register(()=>{
     })
     // 订阅网络能力变化事件。调用register后，才能接收到此事件通知
-    NetWatchState.netConnection.on('netCapabilitiesChange',(data:connection.NetCapabilityInfo)=>{
+    NetWatchState.netConnection.on("netCapabilitiesChange",(data:connection.NetCapabilityInfo)=>{
       if(NetWatchState.requestList.length > 0 && data.netHandle.netId >= 100) {
         NetWatchState.requestList.forEach((request)=>{
           ImageKnife.getInstance().reload(request)

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

@@ -39,8 +39,8 @@ import { collections } from '@kit.ArkTS'
 struct ImageTransformation {
   @State imageKnifeOption: ImageKnifeOption = {
     loadSrc: $r('app.media.pngSample'),
-    placeholderSrc: $r('app.media.loading'),
-    errorholderSrc: $r('app.media.app_icon'),
+    placeholderSrc: $r("app.media.loading"),
+    errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Contain
   }
   @State isRound: boolean = false;
@@ -398,13 +398,13 @@ struct ImageTransformation {
       transformations.push(new CropSquareTransformation());
     }
     if (this.isCropTop) {
-      transformations.push(new CropTransformation(100, 100, 0));
+      transformations.push(new CropTransformation(25, 25, 0));
     }
     if (this.isCropCenter) {
-      transformations.push(new CropTransformation(100, 100, 1));
+      transformations.push(new CropTransformation(25, 25, 1));
     }
     if (this.isCropBottom) {
-      transformations.push(new CropTransformation(100, 100, 2));
+      transformations.push(new CropTransformation(25, 25, 2));
     }
     if (this.isSepia) {
       transformations.push(new SepiaTransformation());
@@ -414,8 +414,8 @@ struct ImageTransformation {
     }
     this.imageKnifeOption = {
       loadSrc: $r('app.media.pngSample'),
-      placeholderSrc: $r('app.media.loading'),
-      errorholderSrc: $r('app.media.app_icon'),
+      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

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

@@ -50,21 +50,16 @@ struct Index {
             uri: 'pages/SetMaxRequestPage',
           });
         })
-        Button($r('app.string.Single_CallBack')).margin({top:10}).onClick(()=>{
-          router.push({
-            uri: 'pages/SingleImageCallBack',
-          });
-        })
-        Button($r('app.string.Multiple_CallBack')).margin({top:10}).onClick(()=>{
-          router.push({
-            uri: 'pages/MultipleImageCallBack',
-          });
-        })
         Button($r('app.string.Test_multiple_images')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestCommonImage',
           });
         })
+        Button($r('app.string.Customize_RCP_network')).margin({top:10}).onClick(()=>{
+          router.push({
+            uri: 'pages/CustomNetImagePage',
+          });
+        })
         Button($r('app.string.Test_Task_error')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestTaskResourcePage',
@@ -82,24 +77,19 @@ struct Index {
 
           });
         })
-        Button($r('app.string.Test_LocalImageShow')).margin({top:10}).onClick(()=>{
-          router.push({
-            uri: 'pages/LocalImage',
-
-          });
-        })
-        Button($r('app.string.Error_Message')).margin({top:10}).onClick(()=>{
-          router.push({
-            uri: 'pages/ErrorMessageDownload',
-          });
-        })
         Button($r('app.string.Test_custom_download')).margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestSetCustomImagePage',
 
           });
         })
-        Button(this.getResourceString($r('app.string.Multiple_images')) + ' + reuse + LazyForeach').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',
 
@@ -116,19 +106,13 @@ struct Index {
 
           });
         })
-        Button($r('app.string.Auto_ImageFit')).margin({top:10}).onClick(()=>{
-          router.push({
-            uri: 'pages/AutoImageFit',
-
-          });
-        })
         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(()=>{
+        Button(this.getResourceString($r('app.string.Message_list')) + " + List").margin({top:10}).onClick(()=>{
           router.push({
             uri: 'pages/TestImageFlash',
 
@@ -224,11 +208,6 @@ struct Index {
 
           });
         })
-        Button($r('app.string.test_exif')).margin({ top: 10 }).onClick(() => {
-          router.push({
-            uri: 'pages/TestImageExif',
-          });
-        })
       }
     } .width('100%')
     .height('100%')

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

@@ -37,13 +37,13 @@ export struct LazyForEachCache {
                 }
               }).width(100).height(100)
               Text(`${index}`)
-            }.border({ width: 5 , color: '#000000'})
+            }.border({ width: 5 , color: "#000000"})
           }
         })
       }
       .cachedCount(5)
-      .width('100%')
-      .height('100%')
+      .width("100%")
+      .height("100%")
       .margin({ left: 10, right: 10 })
       .layoutWeight(1)
     }

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

@@ -37,13 +37,13 @@ export struct LazyForEachCount {
                 }
               }).width(100).height(100)
               Text(`${index}`)
-            }.border({ width: 5 , color: '#000000'})
+            }.border({ width: 5 , color: "#000000"})
           }
         })
       }
       .cachedCount(30)
-      .width('100%')
-      .height('100%')
+      .width("100%")
+      .height("100%")
       .margin({ left: 10, right: 10 })
       .layoutWeight(1)
     }

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

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife'
+import { ImageKnifeComponent, ImageKnifeOption } from "@ohos/libraryimageknife"
 import matrix4 from '@ohos.matrix4'
 
 @Entry
@@ -22,13 +22,13 @@ struct LoadStatePage {
   starTime:number = new Date().getTime()
 
   @State ImageKnifeOption: ImageKnifeOption = {
-    loadSrc: $r('app.media.rabbit'),
-    placeholderSrc: $r('app.media.loading'),
-    errorholderSrc: $r('app.media.app_icon'),
+    loadSrc: $r("app.media.rabbit"),
+    placeholderSrc: $r("app.media.loading"),
+    errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Contain,
     onLoadListener: {
       onLoadFailed: (err) => {
-        console.error('Load Failed Reason: ' + err);
+        console.error("Load Failed Reason: " + err);
       },
       onLoadSuccess: (data) => {
         return data;
@@ -39,10 +39,10 @@ struct LoadStatePage {
   @State imageKnifeOption1: ImageKnifeOption = {
     loadSrc: $r('app.media.startIcon')
   }
-  @State message: string = ''
+  @State message: string = ""
   @State currentWidth: number = 200
   @State currentHeight: number = 200
-  @State typeValue: string = ''
+  @State typeValue: string = ""
   build() {
     Column() {
       Text($r('app.string.TIPS'))
@@ -51,20 +51,20 @@ struct LoadStatePage {
         Button($r('app.string.Test_failure_success'))
           .onClick(() => {
             this.ImageKnifeOption = {
-              loadSrc: 'https://www.openharmony.cn/_nuxt/img/logo.dcf95b3.png',
-              placeholderSrc: $r('app.media.loading'),
-              errorholderSrc: $r('app.media.app_icon'),
+              loadSrc: "https://www.openharmony.cn/_nuxt/img/logo.dcf95b3.png",
+              placeholderSrc: $r("app.media.loading"),
+              errorholderSrc: $r("app.media.app_icon"),
               objectFit: ImageFit.Contain,
               onLoadListener: {
                 onLoadStart:()=>{
                   this.starTime = new Date().getTime()
-                  console.info('Load start: ');
+                  console.info("Load start: ");
                 },
                 onLoadFailed: (err) => {
-                  console.error('Load Failed Reason: ' + err + '  cost ' + (new Date().getTime() - this.starTime) + ' milliseconds');
+                  console.error("Load Failed Reason: " + err + "  cost " + (new Date().getTime() - this.starTime) + " milliseconds");
                 },
                 onLoadSuccess: (data,imageData) => {
-                  console.info('Load Successful: cost ' + (new Date().getTime() - this.starTime) + ' milliseconds');
+                  console.info("Load Successful: cost " + (new Date().getTime() - this.starTime) + " milliseconds");
                   this.currentWidth = imageData.imageWidth!
                   this.currentHeight = imageData.imageHeight!
                   this.typeValue = imageData.type!
@@ -73,7 +73,7 @@ struct LoadStatePage {
               },
               border: { radius: 50 },
               onComplete:(event)=>{
-                console.error('Load onComplete width:'+event?.width , ' height:'+event?.height , ' componentWidth:'+event?.componentWidth,' componentHeight:' + event?.componentHeight);
+                console.error("Load onComplete width:"+event?.width , " height:"+event?.height , " componentWidth:"+event?.componentWidth," componentHeight:" + event?.componentHeight);
               }
             }
           })
@@ -86,13 +86,13 @@ struct LoadStatePage {
         .margin({ top: 20 })
       Button($r('app.string.Custom_download_failed')).onClick(()=>{
         this.imageKnifeOption1 = {
-          loadSrc: 'abc',
+          loadSrc: "abc",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           customGetImage:custom,
           onLoadListener: {
             onLoadFailed:(err)=>{
-              this.message = 'err:' + err
+              this.message = "err:" + err
             }
           }
         }
@@ -110,7 +110,7 @@ struct LoadStatePage {
 // 自定义下载方法
 @Concurrent
 async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
-  console.info('ImageKnife::  custom download：' + src)
+  console.info("ImageKnife::  custom download：" + src)
   // 举例写死从本地文件读取，也可以自己请求网络图片
   return undefined
 }

entry/src/main/ets/pages/LocalImage.ets

@@ -1,78 +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 { ImageKnifeComponent } from '@ohos/libraryimageknife';
-import fs from '@ohos.file.fs';
-
-@Entry
-@Component
-struct LocalImage {
-  scroller: Scroller = new Scroller;
-  localFile: string = getContext(this).filesDir + '/icon.png'
-
-  aboutToAppear(): void {
-    // 拷贝本地文件
-    let icon: Uint8Array = getContext(this).resourceManager.getMediaContentSync($r('app.media.startIcon'));
-    let file = fs.openSync(this.localFile, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
-    fs.writeSync(file.fd, icon.buffer);
-    fs.fsyncSync(file.fd);
-    fs.closeSync(file);
-  }
-
-  build() {
-    Scroll(this.scroller) {
-      Column() {
-        Text($r('app.string.local_r_file'))
-          .fontSize(30)
-          .fontWeight(FontWeight.Bold)
-        ImageKnifeComponent({
-          imageKnifeOption: {
-            loadSrc: $r('app.media.startIcon'),
-            objectFit: ImageFit.Contain
-          }
-        }).width(100).height(100)
-        Text($r('app.string.local_rawfile'))
-          .fontSize(30)
-          .fontWeight(FontWeight.Bold)
-        ImageKnifeComponent({
-          imageKnifeOption: {
-            loadSrc: $rawfile('image/startIcon.png'),
-            objectFit: ImageFit.Contain
-          }
-        }).width(100).height(100)
-        Text($r('app.string.Under_context_file'))
-          .fontSize(30)
-          .fontWeight(FontWeight.Bold)
-        ImageKnifeComponent({
-          imageKnifeOption: {
-            loadSrc: this.localFile,
-            objectFit: ImageFit.Contain
-          }
-        }).width(100).height(100)
-        Text($r('app.string.local_other_module'))
-          .fontSize(30)
-          .fontWeight(FontWeight.Bold)
-        ImageKnifeComponent({
-          imageKnifeOption: {
-            loadSrc: $r('[sharedlibrary].media.startIcon'),
-            objectFit: ImageFit.Contain
-          }
-        }).width(100).height(100)
-      }
-      .width('100%')
-    }
-    .height('100%')
-  }
-}
-

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

@@ -21,19 +21,15 @@ struct LongImagePage {
   build() {
     Scroll() {
 
-      // Image('https://wx2.sinaimg.cn/mw690/006HyQKGgy1hnqp08dw09j30u04twu0x.jpg').objectFit(ImageFit.Auto).height(300)
+     // Image("https://wx2.sinaimg.cn/mw690/006HyQKGgy1hnqp08dw09j30u04twu0x.jpg").objectFit(ImageFit.Auto).height(300)
 
-      // Image($r('app.media.aaa')).objectFit(ImageFit.Auto).width(200)
+   // Image($r("app.media.aaa")).objectFit(ImageFit.Auto).width(200)
       ImageKnifeComponent({
         imageKnifeOption: {
-          loadSrc:'https://wx2.sinaimg.cn/mw690/006HyQKGgy1hnqp08dw09j30u04twu0x.jpg',
-          //src:$r('app.media.aaa'),
-          placeholderSrc: $r('app.media.loading'),
-          errorholderSrc: $r('app.media.failed'),
-          httpOption: {
-            connectTimeout: 60000,
-            readTimeout: 60000
-          },
+          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
         }
       })

entry/src/main/ets/pages/MaxRequest1.ets

@@ -36,20 +36,20 @@ struct MaxRequest1 {
               ImageKnifeComponent({
                 imageKnifeOption: {
                   loadSrc: item,
-                  placeholderSrc: $r('app.media.loading'),
-                  errorholderSrc: $r('app.media.failed'),
+                  placeholderSrc: $r("app.media.loading"),
+                  errorholderSrc: $r("app.media.failed"),
                 }
-              }).width('50%').height(160)
+              }).width("50%").height(160)
             }
           }.height(200)
-          .backgroundColor('#95efd2')
+          .backgroundColor("#95efd2")
         },(item: string) => item)
-      }.columnsTemplate('1fr 1fr')
+      }.columnsTemplate("1fr 1fr")
       .cachedCount(8)
       .columnsGap(10)
       .rowsGap(5)
       .backgroundColor(0xFAEEE0)
-      .width('100%').height('100%')
+      .width("100%").height("100%")
     }
   }
 }

entry/src/main/ets/pages/MaxRequest2.ets

@@ -36,20 +36,20 @@ struct MaxRequest2 {
               ImageKnifeComponent({
                 imageKnifeOption: {
                   loadSrc: item,
-                  placeholderSrc: $r('app.media.loading'),
-                  errorholderSrc: $r('app.media.failed'),
+                  placeholderSrc: $r("app.media.loading"),
+                  errorholderSrc: $r("app.media.failed"),
                 }
-              }).width('50%').height(160)
+              }).width("50%").height(160)
             }
           }.height(200)
-          .backgroundColor('#95efd2')
+          .backgroundColor("#95efd2")
         },(item: string) => item)
-      }.columnsTemplate('1fr 1fr')
+      }.columnsTemplate("1fr 1fr")
       .cachedCount(20)
       .columnsGap(10)
       .rowsGap(5)
       .backgroundColor(0xFAEEE0)
-      .width('100%').height('100%')
+      .width("100%").height("100%")
     }
   }
 }

entry/src/main/ets/pages/MaxRequest3.ets

@@ -36,20 +36,20 @@ struct MaxRequest3 {
               ImageKnifeComponent({
                 imageKnifeOption: {
                   loadSrc: item,
-                  placeholderSrc: $r('app.media.loading'),
-                  errorholderSrc: $r('app.media.failed'),
+                  placeholderSrc: $r("app.media.loading"),
+                  errorholderSrc: $r("app.media.failed"),
                 }
-              }).width('50%').height(160)
+              }).width("50%").height(160)
             }
           }.height(200)
-          .backgroundColor('#95efd2')
+          .backgroundColor("#95efd2")
         },(item: string) => item)
-      }.columnsTemplate('1fr 1fr')
+      }.columnsTemplate("1fr 1fr")
       .cachedCount(40)
       .columnsGap(10)
       .rowsGap(5)
       .backgroundColor(0xFAEEE0)
-      .width('100%').height('100%')
+      .width("100%").height("100%")
     }
   }
 }

entry/src/main/ets/pages/MultipleImageCallBack.ets

@@ -1,151 +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 { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife';
-import { CommonDataSource } from './model/CommonDataSource'
-
-@Entry
-@Component
-struct MultipleImageCallBack {
-  @State hotCommendList: CommonDataSource<string> = new CommonDataSource<string>([])
-  @State componentIndex: number = 0
-  @State startIndex: number = 0
-  @State successIndex: number = 0
-  @State failIndex: number = 0
-  @State cancelJobIndex: number = 0
-  @State cancelLoadIndex: number = 0
-  @State memoryIndex: number = 0
-  @State fileCacheIndex: number = 0
-  @State netIndex: number = 0
-  @State checkText: string = ''
-  private data: Array<string> = []
-
-  aboutToAppear(): void {
-    for (let index = 0; index < 100; index++) {
-      this.data.push(`https://img-blog.csdn.net/20140514114029140?${index}`)
-    }
-    this.hotCommendList.addData(this.hotCommendList.totalCount(), this.data)
-  }
-
-  build() {
-    Column() {
-      Row() {
-        Column() {
-          Text('图片总数：' + this.componentIndex)
-          Text('开始回调：' + this.startIndex)
-          Text('成功回调：' + this.successIndex)
-          Text('失败回调：' + this.failIndex)
-          Text('队列取消回调：' + this.cancelJobIndex)
-          Text('加载取消回调：' + this.cancelLoadIndex)
-          Text('内存数量：' + this.memoryIndex)
-          Text('文件数量：' + this.fileCacheIndex)
-          Text('网络数量：' + this.netIndex)
-        }.width('50%')
-        Column() {
-          Button('check')
-            .onClick(()=>{
-              this.checkText = ''
-              if (this.componentIndex !== this.startIndex + this.cancelJobIndex) {
-                this.checkText = this.checkText + '图片总数！=开始+队列取消，'
-              }
-              if(this.startIndex !== this.successIndex + this.failIndex + this.cancelLoadIndex) {
-                this.checkText = this.checkText + '开始回调！=成功+失败+加载取消，'
-              }
-              if(this.successIndex !== this.memoryIndex + this.fileCacheIndex + this.netIndex) {
-                this.checkText = this.checkText + '成功回调！=内存+文件+网络，'
-              }
-              if(this.componentIndex !== this.successIndex + this.failIndex + this.cancelJobIndex + this.cancelLoadIndex) {
-                this.checkText = this.checkText + '图片总数！=成功+失败+加载取消+队列取消，'
-              }
-              if(this.checkText == '') {
-                this.checkText = 'check正确'
-              }
-            })
-          Text(this.checkText)
-        }.width('50%')
-      }.width('100%')
-      Column() {
-        WaterFlow() {
-          LazyForEach(this.hotCommendList, (item: string,index: number) => {
-            FlowItem() {
-              Column() {
-                Text(index + '')
-                ImageComponent({
-                  imageKnifeOption: {
-                    loadSrc: item,
-                    placeholderSrc: $r('app.media.loading'),
-                    errorholderSrc: $r('app.media.failed'),
-                    onLoadListener: {
-                      onLoadStart:()=>{
-                        this.startIndex++
-                        console.log('image load multiple loadStart:' + this.startIndex)
-                      },
-                      onLoadSuccess:(pixelmap,imageData,request)=>{
-                        this.successIndex++
-                        let memory = request?.imageKnifeData?.timeInfo?.memoryCheckEndTime ? 1 : 0
-                        let fileCache = request?.imageKnifeData?.timeInfo?.diskCheckEndTime ? 1 : 0
-                        let net = request?.imageKnifeData?.timeInfo?.netRequestEndTime ? 1 : 0
-                        memory = memory - fileCache
-                        fileCache = fileCache - net
-                        this.memoryIndex = this.memoryIndex + memory
-                        this.fileCacheIndex = this.fileCacheIndex + fileCache
-                        this.netIndex = this.netIndex + net
-                        console.log('image load multiple loadSuccess:' + this.successIndex)
-                      },
-                      onLoadFailed:()=>{
-                        this.failIndex++
-                        console.log('image load multiple loadFail:' + this.failIndex)
-                      },
-                      onLoadCancel:(message,request)=>{
-                        let flag = request?.imageKnifeData?.timeInfo?.netRequestStartTime ? true : false
-                        if (flag) {
-                          this.cancelLoadIndex++
-                        } else {
-                          this.cancelJobIndex++
-                        }
-                        console.log('image load multiple cancelJobIndex:' + this.cancelJobIndex,'cancelLoadIndex' + this.cancelLoadIndex)
-                      }
-                    }
-                  },index:this.componentIndex
-                }).width('50%').height(160)
-              }
-            }.height(200)
-            .backgroundColor('#95efd2')
-          }, (item: string) => item)
-        }
-        .cachedCount(0)
-        .columnsTemplate('1fr 1fr')
-        .columnsGap(10)
-        .rowsGap(5)
-        .backgroundColor(0xFAEEE0)
-        .width('100%')
-      }
-      .height('80%')
-    }.width('100%')
-    .height('100%')
-  }
-}
-@Component
-struct ImageComponent {
-  @State imageKnifeOption: ImageKnifeOption = new ImageKnifeOption()
-  @Link index: number
-  aboutToAppear(): void {
-    this.index++
-  }
-  build() {
-    ImageKnifeComponent({
-      imageKnifeOption: this.imageKnifeOption
-    })
-  }
-}

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

@@ -18,9 +18,9 @@ import { ImageKnife, ImageKnifeComponent, ImageKnifeOption } from '@ohos/library
 @Component
 struct ObjectFitPage {
   @State imageKnifeOption: ImageKnifeOption = {
-    loadSrc: $r('app.media.app_icon'),
-    placeholderSrc: $r('app.media.loading'),
-    errorholderSrc: $r('app.media.app_icon'),
+    loadSrc: $r("app.media.app_icon"),
+    placeholderSrc: $r("app.media.loading"),
+    errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Fill
   }
 
@@ -29,9 +29,9 @@ struct ObjectFitPage {
 
       Button($r('app.string.Main_image_Fill')).onClick(()=>{
         this.imageKnifeOption = {
-          loadSrc: $r('app.media.app_icon'),
-          placeholderSrc: $r('app.media.loading'),
-          errorholderSrc: $r('app.media.app_icon'),
+          loadSrc: $r("app.media.app_icon"),
+          placeholderSrc: $r("app.media.loading"),
+          errorholderSrc: $r("app.media.app_icon"),
           objectFit: ImageFit.Fill
         }
       })
@@ -41,9 +41,9 @@ struct ObjectFitPage {
         await ImageKnife.getInstance().removeAllFileCache()
 
         this.imageKnifeOption = {
-          loadSrc: 'https://wx2.sinaimg.cn/mw690/006HyQKGgy1hnqp08dw09j30u04twu0x.jpg',
-          placeholderSrc: $r('app.media.app_icon'),
-          errorholderSrc: $r('app.media.app_icon'),
+          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
         }
@@ -52,9 +52,9 @@ struct ObjectFitPage {
 
       Button($r('app.string.Error_graph_None')).margin({top:10}).onClick(() => {
         this.imageKnifeOption = {
-          loadSrc: 'http://xxxxx',
-          placeholderSrc: $r('app.media.loading'),
-          errorholderSrc: $r('app.media.app_icon'),
+          loadSrc: "http://xxxxx",
+          placeholderSrc: $r("app.media.loading"),
+          errorholderSrc: $r("app.media.app_icon"),
           objectFit: ImageFit.Fill,
           errorholderObjectFit: ImageFit.None
         }

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

@@ -19,21 +19,21 @@ import { router } from '@kit.ArkUI'
 struct PrefetchAndCacheCount {
   build() {
     Column() {
-      Button('cacheCount == 5')
+      Button("cacheCount == 5")
         .onClick(()=>{
-          router.pushUrl({url:'pages/LazyForEachCache'})
+          router.pushUrl({url:"pages/LazyForEachCache"})
         })
-      Button('cacheCount == 30')
+      Button("cacheCount == 30")
         .margin({top:10})
         .onClick(()=>{
-          router.pushUrl({url:'pages/LazyForEachCount'})
+          router.pushUrl({url:"pages/LazyForEachCount"})
         })
-      Button('prefetch + preload')
+      Button("prefetch + preload")
         .margin({top:10})
         .onClick(()=>{
-          router.pushUrl({url:'pages/PrefetchAndPreload'})
+          router.pushUrl({url:"pages/PrefetchAndPreload"})
         })
-    }.width('100%')
-    .height('100%')
+    }.width("100%")
+    .height("100%")
   }
 }

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

@@ -37,7 +37,7 @@ export struct PrefetchAndPreload {
                 }
               }).width(100).height(100)
               Text(`${index}`)
-            }.border({ width: 5 , color: '#000000'})
+            }.border({ width: 5 , color: "#000000"})
           }
           .reuseId('imageKnife')
         })
@@ -47,8 +47,8 @@ export struct PrefetchAndPreload {
         // 列表滚动触发visibleAreaChanged，实时更新预取范围，触发调用prefetch、cancel接口
         this.prefetcher.visibleAreaChanged(start, end)
       })
-      .width('100%')
-      .height('100%')
+      .width("100%")
+      .height("100%")
       .margin({ left: 10, right: 10 })
       .layoutWeight(1)
     }

entry/src/main/ets/pages/SetMaxRequestPage.ets

@@ -1,17 +1,3 @@
-/*
- * 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
@@ -19,19 +5,19 @@ import { router } from '@kit.ArkUI'
 struct SetMaxRequestPage {
   build() {
     Column() {
-      Button('maxRequest = 8')
+      Button("maxRequest = 8")
         .onClick(()=>{
-          router.pushUrl({url:'pages/MaxRequest1'})
+          router.pushUrl({url:"pages/MaxRequest1"})
         })
-      Button('maxRequest = 20')
+      Button("maxRequest = 20")
         .onClick(()=>{
-          router.pushUrl({url:'pages/MaxRequest2'})
+          router.pushUrl({url:"pages/MaxRequest2"})
         }).margin({top:20})
-      Button('maxRequest = 32')
+      Button("maxRequest = 32")
         .onClick(()=>{
-          router.pushUrl({url:'pages/MaxRequest2'})
+          router.pushUrl({url:"pages/MaxRequest2"})
         }).margin({top:20})
-    }.width('100%')
-    .height('100%')
+    }.width("100%")
+    .height("100%")
   }
 }

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

@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * 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,
+ * 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.
@@ -21,12 +21,12 @@ struct SignatureTestPage {
   @State imageKnifeOption1: ImageKnifeOption =
     {
       loadSrc: $r('app.media.icon'),
-      placeholderSrc:$r('app.media.loading'),
+      placeholderSrc:$r("app.media.loading"),
     };
   @State imageKnifeOption2: ImageKnifeOption =
     {
       loadSrc: $r('app.media.icon'),
-      placeholderSrc:$r('app.media.loading'),
+      placeholderSrc:$r("app.media.loading"),
     };
 
   build() {
@@ -39,8 +39,8 @@ struct SignatureTestPage {
             .onClick(() => {
               this.imageKnifeOption1 = {
                 loadSrc: 'https://img-blog.csdn.net/20140514114029140',
-                placeholderSrc:$r('app.media.loading'),
-                signature: '1'
+                placeholderSrc:$r("app.media.loading"),
+                signature: "1"
               }
             }).margin({ top: 5, left: 3 })
           ImageKnifeComponent({ imageKnifeOption: this.imageKnifeOption1 }).width(300).height(300)
@@ -52,7 +52,7 @@ struct SignatureTestPage {
             .onClick(() => {
               this.imageKnifeOption2 = {
                 loadSrc: 'https://img-blog.csdn.net/20140514114029140',
-                placeholderSrc:$r('app.media.loading'),
+                placeholderSrc:$r("app.media.loading"),
                 signature: new Date().getTime().toString()
               }
             }).margin({ top: 5, left: 3 })
@@ -66,7 +66,7 @@ struct SignatureTestPage {
   }
 
   aboutToAppear() {
-    console.log('唯一标识页面：' + new Date().getTime().toString())
+    console.log("唯一标识页面：" + new Date().getTime().toString())
 
   }
 }

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

@@ -20,20 +20,20 @@ import { common2D, drawing } from '@kit.ArkGraphics2D';
 @Entry
 @Component
 struct SingleImage {
-  resource: string = 'app.media.svgSample'
+  resource: string = "app.media.svgSample"
   scroller: Scroller = new Scroller;
-  localFile: string = getContext(this).filesDir + '/icon.png'
+  localFile: string = getContext(this).filesDir + "/icon.png"
   @State pixelMap:PixelMap | undefined = undefined;
   @State DrawingColorFilter: ColorFilter | undefined = undefined
   private color: common2D.Color = { alpha: 255, red: 255, green: 0, blue: 0 };
   aboutToAppear(): void {
     // 拷贝本地文件
-    let icon: Uint8Array = getContext(this).resourceManager.getMediaContentSync($r('app.media.startIcon'));
+    let icon: Uint8Array = getContext(this).resourceManager.getMediaContentSync($r("app.media.startIcon"));
     let file = fs.openSync(this.localFile, fs.OpenMode.CREATE | fs.OpenMode.READ_WRITE);
     fs.writeSync(file.fd, icon.buffer);
     fs.fsyncSync(file.fd);
     fs.closeSync(file);
-    this.changePic(getContext().resourceManager.getMediaContentSync( $r('app.media.aaa'))
+    this.changePic(getContext().resourceManager.getMediaContentSync( $r("app.media.aaa"))
       .buffer as ArrayBuffer);
 
 
@@ -47,31 +47,23 @@ struct SingleImage {
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
           imageKnifeOption: {
-            loadSrc: $r(this.resource),
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
+            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);
           })
-        ImageKnifeComponent({
-          imageKnifeOption: {
-            loadSrc: $r('[sharedlibrary].media.pngSample'),
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
-            objectFit: ImageFit.Contain
-          }
-        }).width(100).height(100)
         Text($r('app.string.Under_context_file'))
           .fontSize(30)
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
           imageKnifeOption: {
             loadSrc: this.localFile,
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
+            placeholderSrc: $r("app.media.loading"),
+            errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain
           }
         }).width(100).height(100)
@@ -80,13 +72,13 @@ struct SingleImage {
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
           imageKnifeOption: {
-            loadSrc:'https://www.openharmony.cn/_nuxt/img/logo.dcf95b3.png',
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
+            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)},
+            progressListener:(progress:number)=>{console.info("ImageKnife:: call back progress = " + progress)},
             // 通过https协议进行连接时，默认使用系统预设CA证书。若希望使用自定义证书进行https连接，则需要将自定义证书上传至应用沙箱目录中，并在caPath中指定该证书所在的应用沙箱路径
-            // caPath: '/data/storage/el1/bundle/ca.pem',
+            // caPath: "/data/storage/el1/bundle/ca.pem",
           }
         }).width(100).height(100)
         Text($r('app.string.Custom_network_download'))
@@ -94,13 +86,13 @@ struct SingleImage {
           .fontWeight(FontWeight.Bold)
         ImageKnifeComponent({
           imageKnifeOption: {
-            loadSrc: 'https://file.atomgit.com/uploads/user/1704857786989_8994.jpeg',
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
+            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'
+              key:"refer",
+              value:"xx.xx.xx.xx"
             }],
             customGetImage: custom,
             transformation: new BlurTransformation(10)
@@ -112,8 +104,8 @@ struct SingleImage {
         ImageKnifeComponent({
           imageKnifeOption: {
             loadSrc: this.pixelMap!,
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
+            placeholderSrc: $r("app.media.loading"),
+            errorholderSrc: $r("app.media.failed"),
             objectFit: ImageFit.Contain,
           }
         }).width(100).height(100)
@@ -130,7 +122,6 @@ struct SingleImage {
         editable: true,
       }
       imageSource.createPixelMap(decodingOptions,(err,pixelMap)=>{
-        imageSource.release()
         this.pixelMap = pixelMap;
       })
     }
@@ -140,10 +131,10 @@ struct SingleImage {
 // 自定义下载方法
 @Concurrent
 async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
-  let refer = headers!['refer'] as string
-  console.info('ImageKnife::  custom download：' + src,'refer:'+refer)
+  let refer = headers!["refer"] as string
+  console.info("ImageKnife::  custom download：" + src,"refer:"+refer)
   // 举例写死从本地文件读取，也可以自己请求网络图片
-  let buffer = context.resourceManager.getMediaContentSync($r('app.media.startIcon').id).buffer as ArrayBuffer
+  let buffer = context.resourceManager.getMediaContentSync($r("app.media.startIcon").id).buffer as ArrayBuffer
   return buffer
 }
 

entry/src/main/ets/pages/SingleImageCallBack.ets

@@ -1,126 +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 { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife';
-import { CommonDataSource } from './model/CommonDataSource'
-
-@Entry
-@Component
-struct SingleImageCallBack {
-  @State hotCommendList: CommonDataSource<string> = new CommonDataSource<string>([])
-  @State componentIndex: number = 0
-  @State startIndex: number = 0
-  @State successIndex: number = 0
-  @State failIndex: number = 0
-  @State cancelJobIndex: number = 0
-  @State cancelLoadIndex: number = 0
-  @State memoryIndex: number = 0
-  @State fileCacheIndex: number = 0
-  @State netIndex: number = 0
-  @State checkText: string = ''
-  build() {
-    Column() {
-      Row() {
-        Column() {
-          Text('图片总数：' + this.componentIndex)
-          Text('开始回调：' + this.startIndex)
-          Text('成功回调：' + this.successIndex)
-          Text('失败回调：' + this.failIndex)
-          Text('队列取消回调：' + this.cancelJobIndex)
-          Text('加载取消回调：' + this.cancelLoadIndex)
-          Text('内存数量：' + this.memoryIndex)
-          Text('文件数量：' + this.fileCacheIndex)
-          Text('网络数量：' + this.netIndex)
-        }.width('50%')
-        Column() {
-          Button('check')
-            .onClick(()=>{
-              this.checkText = ''
-              if (this.componentIndex !== this.startIndex + this.cancelJobIndex) {
-                this.checkText = this.checkText + '图片总数！=开始+队列取消，'
-              }
-              if(this.startIndex !== this.successIndex + this.failIndex + this.cancelLoadIndex) {
-                this.checkText = this.checkText + '开始回调！=成功+失败+加载取消，'
-              }
-              if(this.successIndex !== this.memoryIndex + this.fileCacheIndex + this.netIndex) {
-                this.checkText = this.checkText + '成功回调！=内存+文件+网络，'
-              }
-              if(this.componentIndex !== this.successIndex + this.failIndex + this.cancelJobIndex + this.cancelLoadIndex) {
-                this.checkText = this.checkText + '图片总数！=成功+失败+加载取消+队列取消，'
-              }
-              if(this.checkText == '') {
-                this.checkText = 'check正确'
-              }
-            })
-          Text(this.checkText)
-        }.width('50%')
-      }.width('100%')
-      Column() {
-        ImageComponent({
-          imageKnifeOption: {
-            loadSrc: 'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
-            placeholderSrc: $r('app.media.loading'),
-            errorholderSrc: $r('app.media.failed'),
-            onLoadListener: {
-              onLoadStart: () => {
-                this.startIndex++
-                console.log('image load multiple loadStart:' + this.startIndex)
-              },
-              onLoadSuccess: (pixelmap, imageData, request) => {
-                this.successIndex++
-                let memory = request?.imageKnifeData?.timeInfo?.memoryCheckEndTime ? 1 : 0
-                let fileCache = request?.imageKnifeData?.timeInfo?.diskCheckEndTime ? 1 : 0
-                let net = request?.imageKnifeData?.timeInfo?.netRequestEndTime ? 1 : 0
-                memory = memory - fileCache
-                fileCache = fileCache - net
-                this.memoryIndex = this.memoryIndex + memory
-                this.fileCacheIndex = this.fileCacheIndex + fileCache
-                this.netIndex = this.netIndex + net
-                console.log('image load multiple loadSuccess:' + this.successIndex)
-              },
-              onLoadFailed: () => {
-                this.failIndex++
-                console.log('image load multiple loadFail:' + this.failIndex)
-              },
-              onLoadCancel: (message,request) => {
-                let flag = request?.imageKnifeData?.type ? true : false
-                if (flag) {
-                  this.cancelLoadIndex++
-                } else {
-                  this.cancelJobIndex++
-                }
-                console.log('image load multiple cancelJobIndex:' + this.cancelJobIndex,'cancelLoadIndex' + this.cancelLoadIndex)
-              }
-            }
-          },index:this.componentIndex
-        }).width(300).height(300)
-      }
-      .height('80%')
-    }.width('100%')
-    .height('100%')
-  }
-}
-@Component
-struct ImageComponent {
-  @State imageKnifeOption: ImageKnifeOption = new ImageKnifeOption()
-  @Link index: number
-  aboutToAppear(): void {
-    this.index++
-  }
-  build() {
-    ImageKnifeComponent({
-      imageKnifeOption: this.imageKnifeOption
-    })
-  }
-}

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

@@ -27,11 +27,11 @@ struct TestCacheDataPage {
   @State markersNumText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
   @State markersSizeText: string = getContext(this).resourceManager.getStringSync($r('app.string.memory'))
   @State ImageKnifeOption: ImageKnifeOption = {
-    loadSrc: '',
+    loadSrc: "",
     objectFit: ImageFit.Contain,
     onLoadListener: {
       onLoadFailed: (err) => {
-        console.error('Load Failed Reason: ' + err);
+        console.error("Load Failed Reason: " + err);
       },
       onLoadSuccess: (data) => {
         return data;
@@ -41,7 +41,7 @@ struct TestCacheDataPage {
   }
 
   aboutToAppear(): void {
-    ImageKnife.getInstance().initFileCache(getContext(this), 256, 256 * 1024 * 1024, 'ImageKnifeCache1')
+    ImageKnife.getInstance().initFileCache(getContext(this), 256, 256 * 1024 * 1024, "ImageKnifeCache1")
   }
 
   build() {
@@ -56,7 +56,7 @@ struct TestCacheDataPage {
       Button($r('app.string.load_memory'))
         .onClick(() => {
           this.ImageKnifeOption = {
-            loadSrc: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg',
+            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 },
@@ -65,7 +65,7 @@ struct TestCacheDataPage {
       Button($r('app.string.load_disk'))
         .onClick(() => {
           this.ImageKnifeOption = {
-            loadSrc: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg',
+            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 },

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

@@ -102,7 +102,7 @@ struct TestChangeColorPage {
       Text($r('app.string.test_svg_color')).margin({ top: 30 })
       ImageKnifeComponent({
         imageKnifeOption: {
-          loadSrc: $r('app.media.ic_test_change_color_svg'),
+          loadSrc: $r("app.media.ic_test_change_color_svg"),
           drawingColorFilter: drawing.ColorFilter.createBlendModeColorFilter(this.color, drawing.BlendMode.SRC_IN)
         }
       }).width(110).height(110)

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

@@ -32,21 +32,21 @@ struct TestCommonImage {
               ImageKnifeComponent({
                 imageKnifeOption: {
                   loadSrc: item,
-                  placeholderSrc: $r('app.media.loading'),
-                  errorholderSrc: $r('app.media.failed'),
+                  placeholderSrc: $r("app.media.loading"),
+                  errorholderSrc: $r("app.media.failed"),
                   objectFit: ImageFit.Contain,
-                  signature: 'aaa'
+                  signature: "aaa"
                 }
-              }).width('50%').height(200)
+              }).width("50%").height(200)
             }
           }.height(200)
-          .backgroundColor('#95efd2')
+          .backgroundColor("#95efd2")
         },(item: string) => item)
-      }.columnsTemplate('1fr 1fr')
+      }.columnsTemplate("1fr 1fr")
       .columnsGap(10)
       .rowsGap(5)
       .backgroundColor(0xFAEEE0)
-      .width('100%').height('100%')
+      .width("100%").height("100%")
     }
   }
 }

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

@@ -20,24 +20,24 @@ struct TestErrorHolderPage {
 
   build() {
     Column() {
-      Text('ImageKnifeComponent1').fontSize(20)
+      Text("ImageKnifeComponent1").fontSize(20)
       ImageKnifeComponent({
         imageKnifeOption: {
-          loadSrc: 'abc',
+          loadSrc: "abc",
           errorholderSrc:$r('app.media.failed')
         }
       }).width(200).height(200)
-      Text('ImageKnifeComponent2').fontSize(20)
+      Text("ImageKnifeComponent2").fontSize(20)
       ImageKnifeComponent({
         imageKnifeOption: {
-          loadSrc: 'abc',
+          loadSrc: "abc",
           errorholderSrc:$r('app.media.startIcon')
         }
       }).width(200).height(200)
-      Text('ImageKnifeComponent2').fontSize(20)
+      Text("ImageKnifeComponent2").fontSize(20)
       ImageKnifeComponent({
         imageKnifeOption: {
-          loadSrc: 'abc',
+          loadSrc: "abc",
           errorholderSrc:$r('app.media.mask_starfish')
         }
       }).width(200).height(200)

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

@@ -18,12 +18,12 @@ import { ImageKnifeComponent,ImageKnifeOption } from '@ohos/libraryimageknife'
 @Component
 struct TestPrefetchToFileCachePage {
   @State imageKnifeOption: ImageKnifeOption = {
-    loadSrc:'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
+    loadSrc:"https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
     placeholderSrc:$r('app.media.loading'),
     headerOption:[
       {
-        key:'abc',
-        value:'单个'
+        key:"abc",
+        value:"单个"
       }
     ]
   }

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

@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { IndexComponent } from '@ohos/libraryimageknife'
+import { IndexComponent } from "@ohos/libraryimageknife"
 
 @Entry
 @Component
 struct TestHspPreLoadImage {
   build() {
     Column() {
-      IndexComponent()
-    }.width('100%').height('100%')
+        IndexComponent()
+    }.width("100%").height('100%')
   }
 }

entry/src/main/ets/pages/TestImageExif.ets

@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2025 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 { ImageKnifeComponent } from '@ohos/libraryimageknife';
-import fs from '@ohos.file.fs';
-
-@Entry
-@Component
-struct LocalImage {
-  scroller: Scroller = new Scroller;
-
-  build() {
-    Scroll(this.scroller) {
-      Column() {
-        Column() {
-          Text($r('app.string.base_image'))
-            .fontSize(20)
-            .fontWeight(FontWeight.Bold)
-          Row() {
-            Image($rawfile('rotate/rotate.jpg')).width(100).height(100).margin({ right: 10 })
-            ImageKnifeComponent({
-              imageKnifeOption: {
-                loadSrc: $rawfile('rotate/rotate.jpg'),
-                objectFit: ImageFit.Contain
-              }
-            }).width(100).height(100)
-          }
-        }
-        .margin({ bottom: 20 })
-
-        Column() {
-          Text($r('app.string.rotate_mirror'))
-            .fontSize(20)
-            .fontWeight(FontWeight.Bold)
-          Row() {
-            Image($rawfile('rotate/rotate_mirror.jpg')).width(100).height(100).margin({ right: 10 })
-            ImageKnifeComponent({
-              imageKnifeOption: {
-                loadSrc: $rawfile('rotate/rotate_mirror.jpg'),
-                objectFit: ImageFit.Contain
-              }
-            }).width(100).height(100)
-          }
-        }.margin({ bottom: 20 })
-
-        Column() {
-          Text($r('app.string.rotate_rotate90'))
-            .fontSize(20)
-            .fontWeight(FontWeight.Bold)
-          Row() {
-            Image($rawfile('rotate/rotate_rotate90.jpg')).width(100).height(100).margin({ right: 10 })
-            ImageKnifeComponent({
-              imageKnifeOption: {
-                loadSrc: $rawfile('rotate/rotate_rotate90.jpg'),
-                objectFit: ImageFit.Contain
-              }
-            }).width(100).height(100)
-          }
-        }.margin({ bottom: 20 })
-
-        Column() {
-          Text($r('app.string.rotate_mirror_rotate270'))
-            .fontSize(20)
-            .fontWeight(FontWeight.Bold)
-          Row() {
-            Image($rawfile('rotate/rotate_mirror_rotate270.jpg')).width(100).height(100).margin({ right: 10 })
-            ImageKnifeComponent({
-              imageKnifeOption: {
-                loadSrc: $rawfile('rotate/rotate_mirror_rotate270.jpg'),
-                objectFit: ImageFit.Contain
-              }
-            }).width(100).height(100)
-          }
-        }
-      }
-      .width('100%')
-    }
-    .height('100%')
-  }
-}
-

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

@@ -35,47 +35,47 @@ export class MsgModel {
 export struct MsgItem {
   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',
-    'http://h.hiphotos.baidu.com/image/pic/item/7c1ed21b0ef41bd5f2c2a9e953da81cb39db3d1d.jpg',
-    'http://g.hiphotos.baidu.com/image/pic/item/55e736d12f2eb938d5277fd5d0628535e5dd6f4a.jpg',
-    'http://e.hiphotos.baidu.com/image/pic/item/4e4a20a4462309f7e41f5cfe760e0cf3d6cad6ee.jpg',
-    'http://b.hiphotos.baidu.com/image/pic/item/9d82d158ccbf6c81b94575cfb93eb13533fa40a2.jpg',
-    'http://e.hiphotos.baidu.com/image/pic/item/4bed2e738bd4b31c1badd5a685d6277f9e2ff81e.jpg',
-    'http://g.hiphotos.baidu.com/image/pic/item/0d338744ebf81a4c87a3add4d52a6059252da61e.jpg',
-    'http://a.hiphotos.baidu.com/image/pic/item/f2deb48f8c5494ee5080c8142ff5e0fe99257e19.jpg',
-    'http://f.hiphotos.baidu.com/image/pic/item/4034970a304e251f503521f5a586c9177e3e53f9.jpg',
-    'http://b.hiphotos.baidu.com/image/pic/item/279759ee3d6d55fbb3586c0168224f4a20a4dd7e.jpg',
-    'http://img2.xkhouse.com/bbs/hfhouse/data/attachment/forum/corebbs/2009-11/2009113011534566298.jpg',
-    'http://a.hiphotos.baidu.com/image/pic/item/e824b899a9014c087eb617650e7b02087af4f464.jpg',
-    'http://c.hiphotos.baidu.com/image/pic/item/9c16fdfaaf51f3de1e296fa390eef01f3b29795a.jpg',
-    'http://d.hiphotos.baidu.com/image/pic/item/b58f8c5494eef01f119945cbe2fe9925bc317d2a.jpg',
-    'http://h.hiphotos.baidu.com/image/pic/item/902397dda144ad340668b847d4a20cf430ad851e.jpg',
-    'http://b.hiphotos.baidu.com/image/pic/item/359b033b5bb5c9ea5c0e3c23d139b6003bf3b374.jpg',
-    'http://a.hiphotos.baidu.com/image/pic/item/8d5494eef01f3a292d2472199d25bc315d607c7c.jpg',
-    'http://b.hiphotos.baidu.com/image/pic/item/e824b899a9014c08878b2c4c0e7b02087af4f4a3.jpg',
-    'http://g.hiphotos.baidu.com/image/pic/item/6d81800a19d8bc3e770bd00d868ba61ea9d345f2.jpg',
+    "http://e.hiphotos.baidu.com/image/pic/item/a1ec08fa513d2697e542494057fbb2fb4316d81e.jpg",
+    "http://c.hiphotos.baidu.com/image/pic/item/30adcbef76094b36de8a2fe5a1cc7cd98d109d99.jpg",
+    "http://h.hiphotos.baidu.com/image/pic/item/7c1ed21b0ef41bd5f2c2a9e953da81cb39db3d1d.jpg",
+    "http://g.hiphotos.baidu.com/image/pic/item/55e736d12f2eb938d5277fd5d0628535e5dd6f4a.jpg",
+    "http://e.hiphotos.baidu.com/image/pic/item/4e4a20a4462309f7e41f5cfe760e0cf3d6cad6ee.jpg",
+    "http://b.hiphotos.baidu.com/image/pic/item/9d82d158ccbf6c81b94575cfb93eb13533fa40a2.jpg",
+    "http://e.hiphotos.baidu.com/image/pic/item/4bed2e738bd4b31c1badd5a685d6277f9e2ff81e.jpg",
+    "http://g.hiphotos.baidu.com/image/pic/item/0d338744ebf81a4c87a3add4d52a6059252da61e.jpg",
+    "http://a.hiphotos.baidu.com/image/pic/item/f2deb48f8c5494ee5080c8142ff5e0fe99257e19.jpg",
+    "http://f.hiphotos.baidu.com/image/pic/item/4034970a304e251f503521f5a586c9177e3e53f9.jpg",
+    "http://b.hiphotos.baidu.com/image/pic/item/279759ee3d6d55fbb3586c0168224f4a20a4dd7e.jpg",
+    "http://img2.xkhouse.com/bbs/hfhouse/data/attachment/forum/corebbs/2009-11/2009113011534566298.jpg",
+    "http://a.hiphotos.baidu.com/image/pic/item/e824b899a9014c087eb617650e7b02087af4f464.jpg",
+    "http://c.hiphotos.baidu.com/image/pic/item/9c16fdfaaf51f3de1e296fa390eef01f3b29795a.jpg",
+    "http://d.hiphotos.baidu.com/image/pic/item/b58f8c5494eef01f119945cbe2fe9925bc317d2a.jpg",
+    "http://h.hiphotos.baidu.com/image/pic/item/902397dda144ad340668b847d4a20cf430ad851e.jpg",
+    "http://b.hiphotos.baidu.com/image/pic/item/359b033b5bb5c9ea5c0e3c23d139b6003bf3b374.jpg",
+    "http://a.hiphotos.baidu.com/image/pic/item/8d5494eef01f3a292d2472199d25bc315d607c7c.jpg",
+    "http://b.hiphotos.baidu.com/image/pic/item/e824b899a9014c08878b2c4c0e7b02087af4f4a3.jpg",
+    "http://g.hiphotos.baidu.com/image/pic/item/6d81800a19d8bc3e770bd00d868ba61ea9d345f2.jpg",
   ]
   build(){
     if (this.count % 2 == 0 && this.count <6){
       ImageKnifeComponent({
         imageKnifeOption:{
-          loadSrc:$r('app.media.startIcon'),
-          placeholderSrc:$r('app.media.loading')
+          loadSrc:$r("app.media.startIcon"),
+          placeholderSrc:$r("app.media.loading")
         },syncLoad:true
       })
     }else if (this.count > 6 && this.count - 6 < this.data.length){
       ImageKnifeComponent({
         imageKnifeOption:{
           loadSrc:this.data[this.count - 6],
-          placeholderSrc:$r('app.media.loading')
+          placeholderSrc:$r("app.media.loading")
         },syncLoad:true
       })
     }else {
       ImageKnifeComponent({
         imageKnifeOption:{
-          loadSrc:$r('app.media.pngSample'),
-          placeholderSrc:$r('app.media.loading')
+          loadSrc:$r("app.media.pngSample"),
+          placeholderSrc:$r("app.media.loading")
         },syncLoad:true
       })
     }
@@ -103,10 +103,10 @@ struct ImageTestPage {
   build(){
     Column(){
       Row(){
-        Button('addItem').onClick(()=> {
+        Button("addItem").onClick(()=> {
           this.handAdd()
         })
-        Button('remove').onClick(()=> {
+        Button("remove").onClick(()=> {
           this.list.splice(0,1)
         })
       }

entry/src/main/ets/pages/TestImageKnifeCallbackPage.ets

@@ -20,38 +20,38 @@ import { router } from '@kit.ArkUI';
 @Component
 struct TestImageKnifeCallbackPage {
   @State imageKnifeOption: ImageKnifeOption = {
-    loadSrc: '',
+    loadSrc: "",
     objectFit: ImageFit.Contain,
     border: { radius: 50 }
   };
   @State currentWidth: number = 200
   @State currentHeight: number = 200
-  @State url: string | undefined = ''
-  @State imageType: string | undefined = ''
+  @State url: string | undefined = ""
+  @State imageType: string | undefined = ""
   @State imageWidth: number | undefined = 0
   @State imageHeight: number | undefined = 0
   @State imageSize: number | undefined = 0
   @State componentWidth: number | undefined = 0
   @State componentHeight: number | undefined = 0
   @State frameNum: number | undefined = 0
-  @State decodeSize: string | undefined = ''
-  @State errMsg: string | undefined = ''
-  @State errPhase: string | undefined = ''
-  @State errCode: number | undefined = 0
-  @State httpCode: number | undefined = 0
-  @State reqStartTime: string | undefined = ''
-  @State reqEndTime: string | undefined = ''
-  @State reqCancelTime: string | undefined = ''
-  @State memoryStartTime: string | undefined = ''
-  @State memoryEndTime: string | undefined = ''
-  @State diskStartTime: string | undefined = ''
-  @State diskEndTime: string | undefined = ''
-  @State netStartTime: string | undefined = ''
-  @State netEndTime: string | undefined = ''
-  @State decodeStartTime: string | undefined = ''
-  @State decodeEndTime: string | undefined = ''
+  @State decodeSize: string | undefined = ""
+  @State err_msg: string | undefined = ""
+  @State err_phase: string | undefined = ""
+  @State err_code: number | undefined = 0
+  @State http_code: number | undefined = 0
+  @State reqStartTime: string | undefined = ""
+  @State reqEndTime: string | undefined = ""
+  @State reqCancelTime: string | undefined = ""
+  @State memoryStartTime: string | undefined = ""
+  @State memoryEndTime: string | undefined = ""
+  @State diskStartTime: string | undefined = ""
+  @State diskEndTime: string | undefined = ""
+  @State netStartTime: string | undefined = ""
+  @State netEndTime: string | undefined = ""
+  @State decodeStartTime: string | undefined = ""
+  @State decodeEndTime: string | undefined = ""
+  @State renderTime: string | undefined = ""
   @State showChild: boolean = true;
-  @State requestFrom: string = '';
 
   build() {
     Column() {
@@ -61,10 +61,10 @@ struct TestImageKnifeCallbackPage {
       Text($r('app.string.componentWH', this.componentWidth, this.componentHeight)).fontSize(14)
       Text($r('app.string.img_frame', this.frameNum)).fontSize(14)
       Text($r('app.string.img_content_size', this.decodeSize)).fontSize(14)
-      Text($r('app.string.err_msg', this.errMsg)).fontSize(14)
-      Text($r('app.string.err_phase', this.errPhase)).fontSize(14)
-      Text($r('app.string.err_code', this.errCode)).fontSize(14)
-      Text($r('app.string.http_code', this.httpCode)).fontSize(14)
+      Text($r('app.string.err_msg', this.err_msg)).fontSize(14)
+      Text($r('app.string.err_phase', this.err_phase)).fontSize(14)
+      Text($r('app.string.err_code', this.err_code)).fontSize(14)
+      Text($r('app.string.http_code', this.http_code)).fontSize(14)
       Text($r('app.string.req_start_time', this.reqStartTime)).fontSize(14)
       Text($r('app.string.req_end_time', this.reqEndTime)).fontSize(14)
       Text($r('app.string.req_cancel_time', this.reqCancelTime)).fontSize(14)
@@ -76,7 +76,7 @@ struct TestImageKnifeCallbackPage {
       Text($r('app.string.net_end_time', this.netEndTime)).fontSize(14)
       Text($r('app.string.decode_start_time', this.decodeStartTime)).fontSize(14)
       Text($r('app.string.decode_end_time', this.decodeEndTime)).fontSize(14)
-      Text($r('app.string.request_data_from', this.requestFrom)).fontSize(14)
+      Text($r('app.string.render_time', this.renderTime)).fontSize(14)
 
       Scroll() {
         Column() {
@@ -87,23 +87,28 @@ struct TestImageKnifeCallbackPage {
               .onClick(() => {
                 this.destroy();
                 this.imageKnifeOption = {
-                  loadSrc: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg',
+                  loadSrc: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg",
                   objectFit: ImageFit.Contain,
                   onLoadListener: {
                     onLoadStart: (data) => {
                       this.analyzeStartCallBackData(data);
                     },
                     onLoadFailed: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     },
                     onLoadSuccess: (data, imageData, req) => {
-                      this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                      this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                     },
                     onLoadCancel: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     }
                   },
                   border: { radius: 50 },
+                  onComplete: (event) => {
+                    if (event && event.loadingStatus == 0) {
+                      this.renderTime = this.formatDate(Date.now());
+                    }
+                  }
                 }
               })
 
@@ -119,16 +124,21 @@ struct TestImageKnifeCallbackPage {
                       this.analyzeStartCallBackData(data);
                     },
                     onLoadFailed: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     },
                     onLoadSuccess: (data, imageData, req) => {
-                      this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                      this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                     },
                     onLoadCancel: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     }
                   },
                   border: { radius: 50 },
+                  onComplete: (event) => {
+                    if (event && event.loadingStatus == 0) {
+                      this.renderTime = this.formatDate(Date.now());
+                    }
+                  }
                 }
               })
             Button($r('app.string.local_pic'))
@@ -143,16 +153,21 @@ struct TestImageKnifeCallbackPage {
                       this.analyzeStartCallBackData(data);
                     },
                     onLoadFailed: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     },
                     onLoadSuccess: (data, imageData, req) => {
-                      this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                      this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                     },
                     onLoadCancel: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     }
                   },
                   border: { radius: 50 },
+                  onComplete: (event) => {
+                    if (event && event.loadingStatus == 0) {
+                      this.renderTime = this.formatDate(Date.now());
+                    }
+                  }
                 }
               })
           }
@@ -163,23 +178,28 @@ struct TestImageKnifeCallbackPage {
               .onClick(() => {
                 this.destroy();
                 this.imageKnifeOption = {
-                  loadSrc: 'https://img-blog.csdn.net/20140514114039140',
+                  loadSrc: "https://img-blog.csdn.net/20140514114039140",
                   objectFit: ImageFit.Contain,
                   onLoadListener: {
                     onLoadStart: (data) => {
                       this.analyzeStartCallBackData(data);
                     },
                     onLoadFailed: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     },
                     onLoadSuccess: (data, imageData, req) => {
-                      this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                      this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                     },
                     onLoadCancel: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     }
                   },
                   border: { radius: 50 },
+                  onComplete: (event) => {
+                    if (event && event.loadingStatus == 0) {
+                      this.renderTime = this.formatDate(Date.now());
+                    }
+                  }
                 }
               })
 
@@ -195,16 +215,21 @@ struct TestImageKnifeCallbackPage {
                       this.analyzeStartCallBackData(data);
                     },
                     onLoadFailed: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     },
                     onLoadSuccess: (data, imageData, req) => {
-                      this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                      this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                     },
                     onLoadCancel: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     }
                   },
                   border: { radius: 50 },
+                  onComplete: (event) => {
+                    if (event && event.loadingStatus == 0) {
+                      this.renderTime = this.formatDate(Date.now());
+                    }
+                  }
                 }
               })
             Button($r('app.string.share_load_failed'))
@@ -219,16 +244,21 @@ struct TestImageKnifeCallbackPage {
                       this.analyzeStartCallBackData(data);
                     },
                     onLoadFailed: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     },
                     onLoadSuccess: (data, imageData, req) => {
-                      this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                      this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                     },
                     onLoadCancel: (res, req) => {
-                      this.analyzeFailedBackData(res, req?.imageKnifeData);
+                      this.analyzeFailedBackData(res, req?.getImageKnifeData());
                     }
                   },
                   border: { radius: 50 },
+                  onComplete: (event) => {
+                    if (event && event.loadingStatus == 0) {
+                      this.renderTime = this.formatDate(Date.now());
+                    }
+                  }
                 }
               })
           }
@@ -238,7 +268,7 @@ struct TestImageKnifeCallbackPage {
             .onClick(() => {
               this.destroy();
               this.imageKnifeOption = {
-                loadSrc: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/bf/v3/lSjrRwFcS-ez6jp1ALSQFg/0n7R7XinSPyrYLqDu_1dfw.jpg',
+                loadSrc: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/bf/v3/lSjrRwFcS-ez6jp1ALSQFg/0n7R7XinSPyrYLqDu_1dfw.jpg",
                 objectFit: ImageFit.Contain,
                 onLoadListener: {
                   onLoadStart: (data) => {
@@ -246,16 +276,21 @@ struct TestImageKnifeCallbackPage {
                     this.analyzeStartCallBackData(data);
                   },
                   onLoadFailed: (res, req) => {
-                    this.analyzeFailedBackData(res, req?.imageKnifeData);
+                    this.analyzeFailedBackData(res, req?.getImageKnifeData());
                   },
                   onLoadSuccess: (data, imageData, req) => {
-                    this.analyzeSuccessCallBackData(req?.imageKnifeData);
+                    this.analyzeSuccessCallBackData(req?.getImageKnifeData());
                   },
                   onLoadCancel: (res, req) => {
-                    this.analyzeFailedBackData(res, req?.imageKnifeData);
+                    this.analyzeFailedBackData(res, req?.getImageKnifeData());
                   }
                 },
                 border: { radius: 50 },
+                onComplete: (event) => {
+                  if (event && event.loadingStatus == 0) {
+                    this.renderTime = this.formatDate(Date.now());
+                  }
+                }
               }
             })
 
@@ -296,7 +331,7 @@ struct TestImageKnifeCallbackPage {
   }
 
   analyzeStartCallBackData(req: ImageKnifeRequest | undefined) {
-    let data = req?.imageKnifeData;
+    let data = req?.getImageKnifeData();
     if (data) {
       if (typeof req?.imageKnifeOption.loadSrc == 'string') {
         this.url = req?.imageKnifeOption.loadSrc;
@@ -306,7 +341,6 @@ struct TestImageKnifeCallbackPage {
       this.reqStartTime = this.formatDate(data.timeInfo?.requestStartTime);
       this.memoryStartTime = this.formatDate(data.timeInfo?.memoryCheckStartTime);
       this.memoryEndTime = this.formatDate(data.timeInfo?.memoryCheckEndTime);
-      this.requestFrom = '';
     }
   }
 
@@ -316,7 +350,6 @@ struct TestImageKnifeCallbackPage {
       this.imageHeight = data.imageHeight;
       this.imageSize = data.bufSize;
       this.frameNum = data.frameCount;
-      this.httpCode = data.httpCode
       this.decodeSize = JSON.stringify(data.decodeImages);
       this.imageType = data.type;
       this.reqEndTime = this.formatDate(data.timeInfo?.requestEndTime);
@@ -326,23 +359,15 @@ struct TestImageKnifeCallbackPage {
       this.netEndTime = this.formatDate(data.timeInfo?.netRequestEndTime);
       this.decodeStartTime = this.formatDate(data.timeInfo?.diskCheckStartTime);
       this.decodeEndTime = this.formatDate(data.timeInfo?.diskCheckEndTime);
-      if (data.timeInfo?.netRequestEndTime !== undefined) {
-        this.requestFrom = 'Http request';
-      } else if (data.timeInfo?.diskCheckEndTime !== undefined) {
-        this.requestFrom = 'File Cache';
-      } else {
-        this.requestFrom = 'Memory Cache';
-      }
-
     }
   }
 
   analyzeFailedBackData(res: string, data: ImageKnifeData | undefined) {
     if (data) {
-      this.errMsg = res;
-      this.errPhase = data.errorInfo?.phase;
-      this.errCode = data.errorInfo?.code;
-      this.httpCode = data.httpCode;
+      this.err_msg = res;
+      this.err_phase = data.errorInfo?.phase;
+      this.err_code = data.errorInfo?.code;
+      this.http_code = data.errorInfo?.httpCode;
       this.reqEndTime = this.formatDate(data.timeInfo?.requestEndTime);
       this.diskStartTime = this.formatDate(data.timeInfo?.diskCheckStartTime);
       this.diskEndTime = this.formatDate(data.timeInfo?.diskCheckEndTime);
@@ -351,37 +376,37 @@ struct TestImageKnifeCallbackPage {
       this.decodeStartTime = this.formatDate(data.timeInfo?.diskCheckStartTime);
       this.decodeEndTime = this.formatDate(data.timeInfo?.diskCheckEndTime);
       this.reqCancelTime = this.formatDate(data.timeInfo?.requestCancelTime)
-      this.requestFrom = '';
     }
   }
 
   destroy() {
     this.currentWidth = 200
     this.currentHeight = 200
-    this.url = ''
-    this.imageType = ''
+    this.url = ""
+    this.imageType = ""
     this.imageWidth = 0
     this.imageHeight = 0
     this.imageSize = 0
     this.componentWidth = 0
     this.componentHeight = 0
     this.frameNum = 0
-    this.decodeSize = ''
-    this.errMsg = ''
-    this.errPhase = ''
-    this.errCode = 0
-    this.httpCode = 0
-    this.reqStartTime = ''
-    this.reqEndTime = ''
-    this.reqCancelTime = ''
-    this.memoryStartTime = ''
-    this.memoryEndTime = ''
-    this.diskStartTime = ''
-    this.diskEndTime = ''
-    this.netStartTime = ''
-    this.netEndTime = ''
-    this.decodeStartTime = ''
-    this.decodeEndTime = ''
+    this.decodeSize = ""
+    this.err_msg = ""
+    this.err_phase = ""
+    this.err_code = 0
+    this.http_code = 0
+    this.reqStartTime = ""
+    this.reqEndTime = ""
+    this.reqCancelTime = ""
+    this.memoryStartTime = ""
+    this.memoryEndTime = ""
+    this.diskStartTime = ""
+    this.diskEndTime = ""
+    this.netStartTime = ""
+    this.netEndTime = ""
+    this.decodeStartTime = ""
+    this.decodeEndTime = ""
+    this.renderTime = ""
     this.showChild = true;
   }
 }

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

@@ -22,30 +22,30 @@ struct TestIsUrlExist {
     placeholderSrc: $r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
   }
-  @State source: PixelMap | string | Resource = $r('app.media.startIcon')
-  @State source1: PixelMap | string | Resource = $r('app.media.startIcon')
+  @State source: PixelMap | string | Resource = $r("app.media.startIcon")
+  @State source1: PixelMap | string | Resource = $r("app.media.startIcon")
 
   build() {
     Column() {
       Flex() {
         Button($r('app.string.Preloading_GIF')).onClick(() => {
           this.imageKnifeOption.loadSrc =
-            'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658'
+            "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658"
         })
         Button($r('app.string.Retrieve_GIF_from_memory')).onClick(() => {
           ImageKnife.getInstance()
-            .getCacheImage('https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
+            .getCacheImage("https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
               CacheStrategy.Memory)
             .then((data) => {
-              this.source = data !== undefined ? data.source : $r('app.media.startIcon')
+              this.source = data !== undefined ? data.source : $r("app.media.startIcon")
             })
         })
         Button($r('app.string.Retrieve_GIF_from_disk')).onClick(() => {
           ImageKnife.getInstance()
-            .getCacheImage('https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
+            .getCacheImage("https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
               CacheStrategy.File)
             .then((data) => {
-              this.source1 = data !== undefined ? data.source : $r('app.media.startIcon')
+              this.source1 = data !== undefined ? data.source : $r("app.media.startIcon")
             })
         })
       }

entry/src/main/ets/pages/TestListImageKnifeCallbackPage.ets

@@ -16,9 +16,9 @@
 import { ImageKnifeComponent} from '@ohos/libraryimageknife';
 
 class ArrayElement {
-  public src: string = '';
-  public w: number = 0;
-  public h: number = 0;
+  src: string = "";
+  w: number = 0;
+  h: number = 0;
 }
 
 @Entry
@@ -27,27 +27,27 @@ struct TestListImageKnifeCallbackPage {
   private wid: number = 200;
   private hig: number = 200;
   private dataArray: ESObject[] = [
-    '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/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg',
-    'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/78/v3/qQJpAtRGQe2e_VhbGHDgIw/b3zlit99S6GybD3XdNwqJw.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/55/v3/5DZ2LLqYSsK85-shqgLveQ/7ZXcyCWNTvOzQP5FFLBGkg.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/25/v3/jgB2ekkTRX-3yTYZalnANQ/xff_x9cbSPqb7fbNwgJa7A.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fb/v3/alXwXLHKSyCAIWt_ydgD2g/BCCuu25TREOitQxM7eYOEw.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/63/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/16/v3/fm2tO4TsRH6mv_D_nSSd5w/FscLpLwQQ-KuV7oaprFK2Q.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/89/v3/UAUvtPHqRD-GWWANsEC57Q/zcRJCQebQ322Aby4jzmwmQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/tUUzzx73R4yp8G--lMhuWQ/EBbcu_dLTT-Jj68XAh6mtA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/37/v3/12rH1yiEQmK9wlOOcy5avQ/RzBXiEBRRqOC7LRkwNj6VA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/9a/v3/TpRN4AIzRoyUXIqWdKoE0g/ShOnD_tfS46HDbpSWhbCkQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/03/v3/H3X17s8eTdS2w56JgbB5jQ/a45sT-j8Sbe8sSQXTzeYvQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/96/v3/rMJJoAflTDSWa1z2pHs2wg/8dOqD0GlQBOCL5AvQok9FQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/ed/v3/KMO4D6D2QGuVOCLX4AhOFA/ef51xAaLQuK7BsnuD9abog.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/d9/v3/FSZH0aTdSqWxeAaxoPvi0g/RqxPxUCXQFiTMBfKTF9kkw.jpg',
-    'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB',
+    "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/56/v3/8MdhfSsCSMKj4sA6okUWrg/5uBx56tLTUO3RYQl-E5JiQ.jpg",
+    "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/78/v3/qQJpAtRGQe2e_VhbGHDgIw/b3zlit99S6GybD3XdNwqJw.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/55/v3/5DZ2LLqYSsK85-shqgLveQ/7ZXcyCWNTvOzQP5FFLBGkg.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/25/v3/jgB2ekkTRX-3yTYZalnANQ/xff_x9cbSPqb7fbNwgJa7A.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fb/v3/alXwXLHKSyCAIWt_ydgD2g/BCCuu25TREOitQxM7eYOEw.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/63/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/16/v3/fm2tO4TsRH6mv_D_nSSd5w/FscLpLwQQ-KuV7oaprFK2Q.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/89/v3/UAUvtPHqRD-GWWANsEC57Q/zcRJCQebQ322Aby4jzmwmQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/tUUzzx73R4yp8G--lMhuWQ/EBbcu_dLTT-Jj68XAh6mtA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/37/v3/12rH1yiEQmK9wlOOcy5avQ/RzBXiEBRRqOC7LRkwNj6VA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/9a/v3/TpRN4AIzRoyUXIqWdKoE0g/ShOnD_tfS46HDbpSWhbCkQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/03/v3/H3X17s8eTdS2w56JgbB5jQ/a45sT-j8Sbe8sSQXTzeYvQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/96/v3/rMJJoAflTDSWa1z2pHs2wg/8dOqD0GlQBOCL5AvQok9FQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/ed/v3/KMO4D6D2QGuVOCLX4AhOFA/ef51xAaLQuK7BsnuD9abog.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/d9/v3/FSZH0aTdSqWxeAaxoPvi0g/RqxPxUCXQFiTMBfKTF9kkw.jpg",
+    "https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB",
     'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/bf/v3/lSjrRwFcS-ez6jp1ALSQFg/0n7R7XinSPyrYLqDu_1dfw.jpg',
     'https://img-blog.csdn.net/20140514114029140',
     'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
@@ -78,19 +78,17 @@ struct TestListImageKnifeCallbackPage {
               objectFit: ImageFit.Contain,
               onLoadListener: {
                 onLoadStart: (data) => {
-                  console.log('listCache start:{ url:' + data?.imageKnifeOption.loadSrc +
-                    ',componentWidth:' + data?.componentWidth +
-                    ',componentHeight:' + data?.componentHeight +
-                    '},' + JSON.stringify(data?.imageKnifeData))
+                  console.log("listCache start:{ url:"+data?.imageKnifeOption.loadSrc +",componentWidth:"+data?.componentWidth+",componentHeight:"+data?.componentHeight+"},"
+                    + JSON.stringify(data?.getImageKnifeData()))
                 },
                 onLoadFailed: (res, req) => {
-                  console.log('listCache onLoadFailed:res:' + res + ';' + JSON.stringify(req?.imageKnifeData))
+                  console.log("listCache onLoadFailed:res:" + res + ";" + JSON.stringify(req?.getImageKnifeData()))
                 },
                 onLoadSuccess: (data, imageData,req) => {
-                  console.log('listCache onLoadSuccess:' + JSON.stringify(req?.imageKnifeData))
+                  console.log("listCache onLoadSuccess:" + JSON.stringify(req?.getImageKnifeData()))
                 },
                 onLoadCancel: (res, req) => {
-                  console.log('listCache onLoadCancel:res:' + res + ';' + JSON.stringify(req?.imageKnifeData))
+                  console.log("listCache onLoadCancel:res:" + res + ";" + JSON.stringify(req?.getImageKnifeData()))
                 }
               },
               border: { radius: 50 },

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

@@ -22,9 +22,9 @@ struct TestLoadCancelListenerPage {
   @State currentWidth: number = 200
   @State currentHeight: number = 200
   @State showChild: boolean = true;
-  @State text: string = '';
+  @State text: string = "";
   @State ImageKnifeOption: ImageKnifeOption = {
-    loadSrc: '',
+    loadSrc: "",
     objectFit: ImageFit.Contain,
     border: { radius: 50 }
   };
@@ -37,7 +37,7 @@ struct TestLoadCancelListenerPage {
         .onClick(() => {
           this.clearCache();
           this.ImageKnifeOption = {
-            loadSrc: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg',
+            loadSrc: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg",
             objectFit: ImageFit.Contain,
             onLoadListener: {
               onLoadStart: () => {
@@ -45,7 +45,7 @@ struct TestLoadCancelListenerPage {
               },
               onLoadCancel: (res) => {
                 this.text = res
-                console.log('TestLoadCancelListenerPage----onLoadCancel> url:' + res)
+                console.log("TestLoadCancelListenerPage----onLoadCancel> url:" + res)
               }
             },
             border: { radius: 50 }
@@ -54,10 +54,10 @@ struct TestLoadCancelListenerPage {
 
       Button($r('app.string.component_display'))
         .margin(20).onClick(() => {
-        this.text = '';
+        this.text = "";
         this.showChild = true;
         this.ImageKnifeOption = {
-          loadSrc: '',
+          loadSrc: "",
           objectFit: ImageFit.Contain,
           border: { radius: 50 }
         }
@@ -75,7 +75,7 @@ struct TestLoadCancelListenerPage {
               },
               onLoadCancel: (res) => {
                 this.text = res
-                console.log('TestLoadCancelListenerPage----onLoadCancel> url:' + res)
+                console.log("TestLoadCancelListenerPage----onLoadCancel> url:" + res)
               }
             },
             border: { radius: 50 }

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

@@ -24,22 +24,22 @@ struct TestPrefetchToFileCachePage {
   }
   async preload(url:string) {
     let fileCachePath = await ImageKnife.getInstance().preLoadCache(url)
-    console.log('preload-fileCachePath=='+ fileCachePath)
+    console.log("preload-fileCachePath=="+ fileCachePath)
   }
   async preload1(url:string) {
     let fileCachePath = await ImageKnife.getInstance().preLoadCache({ loadSrc: url })
-    console.log('preload-fileCachePath1=='+ fileCachePath)
+    console.log("preload-fileCachePath1=="+ fileCachePath)
   }
   build() {
     Column() {
       Button($r('app.string.Preloading_images_to_file_cache_using_URL')).margin({top:10}).onClick(async ()=>{
-        await this.preload('https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658')
+        await this.preload("https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658")
       })
       Button($r('app.string.Preloading_images_to_file_cache_using_option')).margin({top:10}).onClick(async ()=>{
-        await this.preload1('https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658')
+        await this.preload1("https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658")
       })
       Button($r('app.string.Load_image_offline_after_preloading')).margin({top:10}).onClick(()=>{
-        this.imageKnifeOption.loadSrc = 'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658'
+        this.imageKnifeOption.loadSrc = "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658"
       })
       ImageKnifeComponent({
         imageKnifeOption: this.imageKnifeOption

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

@@ -22,33 +22,33 @@ struct TestRemoveCache {
     placeholderSrc: $r('app.media.loading'),
     errorholderSrc:$r('app.media.failed')
   }
-  @State source: PixelMap | string | Resource = $r('app.media.startIcon');
-  @State source1: PixelMap | string | Resource = $r('app.media.startIcon');
+  @State source: PixelMap | string | Resource = $r("app.media.startIcon");
+  @State source1: PixelMap | string | Resource = $r("app.media.startIcon");
   @State url: string = '';
 
   build() {
     Column() {
       Flex() {
         Button($r('app.string.Preloading_GIF')).onClick(() => {
-          this.imageKnifeOption.loadSrc = 'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658';
-          this.url = 'https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658';
+          this.imageKnifeOption.loadSrc = "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658";
+          this.url = "https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658";
         })
           .margin({left:10})
         Button($r('app.string.Retrieve_GIF_from_memory')).onClick(() => {
           ImageKnife.getInstance()
-            .getCacheImage('https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
+            .getCacheImage("https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
               CacheStrategy.Memory)
             .then((data) => {
-              this.source = data !== undefined ? data.source : $r('app.media.startIcon');
+              this.source = data !== undefined ? data.source : $r("app.media.startIcon");
             })
         })
           .margin({left:10})
         Button($r('app.string.Retrieve_GIF_from_disk')).onClick(() => {
           ImageKnife.getInstance()
-            .getCacheImage('https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658',
+            .getCacheImage("https://gd-hbimg.huaban.com/e0a25a7cab0d7c2431978726971d61720732728a315ae-57EskW_fw658",
               CacheStrategy.File)
             .then((data) => {
-              this.source1 = data !== undefined ? data.source : $r('app.media.startIcon');
+              this.source1 = data !== undefined ? data.source : $r("app.media.startIcon");
             })
         })
           .margin({left:10})

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

@@ -32,21 +32,21 @@ struct TestSetCustomImagePage {
   }
   build() {
     Column() {
-      Button(this.getResourceString($r('app.string.Custom_network_download')) + ' a').onClick(()=>{
+      Button(this.getResourceString($r('app.string.Custom_network_download')) + " a").onClick(()=>{
         this.imageKnifeOption ={
-          loadSrc: 'aaa',
+          loadSrc: "aaa",
           placeholderSrc: $r('app.media.loading')
         }
       })
-      Button(this.getResourceString($r('app.string.Custom_network_download')) + ' b').onClick(()=>{
+      Button(this.getResourceString($r('app.string.Custom_network_download')) + " b").onClick(()=>{
         this.imageKnifeOption = {
-          loadSrc: 'bbb',
+          loadSrc: "bbb",
           placeholderSrc: $r('app.media.loading')
         }
       })
-      Button(this.getResourceString($r('app.string.Custom_network_download')) + ' c').onClick(()=>{
+      Button(this.getResourceString($r('app.string.Custom_network_download')) + " c").onClick(()=>{
         this.imageKnifeOption = {
-          loadSrc: 'ccc',
+          loadSrc: "ccc",
           placeholderSrc: $r('app.media.loading')
         }
       })
@@ -55,14 +55,14 @@ struct TestSetCustomImagePage {
       }).width(300)
         .height(300)
     }
-    .width('100%')
-    .height('100%')
+    .width("100%")
+    .height("100%")
   }
 }
 @Concurrent
 async function custom(context: Context, src: string | PixelMap | Resource,headers?: Record<string,Object>): Promise<ArrayBuffer | undefined> {
-  console.info('ImageKnife::  custom download：' + src)
+  console.info("ImageKnife::  custom download：" + src)
   // 举例写死从本地文件读取，也可以自己请求网络图片
-  let buffer = context.resourceManager.getMediaContentSync($r('app.media.pngSample').id).buffer as ArrayBuffer
+  let buffer = context.resourceManager.getMediaContentSync($r("app.media.pngSample").id).buffer as ArrayBuffer
   return buffer
 }

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

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife'
+import { ImageKnifeComponent, ImageKnifeOption } from "@ohos/libraryimageknife"
 
 @ComponentV2
 export struct ZuImage {
@@ -43,7 +43,7 @@ export struct ZuImage {
 @ComponentV2
 struct TestTaskResourcePage {
   @Local stateMenus: Array<string> = [
-    'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB',
+    "https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB",
     'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/bf/v3/lSjrRwFcS-ez6jp1ALSQFg/0n7R7XinSPyrYLqDu_1dfw.jpg',
     'https://img-blog.csdn.net/20140514114029140',
     'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
@@ -53,7 +53,7 @@ struct TestTaskResourcePage {
     Column({ space: 8 }) {
       ZuImage({
         src: item,
-        placeholderSrc: $r('app.media.loading')
+        placeholderSrc: $r("app.media.loading")
       }).width(44)
         .height(44)
     }
@@ -66,7 +66,7 @@ struct TestTaskResourcePage {
           this._buildItem(item)
         }
       })
-    }.width('100%')
+    }.width("100%")
     .columnsTemplate('1fr 1fr 1fr 1fr 1fr')
     .rowsGap(24)
     .padding({

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

@@ -48,7 +48,7 @@ struct TestWriteCacheStage {
       }).width(200).height(200).margin({top:10})
       Button($r('app.string.Write_memory')).margin({top:10}).onClick(async ()=>{
         this.imageKnifeOption2 = {
-          loadSrc:'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB',
+          loadSrc:"https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB",
           placeholderSrc:$r('app.media.loading'),
           errorholderSrc:$r('app.media.failed'),
           writeCacheStrategy:CacheStrategy.Memory

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

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife'
+import { ImageKnifeComponent, ImageKnifeOption } from "@ohos/libraryimageknife"
 import matrix4 from '@ohos.matrix4'
 
 
@@ -22,9 +22,9 @@ struct TransformPage {
   private custom_scale:number = 1
   @State matrix1:object = matrix4.identity().scale({ x: 1, y: 1 })
   @State ImageKnifeOption: ImageKnifeOption = {
-    loadSrc: $r('app.media.rabbit'),
-    placeholderSrc: $r('app.media.loading'),
-    errorholderSrc: $r('app.media.app_icon'),
+    loadSrc: $r("app.media.rabbit"),
+    placeholderSrc: $r("app.media.loading"),
+    errorholderSrc: $r("app.media.app_icon"),
     objectFit: ImageFit.Contain,
     border: { radius: 50 }
   }

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

@@ -22,8 +22,8 @@ class MyImageOption extends ImageKnifeOption {
 
 @Component
 export struct UserAvatar {
-  @Prop @Watch('userInfoUpdate') userInfo: string = ''
-  // @Prop userInfo: string = ''
+  @Prop @Watch('userInfoUpdate') userInfo: string = ""
+  // @Prop userInfo: string = ""
   imgSize: number = 100
   radius: number = 12
   borderSize: number = 0
@@ -87,12 +87,12 @@ export struct UserAvatar {
 
 
 
-      // Image(this.userInfo)
-      //  Text((this.imageKnifeOption.loadSrc as string).split('/')[8])
-      //    .position({ x: 0, y: 0 })
-      //    .zIndex(9)
-      //    .fontSize(12)
-      //    .fontColor('#ff0000')
+     // Image(this.userInfo)
+     //  Text((this.imageKnifeOption.loadSrc as string).split('/')[8])
+     //    .position({ x: 0, y: 0 })
+     //    .zIndex(9)
+     //    .fontSize(12)
+     //    .fontColor('#ff0000')
     }
   }
 }

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

@@ -20,58 +20,58 @@ import { UserAvatar } from './User'
 struct Index {
   @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',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/42/v3/2dSQCqERTP2TTPyssOMEbQ/zL1ebnKKQ_ilqTDcwCAkOw.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/78/v3/qQJpAtRGQe2e_VhbGHDgIw/b3zlit99S6GybD3XdNwqJw.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/55/v3/5DZ2LLqYSsK85-shqgLveQ/7ZXcyCWNTvOzQP5FFLBGkg.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/25/v3/jgB2ekkTRX-3yTYZalnANQ/xff_x9cbSPqb7fbNwgJa7A.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fb/v3/alXwXLHKSyCAIWt_ydgD2g/BCCuu25TREOitQxM7eYOEw.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/63/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/16/v3/fm2tO4TsRH6mv_D_nSSd5w/FscLpLwQQ-KuV7oaprFK2Q.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/89/v3/UAUvtPHqRD-GWWANsEC57Q/zcRJCQebQ322Aby4jzmwmQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/tUUzzx73R4yp8G--lMhuWQ/EBbcu_dLTT-Jj68XAh6mtA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/37/v3/12rH1yiEQmK9wlOOcy5avQ/RzBXiEBRRqOC7LRkwNj6VA.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/9a/v3/TpRN4AIzRoyUXIqWdKoE0g/ShOnD_tfS46HDbpSWhbCkQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/03/v3/H3X17s8eTdS2w56JgbB5jQ/a45sT-j8Sbe8sSQXTzeYvQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/96/v3/rMJJoAflTDSWa1z2pHs2wg/8dOqD0GlQBOCL5AvQok9FQ.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/ed/v3/KMO4D6D2QGuVOCLX4AhOFA/ef51xAaLQuK7BsnuD9abog.jpg',
-    'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/d9/v3/FSZH0aTdSqWxeAaxoPvi0g/RqxPxUCXQFiTMBfKTF9kkw.jpg',
-    'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB',
+    "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",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/42/v3/2dSQCqERTP2TTPyssOMEbQ/zL1ebnKKQ_ilqTDcwCAkOw.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/78/v3/qQJpAtRGQe2e_VhbGHDgIw/b3zlit99S6GybD3XdNwqJw.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/55/v3/5DZ2LLqYSsK85-shqgLveQ/7ZXcyCWNTvOzQP5FFLBGkg.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/3e/v3/LqRoLI-PRSu9Nqa8KdJ-pQ/dSqskBpSR9eraAMn7NBdqA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/25/v3/jgB2ekkTRX-3yTYZalnANQ/xff_x9cbSPqb7fbNwgJa7A.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/fb/v3/alXwXLHKSyCAIWt_ydgD2g/BCCuu25TREOitQxM7eYOEw.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/63/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/16/v3/fm2tO4TsRH6mv_D_nSSd5w/FscLpLwQQ-KuV7oaprFK2Q.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/89/v3/UAUvtPHqRD-GWWANsEC57Q/zcRJCQebQ322Aby4jzmwmQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/tUUzzx73R4yp8G--lMhuWQ/EBbcu_dLTT-Jj68XAh6mtA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/76/v3/EyF6z4FISpCHhae38eEexw/OtyAiu-zSSevNQYvUdtVmA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/37/v3/12rH1yiEQmK9wlOOcy5avQ/RzBXiEBRRqOC7LRkwNj6VA.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/9a/v3/TpRN4AIzRoyUXIqWdKoE0g/ShOnD_tfS46HDbpSWhbCkQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/03/v3/H3X17s8eTdS2w56JgbB5jQ/a45sT-j8Sbe8sSQXTzeYvQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/10/v3/qaEzwkU0QeKb1yehnP2Xig/q7fxAlgMQKup-HUBayRLGQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/96/v3/rMJJoAflTDSWa1z2pHs2wg/8dOqD0GlQBOCL5AvQok9FQ.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/ed/v3/KMO4D6D2QGuVOCLX4AhOFA/ef51xAaLQuK7BsnuD9abog.jpg",
+    "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/d9/v3/FSZH0aTdSqWxeAaxoPvi0g/RqxPxUCXQFiTMBfKTF9kkw.jpg",
+    "https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB",
     'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/bf/v3/lSjrRwFcS-ez6jp1ALSQFg/0n7R7XinSPyrYLqDu_1dfw.jpg',
     'https://img-blog.csdn.net/20140514114029140',
     'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp',
   ]
   aboutToAppear(): void {
     this.hotCommendList.addData(this.hotCommendList.totalCount(),this.data)
-    AppStorage.set('WeLink_Mob_fontSize_multiple',1)
+    AppStorage.set("WeLink_Mob_fontSize_multiple",1)
   }
 
   build() {
     Column() {
-      Button('bigger').onClick(()=>{
-        AppStorage.set('WeLink_Mob_fontSize_multiple',1.6)
+      Button("bigger").onClick(()=>{
+        AppStorage.set("WeLink_Mob_fontSize_multiple",1.6)
       })
-      Button('small').onClick(()=>{
-        AppStorage.set('WeLink_Mob_fontSize_multiple',0.8)
+      Button("small").onClick(()=>{
+        AppStorage.set("WeLink_Mob_fontSize_multiple",0.8)
       })
       List(){
         LazyForEach(this.hotCommendList,(item:string)=>{
           ListItem(){
             ReuseImage({
               userInfo:item
-            }).width('100%').height('100%').backgroundColor(Color.Yellow)
+            }).width("100%").height("100%").backgroundColor(Color.Yellow)
           }.width(200).height(200).margin({bottom:5})
         })
       }
       // .cachedCount(20)
-      .width('100%')
-      .height('100%')
+      .width("100%")
+      .height("100%")
       .backgroundColor(0xFAEEE0)
-    }.width('100%').height('100%')
+    }.width('100%').height("100%")
   }
 }
 
@@ -79,7 +79,7 @@ struct Index {
 @Reusable
 @Component
 struct ReuseImage {
-  @State userInfo:string = ''
+  @State userInfo:string = ""
   aboutToReuse(params: ESObject): void {
     this.userInfo = params.userInfo
   }
@@ -89,6 +89,6 @@ struct ReuseImage {
       UserAvatar({
         userInfo:this.userInfo
       })
-    }.width('100%').height('100%')
+    }.width("100%").height("100%")
   }
 }

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

@@ -1,13 +1,13 @@
 /*
  * Copyright (C) 2024 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the 'License');
+ * 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,
+ * 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.

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

@@ -12,6 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+import { statfs } from '@kit.CoreFileKit'
+import { rcp } from '@kit.RemoteCommunicationKit'
 
 export class CommonDataSource <T> implements IDataSource {
   private dataArray: T[] = []
@@ -53,3 +55,6 @@ export class CommonDataSource <T> implements IDataSource {
     })
   }
 }
+export class GetSession {
+  static session:rcp.Session = rcp.createSession()
+}

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

@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnife, ImageKnifeRequest} from '@ohos/libraryimageknife'
+import {ImageKnife, ImageKnifeRequest} from "@ohos/libraryimageknife"
 import { IDataSourcePrefetching } from '@kit.ArkUI';
 import { HashMap } from '@kit.ArkTS';
 
@@ -61,7 +61,7 @@ export default class DataSourcePrefetchingImageKnife implements IDataSourcePrefe
   }
   async prefetch(index: number): Promise<void> {
     let item = this.dataArray[index]
-    if (typeof item.albumUrl == 'string') {
+    if (typeof item.albumUrl == "string") {
       // 图片预加载
       let request = ImageKnife.getInstance().preload({
         loadSrc:item.albumUrl,

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

@@ -17,127 +17,127 @@ 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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/5/v3/tv8Vqf9hQrKpozGeZWg2mw/VEICB-bmQYi0Iv6TGADbhw.jpg"
     },
     {
-      albumUrl: 'https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/4v1Ot5BRR6OFVQ9MGn9Xxg/xrPgRn0LS1ep-r7ewIuwiw.jpg'
+      albumUrl: "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/30/v3/4v1Ot5BRR6OFVQ9MGn9Xxg/xrPgRn0LS1ep-r7ewIuwiw.jpg"
     },
   ]
   static getItems() {

entry/src/main/module.json5

@@ -5,11 +5,8 @@
     "description": "$string:module_desc",
     "mainElement": "EntryAbility",
     "deviceTypes": [
-      "default",
+      "phone",
       "tablet",
-      "tv",
-      "wearable",
-      "car",
       "2in1"
     ],
     "deliveryWithInstall": true,

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

@@ -40,10 +40,6 @@
       "name": "Test_SingleImage",
       "value": "SingleImage"
     },
-    {
-      "name": "Test_LocalImageShow",
-      "value": "LocalImageShow"
-    },
     {
       "name": "Test_custom_download",
       "value": "Global custom download"
@@ -110,11 +106,11 @@
     },
     {
       "name": "Display_the_first_frame",
-      "value": "first frame"
+      "value": "Display the first frame of the animation"
     },
     {
       "name": "Display_the_last_frame",
-      "value": "last frame"
+      "value": "Display the last frame of the animation"
     },
     {
       "name": "Play",
@@ -144,26 +140,10 @@
       "name": "Local_SVG",
       "value": "Local SVG image"
     },
-    {
-      "name": "local_r_file",
-      "value": "Local $r file"
-    },
-    {
-      "name": "local_rawfile",
-      "value": "Local rawfile"
-    },
     {
       "name": "Under_context_file",
       "value": "Files under context file"
     },
-    {
-      "name": "local_other_module",
-      "value": "Local other module"
-    },
-    {
-      "name": "in_other_module",
-      "value": "in other module"
-    },
     {
       "name": "Network_images",
       "value": "Network images"
@@ -582,11 +562,11 @@
     },
     {
       "name": "img_frame",
-      "value": "the frames of the animator:%d "
+      "value": "the number of frames of the picture:%d "
     },
     {
       "name": "img_content_size",
-      "value": "decoded width and height size of image:%s "
+      "value": "picture decoded width and height size:%s "
     },
     {
       "name": "err_msg",
@@ -606,15 +586,15 @@
     },
     {
       "name": "req_start_time",
-      "value": "request start time:%s "
+      "value": "image request start time point:%s "
     },
     {
       "name": "req_end_time",
-      "value": "request end time:%s "
+      "value": "the point in time at which the image request ends:%s "
     },
     {
       "name": "req_cancel_time",
-      "value": "request cancel time:%s "
+      "value": "the point at which the image request is cancelled:%s "
     },
     {
       "name": "memory_start_time",
@@ -649,8 +629,8 @@
       "value": "decoding end time point:%s "
     },
     {
-      "name": "request_data_from",
-      "value": "request from:%s "
+      "name": "render_time",
+      "value": "render successful time:%s "
     },
     {
       "name": "Image_Downsampling_Functionality",
@@ -667,46 +647,6 @@
     {
       "name": "After_the_sampling",
       "value": "Size after downsampling"
-    },
-    {
-      "name": "adjust_size",
-      "value": "Adjust size"
-    },
-    {
-      "name": "Auto_ImageFit",
-      "value": "ImageFit.Auto:Auto ImageFit Height"
-    },
-    {
-      "name": "Single_CallBack",
-      "value": "Single image callback"
-    },
-    {
-      "name": "Multiple_CallBack",
-      "value": "Multiple image callback"
-    },
-    {
-      "name": "Error_Message",
-      "value": "error message"
-    },
-    {
-      "name": "test_exif",
-      "value": "Test display orientation base on the EXIF metadata "
-    },
-    {
-      "name": "base_image",
-      "value": "The image don't carry rotation information"
-    },
-    {
-      "name": "rotate_mirror",
-      "value": "Mirror horizontal"
-    },
-    {
-    "name": "rotate_rotate90",
-    "value": "Rotate 90°"
-    },
-    {
-      "name": "rotate_mirror_rotate270",
-      "value": "Mirror horizontal and rotate 270°"
     }
   ]
 }

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",
@@ -31,18 +32,13 @@
     "pages/TestCacheDataPage",
     "pages/TestChangeColorPage",
     "pages/TestLoadCancelListenerPage",
+    "pages/CustomNetImagePage",
     "pages/SetMaxRequestPage",
     "pages/MaxRequest1",
     "pages/MaxRequest2",
     "pages/MaxRequest3",
     "pages/TestImageKnifeCallbackPage",
     "pages/TestListImageKnifeCallbackPage",
-    "pages/DownSamplePage",
-    "pages/AutoImageFit",
-    "pages/SingleImageCallBack",
-    "pages/MultipleImageCallBack",
-    "pages/LocalImage",
-    "pages/ErrorMessageDownload",
-    "pages/TestImageExif"
+    "pages/DownSamplePage"
   ]
 }

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

@@ -0,0 +1,380 @@
+{
+  "string": [
+    {
+      "name": "module_desc",
+      "value": "module description"
+    },
+    {
+      "name": "EntryAbility_desc",
+      "value": "description"
+    },
+    {
+      "name": "EntryAbility_label",
+      "value": "label"
+    },
+    {
+      "name": "app_permission_WRITE_IMAGEVIDEO",
+      "value": "获取写入媒体资源权限"
+    },
+    {
+      "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

@@ -40,10 +40,6 @@
       "name": "Test_SingleImage",
       "value": "单个图片使用"
     },
-    {
-      "name": "Test_LocalImageShow",
-      "value": "本地图片显示"
-    },
     {
       "name": "Test_custom_download",
       "value": "全局自定义下载"
@@ -106,11 +102,11 @@
     },
     {
       "name": "Display_the_first_frame",
-      "value": "第一帧"
+      "value": "动画显示第一帧"
     },
     {
       "name": "Display_the_last_frame",
-      "value": "最后一帧"
+      "value": "动画显示最后一帧"
     },
     {
       "name": "Play",
@@ -140,21 +136,9 @@
       "name": "Local_SVG",
       "value": "本地资源SVG图片"
     },
-    {
-      "name": "local_r_file",
-      "value": "本地$r文件"
-    },
-    {
-      "name": "local_rawfile",
-      "value": "本地rawfile文件"
-    },
     {
       "name": "Under_context_file",
-      "value": "本地沙箱路径文件"
-    },
-    {
-      "name": "local_other_module",
-      "value": "本地其他模块文件"
+      "value": "本地context files下文件"
     },
     {
       "name": "Network_images",
@@ -574,7 +558,7 @@
     },
     {
       "name": "img_frame",
-      "value": "动图帧数:%d "
+      "value": "图片的帧数:%d "
     },
     {
       "name": "img_content_size",
@@ -598,15 +582,15 @@
     },
     {
       "name": "req_start_time",
-      "value": "请求开始时间:%s "
+      "value": "图片的请求开始时间点:%s "
     },
     {
       "name": "req_end_time",
-      "value": "请求结束时间:%s "
+      "value": "图片请求结束的时间点:%s "
     },
     {
       "name": "req_cancel_time",
-      "value": "请求取消时间:%s "
+      "value": "图片请求取消的时间点:%s "
     },
     {
       "name": "memory_start_time",
@@ -641,8 +625,8 @@
       "value": "解码结束时间点:%s "
     },
     {
-      "name": "request_data_from",
-      "value": "请求数据来自于:%s "
+      "name": "render_time",
+      "value": "渲染成功的时间:%s "
     },
     {
       "name": "Image_Downsampling_Functionality",
@@ -659,46 +643,6 @@
     {
       "name": "After_the_sampling",
       "value": "降采样后大小"
-    },
-    {
-      "name": "adjust_size",
-      "value": "调整大小"
-    },
-    {
-      "name": "Auto_ImageFit",
-      "value": "ImageFit.Auto:自适用图片高度"
-    },
-    {
-      "name": "Single_CallBack",
-      "value": "单个图片回调"
-    },
-    {
-      "name": "Multiple_CallBack",
-      "value": "多张图片回调"
-    },
-    {
-      "name": "Error_Message",
-      "value": "错误信息"
-    },
-    {
-      "name": "base_image",
-      "value": "图片不携带旋转信息"
-    },
-    {
-      "name": "test_exif",
-      "value": "测试图片携带的EXIF元数据作为显示方向"
-    },
-    {
-      "name": "rotate_mirror",
-      "value": "水平翻转"
-    },
-    {
-      "name": "rotate_rotate90",
-      "value": "顺时针90°"
-    },
-    {
-      "name": "rotate_mirror_rotate270",
-      "value": "水平翻转后再顺时针270°"
     }
   ]
 }

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

@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium';
-import { ImageKnifeOption, ImageKnifeRequest } from '@ohos/imageknife';
+import { ImageKnifeOption, ImageKnifeRequest } from '@ohos/imageknife/Index';
 import { DefaultJobQueue } from '@ohos/imageknife/src/main/ets/queue/DefaultJobQueue';
 import { IJobQueue } from '@ohos/imageknife/src/main/ets/queue/IJobQueue';
 import taskpool from '@ohos.taskpool';

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

@@ -44,7 +44,7 @@ export default function ImageKnifeOptionTest() {
         imageWidth: 0,
         imageHeight: 0,
       }
-      let imageKnifeOption: ImageKnifeOption = {
+      let ImageKnifeOption: ImageKnifeOption = {
         loadSrc: $r("app.media.rabbit"),
         onLoadListener: {
           onLoadFailed: (err) => {
@@ -59,9 +59,9 @@ export default function ImageKnifeOptionTest() {
           },
         },
       }
-      if (imageKnifeOption.onLoadListener && imageKnifeOption.onLoadListener.onLoadSuccess && imageKnifeOption.onLoadListener.onLoadFailed) {
-        imageKnifeOption.onLoadListener.onLoadSuccess(a,imageData);
-        imageKnifeOption.onLoadListener.onLoadFailed(a);
+      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/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 = {
-        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/ets/test/List.test.ets

@@ -14,7 +14,7 @@
  */
 import DefaultJobQueueTest from './DefaultJobQueueTest.test';
 import FileLruCacheTest from './FileLruCache.test';
-import ImageKnifeOptionTest from './ImageknifeOption.test';
+import ImageKnifeOptionTest from './ImageKnifeOption.test';
 import MemoryLruCacheTest from './MemoryLruCache.test';
 import ImageKnifeTest from './ImageKnife.test';
 import Transform from './transform.test';

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

@@ -13,6 +13,8 @@
  * 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 { Downsampler } from '@ohos/imageknife/src/main/ets/downsampling/Downsampler'
 import { DownsampleStrategy } from '@ohos/imageknife'
 
@@ -61,14 +63,14 @@ export default function SamplingTest() {
     it('CENTER_OUTSIDE_MEMORY', 3, () => {
       let reqSize: Size =
         new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.CENTER_INSIDE_MEMORY)
+          200, DownsampleStrategy.CENTER_OUTSIDE_MEMORY)
       let req = (reqSize.width < 1024 && reqSize.height < 1024)
       expect(req).assertEqual(true);
     })
     it('CENTER_OUTSIDE_QUALITY', 4, () => {
       let reqSize: Size =
         new Downsampler().calculateScaling('jpg', 1024, 1024, 200,
-          200, DownsampleStrategy.CENTER_INSIDE_QUALITY)
+          200, DownsampleStrategy.CENTER_OUTSIDE_QUALITY)
       let req = (reqSize.width < 1024 && reqSize.height < 1024)
       expect(req).assertEqual(true);
     })

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

@@ -17,6 +17,7 @@ import {
   ImageKnifeOption,
   ImageKnife,
   ImageKnifeRequest,
+  ImageKnifeRequestSource,
   CacheStrategy
 } from "@ohos/imageknife"
 import { common } from '@kit.AbilityKit';

entry/src/ohosTest/ets/test/loadCallBackData.test.ets

@@ -17,7 +17,8 @@ import {
   ImageKnifeOption,
   ImageKnife,
   ImageKnifeRequest,
-  ImageKnifeData
+  ImageKnifeRequestSource,
+  CacheStrategy
 } from "@ohos/imageknife"
 import { common } from '@kit.AbilityKit';
 
@@ -43,8 +44,8 @@ export default function loadCallBackData() {
       // This API supports only one parameter: clear action function.
     });
     it('startAndSuccess-CallBack', 0, async () => {
-      let startCallBack: ImageKnifeData | undefined = undefined;
-      let successCallBack: ImageKnifeData | undefined = undefined;
+      let startCallBack: ESObject = undefined;
+      let successCallBack: ESObject = undefined;
       let url: string =
         "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/63/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg"
       let imageKnifeOption: ImageKnifeOption = {
@@ -53,10 +54,10 @@ export default function loadCallBackData() {
       await new Promise<string>((resolve, reject) => {
         imageKnifeOption.onLoadListener = {
           onLoadStart: (data) => {
-            startCallBack = data?.imageKnifeData;
+            startCallBack = data?.getImageKnifeData();
           },
           onLoadSuccess: (data, imageknifeData,req) => {
-            successCallBack = req?.imageKnifeData;
+            successCallBack = req?.getImageKnifeData();
             resolve("")
           },
           onLoadFailed(err) {
@@ -80,7 +81,7 @@ export default function loadCallBackData() {
       expect(successCallBack != undefined).assertTrue();
     });
     it('failed-CallBack', 0, async () => {
-      let failedCallBack: ImageKnifeData | undefined = undefined;
+      let failedCallBack: ESObject = undefined;
       let url: string =
         "https://contentcenter-drcn.dbankcdn.cn/pub_1/DevEcoSpace_1_900_9/163/v3/qbe6NZkCQyGcITvdWoZBgg/Y-5U1z3GT_yaK8CBD3jkwg.jpg"
       let imageKnifeOption: ImageKnifeOption = {
@@ -93,7 +94,7 @@ export default function loadCallBackData() {
           onLoadSuccess: (data, imageknifeData) => {
           },
           onLoadFailed(res,req) {
-            failedCallBack = req?.imageKnifeData;
+            failedCallBack = req?.getImageKnifeData();
             resolve(res)
           }
         }

entry/src/ohosTest/module.json5

@@ -5,11 +5,8 @@
     "description": "$string:module_test_desc",
     "mainElement": "TestAbility",
     "deviceTypes": [
-      "default",
+      "phone",
       "tablet",
-      "tv",
-      "wearable",
-      "car",
       "2in1"
     ],
     "deliveryWithInstall": true,

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],
-            width * height * DEFAULT_FOUR, pData, width * height * DEFAULT_FOUR) != EOK) {
-            return;
-        }
+        memcpy(m_RenderImage.ppPlane[0], pData, width * height * DEFAULT_FOUR);
         
         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) {
-                return false;
-            }
+            memcpy(nativePtr, src, srcLen);
             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) {
-                return;
-            }
-            if (memset_s(*buf, sizeof(uint8_t)*totalLength, DEFAULT_ZERO, sizeof(uint8_t)*totalLength) != EOK) {
-                return;
-            }
+            memcpy(tmp, *buf, totalLength);
+            memset(*buf, DEFAULT_ZERO, sizeof(uint8_t)*totalLength);
             for (int i = 0; i < height; i++) {
-                if (memcpy_s(*buf + oneLineLength * i, oneLineLength,
-                             tmp + totalLength - oneLineLength * (i+1), oneLineLength) != EOK) {
-                    break;
-                }
+                memcpy(*buf + oneLineLength * i, tmp + totalLength - oneLineLength * (i+1), oneLineLength);
             }
             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" */

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

@@ -18,10 +18,7 @@ export { ImageKnifeAnimatorComponent } from './src/main/ets/components/ImageKnif
 
 export { ImageKnife } from './src/main/ets/ImageKnife'
 
-export { ImageKnifeOption,
-  AnimatorOption,
-  HttpRequestOption,
-  HeaderOptions } from './src/main/ets/model/ImageKnifeOption'
+export { ImageKnifeOption , AnimatorOption } from './src/main/ets/model/ImageKnifeOption'
 
 export { ImageKnifeRequest } from './src/main/ets/model/ImageKnifeRequest'
 

library/oh-package.json5

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

library/src/main/ets/ImageKnife.ets

@@ -25,7 +25,6 @@ import { util } from '@kit.ArkTS';
 import { image } from '@kit.ImageKit';
 import { common } from '@kit.AbilityKit';
 import { LogUtil } from './utils/LogUtil';
-import { emitter } from '@kit.BasicServicesKit';
 
 
 export class ImageKnife {
@@ -153,7 +152,7 @@ export class ImageKnife {
    */
   preload(loadSrc:string | ImageKnifeOption):ImageKnifeRequest{
     let imageKnifeOption = new ImageKnifeOption()
-    if (typeof loadSrc == 'string') {
+    if (typeof loadSrc == "string") {
       imageKnifeOption.loadSrc = loadSrc
     } else {
       imageKnifeOption = loadSrc;
@@ -177,9 +176,6 @@ export class ImageKnife {
    * @param request 图片请求request
    */
   cancel(request:ImageKnifeRequest) {
-    if (typeof request?.imageKnifeOption.loadSrc === 'string' && !request?.drawMainSuccess) {
-      emitter.emit(request.imageKnifeOption.loadSrc + request.componentId)
-    }
     request.requestState = ImageKnifeRequestState.DESTROY
   }
   /**
@@ -190,15 +186,15 @@ export class ImageKnife {
   preLoadCache(loadSrc: string | ImageKnifeOption): Promise<string> {
     return new Promise((resolve, reject) => {
       let imageKnifeOption = new ImageKnifeOption()
-      if (typeof loadSrc == 'string') {
+      if (typeof loadSrc == "string") {
         imageKnifeOption.loadSrc = loadSrc
       } else {
         imageKnifeOption = loadSrc;
       }
-      LogUtil.log('ImageKnife_DataTime_preLoadCache-imageKnifeOption:'+loadSrc)
+      LogUtil.log("ImageKnife_DataTime_preLoadCache-imageKnifeOption:"+loadSrc)
       let fileKey = this.getEngineKeyImpl().generateFileKey(imageKnifeOption.loadSrc, imageKnifeOption.signature)
       let cachePath = ImageKnife.getInstance().getFileCache().getFileToPath(fileKey)
-      if (cachePath == null || cachePath == '' || cachePath == undefined) {
+      if (cachePath == null || cachePath == "" || cachePath == undefined) {
         imageKnifeOption.onLoadListener = {
           onLoadSuccess(){
             resolve(ImageKnife.getInstance().getFileCache().getFileToPath(fileKey))
@@ -321,14 +317,14 @@ export class ImageKnife {
   }
 
   loadFromMemoryCache(key: string): ImageKnifeData | undefined {
-    if (key !== '') {
+    if (key !== "") {
       return this.memoryCache.get(key)
     }
     return undefined
   }
 
   saveMemoryCache(key: string, data: ImageKnifeData): void {
-    if (key !== '') {
+    if (key !== "") {
       this.memoryCache.put(key, data)
     }
   }
@@ -360,7 +356,7 @@ export class ImageKnife {
       if (this.isFileCacheInit()) {
         return this.fileCache?.maxMemory;
       } else {
-        throw new Error('the disk cache not init');
+        throw new Error("the disk cache not init");
       }
     }
   }
@@ -380,7 +376,7 @@ export class ImageKnife {
       if (this.isFileCacheInit()) {
         return this.fileCache?.size();
       } else {
-        throw new Error('the disk cache not init');
+        throw new Error("the disk cache not init");
       }
     }
   }
@@ -400,7 +396,7 @@ export class ImageKnife {
       if (this.isFileCacheInit()) {
         return this.fileCache?.currentMemory;
       } else {
-        throw new Error('the disk cache not init');
+        throw new Error("the disk cache not init");
       }
     }
   }
@@ -428,7 +424,7 @@ export class ImageKnife {
       if (typeValue === 'gif' || typeValue === 'webp') {
         let base64Help = new util.Base64Helper()
 
-        let base64str = 'data:image/' + typeValue + ';base64,' + base64Help.encodeToStringSync(new Uint8Array(buffer))
+        let base64str = "data:image/" + typeValue + ";base64," + base64Help.encodeToStringSync(new Uint8Array(buffer))
         onComplete({
           source: base64str,
           imageWidth: 0,
@@ -466,13 +462,13 @@ export class ImageKnife {
     return false
   }
 
-  async execute(request: ImageKnifeRequest): Promise<void> {
-    LogUtil.log('ImageKnife_DataTime_execute.start:'+request.imageKnifeOption.loadSrc)
+  async execute(request: ImageKnifeRequest,isAnimator?: boolean): Promise<void> {
+    LogUtil.log("ImageKnife_DataTime_execute.start:"+request.imageKnifeOption.loadSrc)
     if (this.headerMap.size > 0) {
       request.addHeaderMap(this.headerMap)
     }
-    this.dispatcher.enqueue(request)
-    LogUtil.log('ImageKnife_DataTime_execute.end:'+request.imageKnifeOption.loadSrc)
+    this.dispatcher.enqueue(request,isAnimator)
+    LogUtil.log("ImageKnife_DataTime_execute.end:"+request.imageKnifeOption.loadSrc)
   }
 
   setEngineKeyImpl(impl: IEngineKey): void {

library/src/main/ets/ImageKnifeDispatcher.ets

@@ -24,6 +24,7 @@ import image from '@ohos.multimedia.image';
 import emitter from '@ohos.events.emitter';
 import { Constants, LoadPhase, LoadPixelMapCode } from './utils/Constants';
 import taskpool from '@ohos.taskpool';
+import { FileTypeUtil } from './utils/FileTypeUtil';
 import { IEngineKey } from './key/IEngineKey';
 import { DefaultEngineKey } from './key/DefaultEngineKey';
 import {
@@ -48,10 +49,10 @@ export class ImageKnifeDispatcher {
   private engineKey: IEngineKey = new DefaultEngineKey();
 
   showFromMemomry(request: ImageKnifeRequest, imageSrc: string | PixelMap | Resource, requestSource: ImageKnifeRequestSource,isAnimator?: boolean): boolean {
-    LogUtil.log('showFromMemomry.start:' + request.componentId  + ',srcType:' + requestSource + ',version:' + request.componentVersion + ' isAnimator=' + isAnimator)
+    LogUtil.log("ImageKnife_DataTime_showFromMemomry.start:" + request.imageKnifeOption.loadSrc + "requestSource=" + requestSource + " isAnimator=" + isAnimator)
     let memoryCache: ImageKnifeData | undefined;
     let memoryCheckStartTime = Date.now();
-    if ((typeof (request.imageKnifeOption.loadSrc as image.PixelMap)?.isEditable) == 'boolean') {
+    if ((typeof (request.imageKnifeOption.loadSrc as image.PixelMap).isEditable) == 'boolean') {
       memoryCache = {
         source: request.imageKnifeOption.loadSrc as image.PixelMap,
         imageWidth: 0,
@@ -59,12 +60,12 @@ export class ImageKnifeDispatcher {
       }
     } else {
       memoryCache = ImageKnife.getInstance()
-        .loadFromMemoryCache(this.engineKey.generateMemoryKey(imageSrc, requestSource, request.imageKnifeOption,isAnimator, request.componentWidth, request.componentHeight));
+        .loadFromMemoryCache(this.engineKey.generateMemoryKey(imageSrc, requestSource, request.imageKnifeOption,isAnimator));
     }
 
     //记录ImageKnifeRequestSource.SRC 开始内存检查的时间点
-    if (requestSource == ImageKnifeRequestSource.SRC && request.imageKnifeData) {
-      let timeInfo = request.imageKnifeData?.timeInfo
+    if (requestSource == ImageKnifeRequestSource.SRC && request.getImageKnifeData()) {
+      let timeInfo = request.getImageKnifeData()?.timeInfo
       if (timeInfo) {
         timeInfo.memoryCheckStartTime = memoryCheckStartTime;
         timeInfo.memoryCheckEndTime = Date.now();
@@ -81,26 +82,29 @@ export class ImageKnifeDispatcher {
         // 回调请求开始
         if (requestSource === ImageKnifeRequestSource.SRC && request.imageKnifeOption.onLoadListener?.onLoadStart !== undefined) {
           request.imageKnifeOption.onLoadListener.onLoadStart(request)
+          LogUtil.log("ImageKnife_DataTime_MemoryCache_onLoadStart:" + request.imageKnifeOption.loadSrc)
         }
+        LogUtil.log("ImageKnife_DataTime_MemoryCache_showPixelMap.start:" + request.imageKnifeOption.loadSrc)
         request.ImageKnifeRequestCallback?.showPixelMap(request.componentVersion, memoryCache.source,
           { width: memoryCache.imageWidth, height: memoryCache.imageHeight }, requestSource, memoryCache.imageAnimator)
+        LogUtil.log("ImageKnife_DataTime_MemoryCache_showPixelMap.end:" + request.imageKnifeOption.loadSrc)
 
         if (requestSource == ImageKnifeRequestSource.SRC) {
           request.requestState = ImageKnifeRequestState.COMPLETE
-          request.drawMainSuccess = true
           // 回调请求开结束
           if (request.imageKnifeOption.onLoadListener?.onLoadSuccess !== undefined) {
-            this.copyMemoryCacheInfo(memoryCache, request.imageKnifeData);
+            this.copyMemoryCacheInfo(memoryCache, request.getImageKnifeData());
             request.imageKnifeOption.onLoadListener.onLoadSuccess(memoryCache.source, memoryCache, request)
+            LogUtil.log("ImageKnife_DataTime_MemoryCache_onLoadSuccess:" + request.imageKnifeOption.loadSrc)
           }
         } else if (requestSource == ImageKnifeRequestSource.ERROR_HOLDER) {
           request.requestState = ImageKnifeRequestState.ERROR
         }
       }
-      LogUtil.log('showFromMemomry.end_hasmemory:' + request.componentId  + ',srcType:' + requestSource + ',version:' + request.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_showFromMemomry.end_hasmemory:" + request.imageKnifeOption.loadSrc)
       return true
     }
-    LogUtil.log('showFromMemomry.end_nomemory:' + request.componentId  + ',srcType:' + requestSource + ',version:' + request.componentVersion)
+    LogUtil.log("ImageKnife_DataTime_showFromMemomry.end_nomemory:" + request.imageKnifeOption.loadSrc)
     return false
   }
 
@@ -112,7 +116,6 @@ export class ImageKnifeDispatcher {
     target.imageWidth = memoryCache.imageWidth;
     target.imageHeight = memoryCache.imageHeight;
     target.type = memoryCache.type;
-    target.bufSize = memoryCache.bufSize
     target.imageAnimator = memoryCache.imageAnimator;
   }
 
@@ -128,7 +131,7 @@ export class ImageKnifeDispatcher {
         afterCallData.timeInfo.memoryCheckEndTime = beforeCallData.timeInfo.memoryCheckEndTime;
       }
     }
-    req.imageKnifeData = afterCallData;
+    req.setImageKnifeData(afterCallData);
   }
 
   private initCallData(request: ImageKnifeRequest) {
@@ -137,7 +140,7 @@ export class ImageKnifeDispatcher {
     }
     //图片加载信息回调数据
     let callBackData: ImageKnifeData = {
-      source: '',
+      source: "",
       imageWidth: 0,
       imageHeight: 0,
     };
@@ -148,14 +151,14 @@ export class ImageKnifeDispatcher {
     callBackData.timeInfo = callBackTimeInfo;
 
     //跟隨請求保存回調信息點
-    request.imageKnifeData = callBackData;
+    request.setImageKnifeData(callBackData);
   }
 
-  enqueue(request: ImageKnifeRequest,): void {
+  enqueue(request: ImageKnifeRequest,isAnimator?: boolean): void {
     //初始化加载回调信息
     this.initCallData(request);
     //1.内存有的话直接渲染
-    if (this.showFromMemomry(request, request.imageKnifeOption.loadSrc, ImageKnifeRequestSource.SRC,request.animator)) {
+    if (this.showFromMemomry(request, request.imageKnifeOption.loadSrc, ImageKnifeRequestSource.SRC,isAnimator)) {
       return
     }
     // 2.内存获取占位图
@@ -169,30 +172,32 @@ export class ImageKnifeDispatcher {
       this.jobQueue.add(request)
       return
     }
-    this.executeJob(request)
+    this.executeJob(request,isAnimator)
   }
 
-  executeJob(request: ImageKnifeRequest): void {
-    LogUtil.log('executeJob.start:' + request.componentId  + ',version:' + request.componentVersion)
+  executeJob(request: ImageKnifeRequest,isAnimator?: boolean): void {
+    LogUtil.log("ImageKnife_DataTime_executeJob.start:" + request.imageKnifeOption.loadSrc)
     // 加载占位符
     if (request.imageKnifeOption.placeholderSrc !== undefined && request.drawPlayHolderSuccess == false) {
       this.getAndShowImage(request, request.imageKnifeOption.placeholderSrc, ImageKnifeRequestSource.PLACE_HOLDER)
     }
-    if (request.imageKnifeOption.onLoadListener?.onLoadStart !== undefined) {
-      request.imageKnifeOption.onLoadListener?.onLoadStart(request)
-    }
+
     // 加载主图
-    this.getAndShowImage(request, request.imageKnifeOption.loadSrc, ImageKnifeRequestSource.SRC,request.animator)
-    LogUtil.log('executeJob.end:' + request.componentId  + ',version:' + request.componentVersion)
+    this.getAndShowImage(request, request.imageKnifeOption.loadSrc, ImageKnifeRequestSource.SRC,isAnimator)
+    LogUtil.log("ImageKnife_DataTime_executeJob.end:" + request.imageKnifeOption.loadSrc)
   }
 
   /**
    * 获取和显示图片
    */
   getAndShowImage(currentRequest: ImageKnifeRequest, imageSrc: string | PixelMap | Resource, requestSource: ImageKnifeRequestSource,isAnimator?: boolean): void {
-    LogUtil.log('getAndShowImage.start:'  + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+    LogUtil.log("ImageKnife_DataTime_getAndShowImage.start:" + currentRequest.imageKnifeOption.loadSrc)
+    if (requestSource === ImageKnifeRequestSource.SRC && currentRequest.imageKnifeOption.onLoadListener?.onLoadStart !== undefined) {
+      currentRequest.imageKnifeOption.onLoadListener?.onLoadStart(currentRequest)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_onLoadStart:" + currentRequest.imageKnifeOption.loadSrc)
+    }
 
-    let memoryKey: string = this.engineKey.generateMemoryKey(imageSrc, requestSource, currentRequest.imageKnifeOption,isAnimator, currentRequest.componentWidth, currentRequest.componentHeight)
+    let memoryKey: string = this.engineKey.generateMemoryKey(imageSrc, requestSource, currentRequest.imageKnifeOption,isAnimator)
     let requestList: List<ImageKnifeRequestWithSource> | undefined = this.executingJobMap.get(memoryKey)
     if (requestList == undefined) {
       requestList = new List()
@@ -202,20 +207,32 @@ export class ImageKnifeDispatcher {
       requestList.add({ request: currentRequest, source: requestSource })
       return
     }
-    LogUtil.info('image load getAndShowImage start:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+
     let isWatchProgress : boolean = false
     if (currentRequest.imageKnifeOption.progressListener !== undefined && requestSource === ImageKnifeRequestSource.SRC) {
       isWatchProgress = true
     }
 
-    let src: string | number = ''
-    let moduleName: string = ''
-    let resName: string = ''
+    // 回调请求开始
+    requestList.forEach((requestWithSource: ImageKnifeRequestWithSource) => {
+      if (requestWithSource.source === ImageKnifeRequestSource.SRC && requestWithSource.request.imageKnifeOption.onLoadListener?.onLoadStart !== undefined) {
+        requestWithSource.request.imageKnifeOption.onLoadListener?.onLoadStart(requestWithSource.request)
+        LogUtil.log("ImageKnife_DataTime_getAndShowImage_onLoadStart:" + currentRequest.imageKnifeOption.loadSrc)
+      }
+      if (requestWithSource.request.imageKnifeOption.progressListener !== undefined && requestWithSource.source === ImageKnifeRequestSource.SRC) {
+        isWatchProgress = true
+      }
+    });
+    let src: string | number = ""
+    let moduleName: string = ""
+    let resName: string = ""
     if((imageSrc as Resource).id != undefined) {
       moduleName = (imageSrc as Resource).moduleName
       src = (imageSrc as Resource).id
-      resName = (imageSrc as Resource).params![0]
-    } else if(typeof imageSrc == 'string') {
+      if(src == -1) {
+        resName = (imageSrc as Resource).params![0]
+      }
+    } else if(typeof imageSrc == "string") {
       src = imageSrc
     }
     let request: RequestJobRequest = {
@@ -237,17 +254,12 @@ export class ImageKnifeDispatcher {
       memoryKey: memoryKey,
       fileCacheFolder: ImageKnife.getInstance().getFileCache()?.getCacheFolder(),
       isAnimator:isAnimator,
-      moduleName: moduleName == '' ? undefined : moduleName,
-      resName: resName == '' ? undefined : resName,
-      caPath: currentRequest.imageKnifeOption.httpOption?.caPath,
+      moduleName: moduleName == "" ? undefined : moduleName,
+      resName: resName == "" ? undefined : resName,
+      caPath: currentRequest.imageKnifeOption.caPath,
       targetWidth: currentRequest.componentWidth,
       targetHeight: currentRequest.componentHeight,
-      downsampType: currentRequest.imageKnifeOption.downsampleOf == undefined ? DownsampleStrategy.DEFAULT : currentRequest.imageKnifeOption.downsampleOf,
-      isAutoImageFit: currentRequest.imageKnifeOption.objectFit == ImageFit.Auto,
-      componentId: currentRequest.componentId,
-      componentVersion: currentRequest.componentVersion,
-      connectTimeout: currentRequest.imageKnifeOption.httpOption?.connectTimeout,
-      readTimeout: currentRequest.imageKnifeOption.httpOption?.readTimeout
+      downsampType: currentRequest.imageKnifeOption.downsampleOf == undefined ? DownsampleStrategy.NONE : currentRequest.imageKnifeOption.downsampleOf
     }
 
     if(request.customGetImage == undefined) {
@@ -260,68 +272,50 @@ export class ImageKnifeDispatcher {
       if (isWatchProgress){
         emitter.off(Constants.PROGRESS_EMITTER + memoryKey)
       }
-      LogUtil.log('getAndShowImage.end:'+ currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
     })
     if (ImageKnife.getInstance().isRequestInSubThread){
       // 启动线程下载和解码主图
-      LogUtil.log('etAndShowImage_Task.start:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_Task.start:" + currentRequest.imageKnifeOption.loadSrc)
       let task = new taskpool.Task(requestJob, request)
-      LogUtil.log('getAndShowImage_Task.end:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_Task.end:" + currentRequest.imageKnifeOption.loadSrc)
       if (isWatchProgress){
         emitter.on(Constants.PROGRESS_EMITTER + memoryKey, (data) => {
           this.progressCallBack(requestList! , data?.data?.value as number)
         });
       }
 
-      LogUtil.log('getAndShowImage_execute.start(subthread):' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.start(subthread):" + currentRequest.imageKnifeOption.loadSrc)
       taskpool.execute(task).then((res: Object) => {
+        // this.doTaskCallback(res as RequestJobResult | undefined, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
+        // if (isWatchProgress){
+        //   emitter.off(Constants.PROGRESS_EMITTER + memoryKey)
+        // }
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
       }).catch((err: BusinessError) => {
         emitter.off(Constants.CALLBACK_EMITTER + memoryKey)
-        LogUtil.error('Fail to requestJob in sub thread src=' + imageSrc + ' err=' + err)
+        LogUtil.error("Fail to requestJob in sub thread src=" + imageSrc + " err=" + err)
+        LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:" + currentRequest.imageKnifeOption.loadSrc)
         if (isWatchProgress){
           emitter.off(Constants.PROGRESS_EMITTER + memoryKey)
         }
-
-        this.doTaskCallback({
-          pixelMap: undefined,
-          bufferSize: 0,
-          fileKey: '',
-          loadFail: 'Fail to requestJob in sub thread src=' + imageSrc + ' err=' + err,
-          imageKnifeData: {
-            source: '',
-            imageWidth: 0,
-            imageHeight: 0,
-            timeInfo: { requestEndTime: Date.now() },
-            errorInfo: {
-              phase: LoadPhase.PHASE_LOAD,
-              code: LoadPixelMapCode.IMAGE_CUSTOM_LOAD_FAILED_CODE,
-            }
-          }
-        }, requestList!, currentRequest, memoryKey, imageSrc, requestSource, isAnimator)
+        this.executingJobMap.remove(memoryKey);
+        this.dispatchNextJob();
       })
     } else { //主线程请求
-      LogUtil.log('getAndShowImage_execute.start(mainthread):' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.start(mainthread):" + currentRequest.imageKnifeOption.loadSrc)
       requestJob(request, requestList).then(() => {
+        // this.doTaskCallback(res, requestList!, currentRequest, memoryKey, imageSrc, requestSource,isAnimator);
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage_execute.end:"+currentRequest.imageKnifeOption.loadSrc)
+        // LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:"+currentRequest.imageKnifeOption.loadSrc)
       }).catch((err: BusinessError) => {
         emitter.off(Constants.CALLBACK_EMITTER + memoryKey)
-        LogUtil.error('Fail to requestJob in main thread src=' + imageSrc + ' err=' + err)
-
-        this.doTaskCallback({
-          pixelMap: undefined,
-          bufferSize: 0,
-          fileKey: '',
-          loadFail: 'Fail to requestJob in main thread src=' + imageSrc + ' err=' + err,
-          imageKnifeData: {
-            source: '',
-            imageWidth: 0,
-            imageHeight: 0,
-            timeInfo: { requestEndTime: Date.now() },
-            errorInfo: {
-              phase: LoadPhase.PHASE_LOAD,
-              code: LoadPixelMapCode.IMAGE_CUSTOM_LOAD_FAILED_CODE,
-            }
-          }
-        }, requestList!, currentRequest, memoryKey, imageSrc, requestSource, isAnimator)
+        LogUtil.error("Fail to requestJob in main thread src=" + imageSrc + " err=" + err)
+        LogUtil.log("ImageKnife_DataTime_getAndShowImage.end:" + currentRequest.imageKnifeOption.loadSrc)
+        this.executingJobMap.remove(memoryKey);
+        this.dispatchNextJob();
       })
     }
   }
@@ -342,7 +336,7 @@ export class ImageKnifeDispatcher {
 
   private doTaskCallback(requestJobResult: RequestJobResult | undefined, requestList: List<ImageKnifeRequestWithSource> ,
     currentRequest: ImageKnifeRequest, memoryKey: string, imageSrc: string | PixelMap | Resource, requestSource: ImageKnifeRequestSource,isAnimator?: boolean):void {
-    LogUtil.log('getAndShowImage_CallBack.start:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+    LogUtil.log("ImageKnife_DataTime_getAndShowImage_CallBack.start:"+currentRequest.imageKnifeOption.loadSrc)
     if (requestJobResult === undefined){
       return
     }
@@ -353,68 +347,20 @@ export class ImageKnifeDispatcher {
     }
 
     let pixelmap = requestJobResult.pixelMap;
-    // 请求取消
-    if (currentRequest.requestState === ImageKnifeRequestState.DESTROY) {
-      this.executingJobMap.remove(memoryKey);
-      requestList.forEach((requestWithSource: ImageKnifeRequestWithSource) => {
-        if (currentRequest.componentId !== requestWithSource.request.componentId && requestWithSource.request.requestState !== ImageKnifeRequestState.DESTROY) {
-          // 加载占位符
-          if (requestWithSource.source === ImageKnifeRequestSource.PLACE_HOLDER &&
-            requestWithSource.request.imageKnifeOption.placeholderSrc !== undefined &&
-            requestWithSource.request.drawPlayHolderSuccess == false) {
-            this.getAndShowImage(requestWithSource.request, requestWithSource.request.imageKnifeOption.placeholderSrc, ImageKnifeRequestSource.PLACE_HOLDER)
-          } else if (requestWithSource.source === ImageKnifeRequestSource.ERROR_HOLDER &&
-            requestWithSource.request.imageKnifeOption.errorholderSrc !== undefined) {
-            this.getAndShowImage(requestWithSource.request, requestWithSource.request.imageKnifeOption.errorholderSrc, ImageKnifeRequestSource.ERROR_HOLDER)
-          } else if (requestWithSource.source === ImageKnifeRequestSource.SRC) {
-            // 加载主图
-            this.getAndShowImage(requestWithSource.request, requestWithSource.request.imageKnifeOption.loadSrc, ImageKnifeRequestSource.SRC,requestWithSource.request.animator)
-          }
-        } else {
-          if (pixelmap !== undefined && typeof pixelmap !== 'string') {
-            (pixelmap as PixelMap).release()
-          }
-          if (requestWithSource.source == ImageKnifeRequestSource.SRC && requestWithSource.request.imageKnifeOption.onLoadListener?.onLoadCancel) {
-            // 回调请求成功
-            // 回调请求成功
-            //设置失败回调的时间点
-            let callBackData = requestWithSource.request.imageKnifeData;
-
-            if (requestJobResult.imageKnifeData && requestJobResult.imageKnifeData.timeInfo) {
-              requestJobResult.imageKnifeData.timeInfo.requestCancelTime = Date.now();
-              if (requestJobResult.imageKnifeData.errorInfo) {
-                requestJobResult.imageKnifeData.errorInfo.phase = LoadPhase.PHASE_WILL_SHOW;
-                requestJobResult.imageKnifeData.errorInfo.code = LoadPixelMapCode.IMAGE_LOAD_CANCEL_FAILED_CODE;
-              }
-            }
-            this.assembleImageKnifeData(callBackData,requestJobResult.imageKnifeData,requestWithSource.request)
-            LogUtil.log('getAndShowImage cancel:' + requestWithSource.request.componentId  + ',srcType:' + requestSource + ',version:' + requestWithSource.request.componentVersion)
-            requestWithSource.request.imageKnifeOption.onLoadListener.onLoadCancel(requestJobResult.loadFail ?? 'component has destroyed from load', requestWithSource.request)
-          }
-        }
-      })
-      this.dispatchNextJob()
-      return
-    }
-    // 请求失败
     if (pixelmap === undefined) {
-      this.executingJobMap.remove(memoryKey);
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_CallBack.pixelmap undefined:"+currentRequest.imageKnifeOption.loadSrc)
       requestList.forEach((requestWithSource: ImageKnifeRequestWithSource) => {
-        requestWithSource.request.requestState = ImageKnifeRequestState.ERROR
-        LogUtil.error('getAndShowImage_CallBack.pixelmap failed:' + currentRequest.componentId + ',srcType:' +
-          requestSource + ',version:' + currentRequest.componentVersion + " error: " + requestJobResult.loadFail)
         // 回调请求失败
         if (requestWithSource.source === ImageKnifeRequestSource.SRC &&
           requestWithSource.request.imageKnifeOption.onLoadListener?.onLoadFailed !== undefined &&
         requestJobResult.loadFail) {
-          this.assembleImageKnifeData(requestWithSource.request.imageKnifeData, requestJobResult.imageKnifeData,
-            requestWithSource.request)
-          requestWithSource.request.imageKnifeOption.onLoadListener.onLoadFailed(requestJobResult.loadFail,
-            requestWithSource.request);
+          this.assembleImageKnifeData(requestWithSource.request.getImageKnifeData(), requestJobResult.imageKnifeData, requestWithSource.request)
+          requestWithSource.request.imageKnifeOption.onLoadListener.onLoadFailed(requestJobResult.loadFail,requestWithSource.request);
+          LogUtil.log("ImageKnife_DataTime_getAndShowImage_onLoadFailed:"+currentRequest.imageKnifeOption.loadSrc)
         }
         if (requestWithSource.source === ImageKnifeRequestSource.SRC &&
           requestWithSource.request.imageKnifeOption.errorholderSrc !== undefined) {
-          requestWithSource.request.requestState = ImageKnifeRequestState.PROGRESS
+
           if (this.showFromMemomry(requestWithSource.request, requestWithSource.request.imageKnifeOption.errorholderSrc,
             ImageKnifeRequestSource.ERROR_HOLDER) === false) {
             this.getAndShowImage(requestWithSource.request, requestWithSource.request.imageKnifeOption.errorholderSrc,
@@ -422,14 +368,15 @@ export class ImageKnifeDispatcher {
           }
         }
       });
+      this.executingJobMap.remove(memoryKey);
       this.dispatchNextJob();
       return;
     }
     // 保存文件缓存
     if (requestJobResult.bufferSize > 0 && currentRequest.imageKnifeOption.writeCacheStrategy !== CacheStrategy.Memory) {
-      LogUtil.log('getAndShowImage_saveWithoutWriteFile.start:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_saveWithoutWriteFile.start:"+currentRequest.imageKnifeOption.loadSrc)
       ImageKnife.getInstance().saveWithoutWriteFile(requestJobResult.fileKey, requestJobResult.bufferSize);
-      LogUtil.log('getAndShowImage_saveWithoutWriteFile.end:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_saveWithoutWriteFile.end:"+currentRequest.imageKnifeOption.loadSrc)
     }
 
     let imageKnifeData: ImageKnifeData;
@@ -459,80 +406,94 @@ export class ImageKnifeDispatcher {
     //构建缓存保存的ImageKnifeData
     let saveCacheImageData: ImageKnifeData = {
       source: pixelmap!,
-      imageWidth: requestJobResult.size?.width ?? 0,
-      imageHeight: requestJobResult.size?.height ?? 0,
+      imageWidth: requestJobResult.size == undefined ? 0 : requestJobResult.size.width,
+      imageHeight: requestJobResult.size == undefined ? 0 : requestJobResult.size.height,
       type: requestJobResult.type,
-      bufSize: requestJobResult.bufferSize,
       imageAnimator: imageKnifeData.imageAnimator
     }
 
     // 保存内存缓存
     if (currentRequest.imageKnifeOption.writeCacheStrategy !== CacheStrategy.File) {
-      LogUtil.log('getAndShowImage_saveMemoryCache.start:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_saveMemoryCache.start:"+currentRequest.imageKnifeOption.loadSrc)
       ImageKnife.getInstance()
-        .saveMemoryCache(this.engineKey.generateMemoryKey(imageSrc, requestSource, currentRequest.imageKnifeOption,isAnimator, currentRequest.componentWidth, currentRequest.componentHeight),
+        .saveMemoryCache(this.engineKey.generateMemoryKey(imageSrc, requestSource, currentRequest.imageKnifeOption,isAnimator),
           saveCacheImageData);
-      LogUtil.log('getAndShowImage_saveMemoryCache.end:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_getAndShowImage_saveMemoryCache.end:"+currentRequest.imageKnifeOption.loadSrc)
     }
     if (requestList !== undefined) {
       // key相同的request，一起绘制
       requestList.forEach((requestWithSource: ImageKnifeRequestWithSource) => {
-        // 画主图
-        if (requestWithSource.source === ImageKnifeRequestSource.SRC ||
-          requestWithSource.source === ImageKnifeRequestSource.ERROR_HOLDER
-          || (requestWithSource.source === ImageKnifeRequestSource.PLACE_HOLDER &&
-            requestWithSource.request.requestState === ImageKnifeRequestState.PROGRESS)) {
-          requestWithSource.request.ImageKnifeRequestCallback.showPixelMap(requestWithSource.request.componentVersion,
-            imageKnifeData.source, { width: imageKnifeData.imageWidth, height: imageKnifeData.imageHeight },
-            requestWithSource.source, imageKnifeData.imageAnimator);
-        }
-
-        if (requestWithSource.source == ImageKnifeRequestSource.SRC) {
-          requestWithSource.request.requestState = ImageKnifeRequestState.COMPLETE;
-          requestWithSource.request.drawMainSuccess = true
-          if (requestWithSource.request.imageKnifeOption.onLoadListener &&
-          requestWithSource.request.imageKnifeOption.onLoadListener.onLoadSuccess) {
-            // 回调请求成功
-            this.assembleImageKnifeData(requestWithSource.request.imageKnifeData, imageKnifeData,
-              requestWithSource.request);
-            requestWithSource.request.imageKnifeOption.onLoadListener.onLoadSuccess(imageKnifeData.source,
-              saveCacheImageData, requestWithSource.request);
+        if (requestWithSource.request.requestState !== ImageKnifeRequestState.DESTROY) {
+          // 画主图
+          if (requestWithSource.source === ImageKnifeRequestSource.SRC ||
+            requestWithSource.source === ImageKnifeRequestSource.ERROR_HOLDER
+            || (requestWithSource.source === ImageKnifeRequestSource.PLACE_HOLDER &&
+              requestWithSource.request.requestState === ImageKnifeRequestState.PROGRESS)) {
+            LogUtil.log("ImageKnife_DataTime_getAndShowImage_showPixelMap.start:"+currentRequest.imageKnifeOption.loadSrc)
+            requestWithSource.request.ImageKnifeRequestCallback.showPixelMap(requestWithSource.request.componentVersion,
+              imageKnifeData.source, { width: imageKnifeData.imageWidth, height: imageKnifeData.imageHeight },
+              requestWithSource.source, imageKnifeData.imageAnimator);
+            LogUtil.log("ImageKnife_DataTime_getAndShowImage_showPixelMap.end:"+currentRequest.imageKnifeOption.loadSrc)
+          }
+
+          if (requestWithSource.source == ImageKnifeRequestSource.SRC) {
+            requestWithSource.request.requestState = ImageKnifeRequestState.COMPLETE;
+            if (requestWithSource.request.imageKnifeOption.onLoadListener &&
+            requestWithSource.request.imageKnifeOption.onLoadListener.onLoadSuccess) {
+              // 回调请求成功
+              this.assembleImageKnifeData(requestWithSource.request.getImageKnifeData(), imageKnifeData,requestWithSource.request);
+              requestWithSource.request.imageKnifeOption.onLoadListener.onLoadSuccess(imageKnifeData.source,
+                saveCacheImageData, requestWithSource.request);
+              LogUtil.log("ImageKnife_DataTime_getAndShowImage_onLoadSuccess:"+currentRequest.imageKnifeOption.loadSrc)
+            }
+          } else if (requestWithSource.source == ImageKnifeRequestSource.ERROR_HOLDER) {
+            requestWithSource.request.requestState = ImageKnifeRequestState.ERROR;
+          }
+        } else {
+          if (requestWithSource.source == ImageKnifeRequestSource.SRC && requestWithSource.request.imageKnifeOption.onLoadListener?.onLoadCancel) {
+            // 回调请求成功
+            // 回调请求成功
+            //设置失败回调的时间点
+            let callBackData = requestWithSource.request.getImageKnifeData();
+
+            if (requestJobResult.imageKnifeData && requestJobResult.imageKnifeData.timeInfo) {
+              requestJobResult.imageKnifeData.timeInfo.requestCancelTime = Date.now();
+              if (requestJobResult.imageKnifeData.errorInfo) {
+                requestJobResult.imageKnifeData.errorInfo.phase = LoadPhase.PHASE_WILL_SHOW;
+                requestJobResult.imageKnifeData.errorInfo.code = LoadPixelMapCode.IMAGE_LOAD_CANCEL_FAILED_CODE;
+              }
+            }
+            this.assembleImageKnifeData(callBackData,requestJobResult.imageKnifeData,requestWithSource.request)
+            requestWithSource.request.imageKnifeOption.onLoadListener.onLoadCancel("component has destroyed", requestWithSource.request)
           }
-        } else if (requestWithSource.source == ImageKnifeRequestSource.ERROR_HOLDER) {
-          requestWithSource.request.requestState = ImageKnifeRequestState.ERROR;
         }
       });
+
       this.executingJobMap.remove(memoryKey);
       this.dispatchNextJob();
     } else {
-      LogUtil.log('error: no requestlist need to draw for key = ' + memoryKey);
+      LogUtil.log("error: no requestlist need to draw for key = " + memoryKey);
     }
-    LogUtil.log('getAndShowImage_CallBack.end:' + currentRequest.componentId + ',srcType:' + requestSource + ',version:' + currentRequest.componentVersion)
+    LogUtil.log("ImageKnife_DataTime_getAndShowImage_CallBack.end:"+currentRequest.imageKnifeOption.loadSrc)
   }
 
 
   dispatchNextJob() {
-    LogUtil.log('dispatchNextJob.start')
-
-    // 主图和错误图并发加载时，以及主图加载失败后立即加载错误图，可能会导致短时间内并发数超过maxRequests，故此处减少响应的并发
-    if (this.executingJobMap.length >= this.maxRequests) {
-      return
-    }
-
+    LogUtil.log("ImageKnife_DataTime_dispatchNextJob.start")
     while (true) {
       let request = this.jobQueue.pop()
       if (request === undefined) {
-        LogUtil.log('dispatchNextJob.end:no any job')
+        LogUtil.log("ImageKnife_DataTime_dispatchNextJob.end:no any job")
         break // 队列已无任务
       }
       else if (request.requestState === ImageKnifeRequestState.PROGRESS) {
-        LogUtil.log('dispatchNextJob.start executeJob:' + request.componentId  + ',version:' + request.componentVersion)
+        LogUtil.log("ImageKnife_DataTime_dispatchNextJob.start executeJob:" + request.imageKnifeOption.loadSrc)
         this.executeJob(request)
-        LogUtil.log('dispatchNextJob.end executeJob:' + request.componentId  + ',version:' + request.componentVersion)
+        LogUtil.log("ImageKnife_DataTime_dispatchNextJob.end executeJob:" + request.imageKnifeOption.loadSrc)
         break
       }else if (request.requestState == ImageKnifeRequestState.DESTROY && request.imageKnifeOption.onLoadListener?.onLoadCancel) {
         //构建回调错误信息
-        let callBackData = request.imageKnifeData;
+        let callBackData = request.getImageKnifeData();
         if (callBackData) {
           let timeInfo: TimeInfo =  ImageKnifeLoader.getTimeInfo(callBackData)
           timeInfo.requestCancelTime = Date.now();
@@ -543,8 +504,7 @@ export class ImageKnifeDispatcher {
           };
           callBackData.errorInfo = errorInfo;
         }
-        LogUtil.log('dispatchNextJob cancel:' + request.componentId  + ',version:' + request.componentVersion)
-        request.imageKnifeOption.onLoadListener.onLoadCancel('component has destroyed from queue', request)
+        request.imageKnifeOption.onLoadListener.onLoadCancel("component has destroyed", request)
       }
     }
   }
@@ -572,8 +532,8 @@ export class ImageKnifeDispatcher {
  */
 @Concurrent
 async function requestJob(request: RequestJobRequest, requestList?: List<ImageKnifeRequestWithSource>) {
-  LogUtil.log('requestJob.start:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
-  let src = typeof request.src == 'number' ? request.resName != undefined ? request.resName : request.src + '' : request.src
+  LogUtil.log("ImageKnife_DataTime_requestJob.start:" + request.src + " requestSource=" + request.requestSource)
+  let src = typeof request.src == "number" ? request.resName != undefined ? request.resName : request.src + "" : request.src
   // 生成文件缓存key
   let fileKey = request.engineKey.generateFileKey(src, request.signature, request.isAnimator)
 

library/src/main/ets/ImageKnifeLoader.ets

@@ -16,7 +16,6 @@ import {
   CacheStrategy,
   DecodeImageInfo,
   ErrorInfo,
-  FlipRotate,
   ImageKnifeData,
   ImageKnifeRequestSource,
   ImageKnifeRequestWithSource, RequestJobRequest,
@@ -36,8 +35,6 @@ import util from '@ohos.util';
 import { FileTypeUtil } from './utils/FileTypeUtil';
 import { DownsampleStrategy } from './downsampling/DownsampleStartegy';
 import { Downsampler } from './downsampling/Downsampler';
-import { common } from '@kit.AbilityKit';
-import { ImageLoaderFactory } from './loaderStrategy/ImageLoaderFactory';
 
 class RequestData {
   receiveSize: number = 2000
@@ -51,28 +48,13 @@ export class ImageKnifeLoader {
   static execute(request: RequestJobRequest, requestList: List<ImageKnifeRequestWithSource> | undefined, fileKey: string){
     ImageKnifeLoader.getImageArrayBuffer(request,requestList,fileKey)
   }
-  static getUnit8Array (resBuf: ArrayBuffer) {
-    let unit8 = new Uint8Array(resBuf)
-    let unitString = ''
-    if (unit8.length >= 3) {
-      unitString = unit8[0] + ',' + unit8[1] + ',' + unit8[2]
-    } else if (unit8.length > 0 && unit8.length < 3) {
-      unitString = unit8.length + ''
-    }
-    return unitString
-  }
   static async parseImage(resBuf: ArrayBuffer, fileKey: string,
     request: RequestJobRequest, callBackData: ImageKnifeData) {
     callBackData.bufSize = resBuf.byteLength;
     let typeValue = new FileTypeUtil().getFileType(resBuf);
     if(typeValue == null) {
-      LogUtil.log('requestJob.end: getFileType is null: ' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
-      ImageKnifeLoader.makeEmptyResult(request,
-        'request is not a valid image source:' + request.src + ',componentId' + request.componentId + ',srcType:' +
-        request.requestSource + ',' +
-        request.componentVersion + ',buffer:' + resBuf.byteLength + ',unit8:' + ImageKnifeLoader.getUnit8Array(resBuf),
-        ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_GET_FORMAT,
-          LoadPixelMapCode.IMAGE_PARSE_FORMAT_FAILED_CODE))
+      LogUtil.log("ImageKnife_DataTime_requestJob.end: getFileType is null " + request.src)
+      ImageKnifeLoader.makeEmptyResult(request,"request is not a valid image source", ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_GET_FORMAT, LoadPixelMapCode.IMAGE_PARSE_FORMAT_FAILED_CODE))
       return
     }
     callBackData.type = typeValue;
@@ -84,7 +66,7 @@ export class ImageKnifeLoader {
     if (typeValue === 'gif' || typeValue === 'webp') {
       ImageKnifeLoader.parseAnimatorImage(resBuf ,typeValue ,fileKey , request, callBackData)
       return
-    } else if(typeValue == 'svg') {
+    } else if(typeValue == "svg") {
       ImageKnifeLoader.parseSvgImage(resBuf ,typeValue ,fileKey , request, callBackData)
       return
     }
@@ -100,16 +82,20 @@ export class ImageKnifeLoader {
       loadFail: error,
       imageKnifeData: data
     }
-    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { 'value': res } })
+    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
   }
 
-  static assembleError(data: ImageKnifeData | undefined, phase: string, code?: number): ImageKnifeData | undefined {
+  static assembleError(data: ImageKnifeData | undefined, phase: string, code?: number,
+    httpCode?: number): ImageKnifeData | undefined {
     let errorCallBackData = data?.errorInfo;
     if (!errorCallBackData) {
       return data;
     }
     errorCallBackData.phase = phase;
     errorCallBackData.code = code? code: 0;
+    if (httpCode && httpCode != 0) {
+      errorCallBackData.httpCode = httpCode;
+    }
     return data
   }
 
@@ -125,7 +111,6 @@ export class ImageKnifeLoader {
   }
 
   static async parseNormalImage(resBuf: ArrayBuffer, typeValue: string, fileKey: string, request: RequestJobRequest, callBackData: ImageKnifeData) {
-    LogUtil.log('image parse pixelmap start:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
     let resPixelmap: PixelMap | undefined = undefined
     let timeInfo: TimeInfo = ImageKnifeLoader.getTimeInfo(callBackData);
 
@@ -134,24 +119,13 @@ export class ImageKnifeLoader {
     }
     let imageSource: image.ImageSource = image.createImageSource(resBuf)
     if (imageSource === undefined){
-      ImageKnifeLoader.makeEmptyResult(request,'image.createImageSource failed', ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_SOURCE, LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
+      ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed", ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_SOURCE, LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
       return
     }
 
-    let imageInfoSync = imageSource.getImageInfoSync()
-    if (imageInfoSync == undefined){
-      imageSource.release()
-      ImageKnifeLoader.makeEmptyResult(request, 'getImageInfoSync failed')
-      return
-    }
-    let size = imageInfoSync.size
+    let size = (await imageSource.getImageInfo()).size
     callBackData.imageWidth = size.width;
     callBackData.imageHeight = size.height;
-
-    if (request.isAutoImageFit && request.requestSource == ImageKnifeRequestSource.SRC){
-      request.componentHeight = request.componentWidth * size.height / size.width
-    }
-
     try {
       if ((request.downsampType !== DownsampleStrategy.NONE) &&
         request.requestSource == ImageKnifeRequestSource.SRC) {
@@ -159,20 +133,11 @@ export class ImageKnifeLoader {
           ImageKnifeLoader.getDownsamplerDecodingOptions(typeValue, request, size, ImageKnifeRequestSource.SRC)
       }
     } catch (err) {
-      imageSource.release()
-      ImageKnifeLoader.makeEmptyResult(request, 'getDownsamplerDecodingOptions failed:' + err)
+      ImageKnifeLoader.makeEmptyResult(request, err)
       return
     }
     timeInfo.decodeStartTime = Date.now();
 
-    // 获取旋转信息
-    let exif: string | undefined = undefined;
-    await imageSource.getImageProperty(image.PropertyKey.ORIENTATION).then((res)=>{
-      exif = res;
-    }).catch((error: BusinessError)=>{
-      LogUtil.info("The normal image don't have rotation information, " + error.message);
-    })
-
     await imageSource.createPixelMap(decodingOptions)
       .then((pixelmap: PixelMap) => {
         timeInfo.decodeEndTime = Date.now();
@@ -181,35 +146,23 @@ export class ImageKnifeLoader {
       }).catch((error: BusinessError) => {
         timeInfo.decodeEndTime = Date.now();
         imageSource.release()
-        ImageKnifeLoader.makeEmptyResult(request, 'createPixelMap failed:' + JSON.stringify(error),
-          ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_PIXEL_MAP, LoadPixelMapCode.IMAGE_DECODE_ERROR_CODE))
+        ImageKnifeLoader.makeEmptyResult(request,JSON.stringify(error), ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_PIXEL_MAP, LoadPixelMapCode.IMAGE_DECODE_ERROR_CODE))
         return
       })
     if (request.requestSource === ImageKnifeRequestSource.SRC && request.transformation !== undefined && resPixelmap !== undefined) {
-      LogUtil.log('requestJob.transform.start:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_requestJob.transform.start:" + request.src)
       resPixelmap = await request.transformation?.transform(request.context, resPixelmap,  request.componentWidth, request.componentHeight);
-      LogUtil.log('requestJob.transform.end:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
+      LogUtil.log("ImageKnife_DataTime_requestJob.transform.end:" + request.src)
     }
     try {
       resPixelmap?.setTransferDetached(true)
     } catch (e) {
-      LogUtil.error('PixelMap setTransferDetached failed:' + JSON.stringify(e))
-    }
-    // 设置翻转和旋转角度
-    if(exif && exif !== 'Top-left'){
-      let result = ImageKnifeLoader.getOrientation(exif);
-      if(result.horizontal || result.vertical) {
-        resPixelmap?.flipSync(result.horizontal, result.vertical);
-      }
-      if(result.rotate > 0) {
-        resPixelmap?.rotateSync(result.rotate);
-      }
-      LogUtil.log('The normal image set flip , horizontal=' + result.horizontal + ', vertical=' +result.vertical + ', rotate=' + result.rotate);
+      LogUtil.error("PixelMap setTransferDetached err:"+JSON.stringify(e))
     }
 
     //获取各个pixelMap的大小
-    if (resPixelmap !== undefined) {
-      let decodeImages: DecodeImageInfo[] = [];
+    if (resPixelmap && typeof resPixelmap !== "string") {
+      let decodeImages: Array<DecodeImageInfo> = [];
       let size = (resPixelmap as PixelMap).getImageInfoSync().size;
       let decodeImage: DecodeImageInfo = {
         contentWidth: size.width,
@@ -228,8 +181,7 @@ export class ImageKnifeLoader {
       type:typeValue,
       imageKnifeData:callBackData
     }
-    LogUtil.log('image parse pixelmap end:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
-    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { 'value': res } })
+    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
   }
   static async parseSvgImage(resBuf: ArrayBuffer, typeValue: string, fileKey: string,
     request: RequestJobRequest, callBackData: ImageKnifeData) {
@@ -238,17 +190,11 @@ export class ImageKnifeLoader {
 
     let imageSource: image.ImageSource = image.createImageSource(resBuf)
     if (imageSource === undefined){
-      ImageKnifeLoader.makeEmptyResult(request,'image.createImageSource failed', ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_SOURCE, LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
+      ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed", ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_SOURCE, LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
       return
     }
 
-    let imageInfoSync = imageSource.getImageInfoSync()
-    if (imageInfoSync == undefined){
-      imageSource.release()
-      ImageKnifeLoader.makeEmptyResult(request, 'getImageInfoSync failed')
-      return
-    }
-    let size = imageInfoSync.size
+    let size = (await imageSource.getImageInfo()).size
     let scale = size.height / size.width
     let hValue = Math.round(request.componentHeight);
     let wValue = Math.round(request.componentWidth);
@@ -268,20 +214,10 @@ export class ImageKnifeLoader {
         opts = ImageKnifeLoader.getDownsamplerDecodingOptions(typeValue, request, size)
       }
     } catch (err) {
-      imageSource.release()
-      ImageKnifeLoader.makeEmptyResult(request,'getDownsamplerDecodingOptions failed:' + err)
+      ImageKnifeLoader.makeEmptyResult(request,err)
       return
     }
     timeInfo.decodeStartTime = Date.now();
-
-    // 获取旋转信息
-    let exif: string | undefined = undefined;
-    await imageSource.getImageProperty(image.PropertyKey.ORIENTATION).then((res)=>{
-      exif = res;
-    }).catch((error: BusinessError)=>{
-      LogUtil.info("Svg image don't have rotation information, " + error.message);
-    })
-
     await imageSource.createPixelMap(opts)
       .then((pixelmap: PixelMap) => {
         timeInfo.decodeEndTime = Date.now();
@@ -289,30 +225,19 @@ export class ImageKnifeLoader {
         imageSource.release()
         try {
           resPixelmap.setTransferDetached(true)
-          // 设置翻转和旋转角度
-          if(exif && exif !== 'Top-left'){
-            let result = ImageKnifeLoader.getOrientation(exif);
-            if(result.horizontal || result.vertical) {
-              resPixelmap?.flipSync(result.horizontal, result.vertical);
-            }
-            if(result.rotate > 0) {
-              resPixelmap?.rotateSync(result.rotate);
-            }
-            LogUtil.log('Svg image set flip , horizontal=' + result.horizontal + ', vertical=' +result.vertical + ', rotate=' + result.rotate);
-          }
         } catch (e) {
-          LogUtil.error('PixelMap setTransferDetached failed:' + JSON.stringify(e))
+          LogUtil.error("PixelMap setTransferDetached err:"+JSON.stringify(e))
         }
       }).catch((error: BusinessError) => {
         timeInfo.decodeEndTime = Date.now();
         imageSource.release()
-        ImageKnifeLoader.makeEmptyResult(request,'getImageInfoSync failed:' + JSON.stringify(error), ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_PIXEL_MAP, LoadPixelMapCode.IMAGE_DECODE_ERROR_CODE))
+        ImageKnifeLoader.makeEmptyResult(request,JSON.stringify(error), ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_PIXEL_MAP, LoadPixelMapCode.IMAGE_DECODE_ERROR_CODE))
         return
       })
 
     //获取各个pixelMap的大小
-    if (resPixelmap && typeof resPixelmap !== 'string') {
-      let decodeImages: DecodeImageInfo[] = [];
+    if (resPixelmap && typeof resPixelmap !== "string") {
+      let decodeImages: Array<DecodeImageInfo> = [];
       let decodeImage: DecodeImageInfo = {
         contentWidth: defaultSize.width,
         contentHeight: defaultSize.height,
@@ -328,34 +253,30 @@ export class ImageKnifeLoader {
       type:typeValue,
       imageKnifeData:callBackData
     }
-    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { 'value': res } })
+    emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
   }
   static async parseAnimatorImage(resBuf: ArrayBuffer, typeValue: string,
     fileKey: string,request: RequestJobRequest, callBackData: ImageKnifeData)  {
     let timeInfo: TimeInfo = ImageKnifeLoader.getTimeInfo(callBackData);
     let imageSource: image.ImageSource = image.createImageSource(resBuf)
     if (imageSource === undefined){
-      ImageKnifeLoader.makeEmptyResult(request,'image.createImageSource failed', ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_CREATE_SOURCE,LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
+      ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed", ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_CREATE_SOURCE,LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
       return
     }
 
     let frameCount = await imageSource.getFrameCount()
-    let imageInfoSync = imageSource.getImageInfoSync()
-    imageSource.release()
-    if (imageInfoSync == undefined){
-      ImageKnifeLoader.makeEmptyResult(request, 'getImageInfoSync failed')
-      return
-    }
-    let size = imageInfoSync.size
+    let size = (await imageSource.getImageInfo()).size
     callBackData.frameCount = frameCount;
     callBackData.imageWidth = size.width;
     callBackData.imageHeight = size.height;
 
+    imageSource.release()
+
     if(frameCount == undefined || frameCount == 1) {
     } else {
       timeInfo.decodeStartTime = Date.now()
-      let base64str = 'data:image/' + typeValue + ';base64,' + new util.Base64Helper().encodeToStringSync(new Uint8Array(resBuf))
-      timeInfo.decodeEndTime = Date.now()
+      let base64str = "data:image/" + typeValue + ";base64," + new util.Base64Helper().encodeToStringSync(new Uint8Array(resBuf))
+      timeInfo.diskCheckEndTime = Date.now()
       let res: RequestJobResult = {
         pixelMap: base64str,
         bufferSize: resBuf.byteLength,
@@ -364,7 +285,7 @@ export class ImageKnifeLoader {
         type:typeValue,
         imageKnifeData:callBackData
       }
-      emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { 'value': res } })
+      emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
       return
     }
     ImageKnifeLoader.parseNormalImage(resBuf, typeValue, fileKey, request, callBackData)
@@ -376,21 +297,14 @@ export class ImageKnifeLoader {
     if (typeValue === 'gif' || typeValue === 'webp') {
       let imageSource: image.ImageSource = image.createImageSource(resBuf);
       if (imageSource === undefined){
-        ImageKnifeLoader.makeEmptyResult(request,'image.createImageSource failed', ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_SOURCE, LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
+        ImageKnifeLoader.makeEmptyResult(request,"image.createImageSource failed", ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CREATE_SOURCE, LoadPixelMapCode.IMAGE_SOURCE_ERROR_CODE))
         return
       }
       let decodingOptions: image.DecodingOptions = {
         editable: request.requestSource === ImageKnifeRequestSource.SRC && request.transformation !== undefined ? true : false,
       }
-
-      let imageInfoSync = imageSource.getImageInfoSync()
-      if (imageInfoSync == undefined){
-        imageSource.release()
-        ImageKnifeLoader.makeEmptyResult(request, 'getImageInfoSync failed')
-        return
-      }
-      callBackData.imageWidth = imageInfoSync.size.width;
-      callBackData.imageHeight = imageInfoSync.size.height;
+      callBackData.imageWidth = imageSource.getImageInfoSync().size.width;
+      callBackData.imageHeight = imageSource.getImageInfoSync().size.height;
       let pixelMapList: Array<PixelMap> = []
       let delayList: Array<number> = []
       timeInfo.decodeStartTime = Date.now();
@@ -422,13 +336,12 @@ export class ImageKnifeLoader {
       }).catch((error: BusinessError) => {
         imageSource.release()
         timeInfo.decodeEndTime = Date.now();
-        ImageKnifeLoader.makeEmptyResult(request,'createPixelMapList failed:' + JSON.stringify(error),
-          ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_CREATE_PIXEL_MAP,LoadPixelMapCode.IMAGE_DECODE_ERROR_CODE))
+        ImageKnifeLoader.makeEmptyResult(request,JSON.stringify(error), ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_CREATE_PIXEL_MAP,LoadPixelMapCode.IMAGE_DECODE_ERROR_CODE))
         return
       })
       callBackData.decodeImages = decodeImages;
       let res: RequestJobResult = {
-        pixelMap: '',
+        pixelMap: "",
         bufferSize: resBuf.byteLength,
         fileKey: fileKey,
         type: typeValue,
@@ -436,9 +349,9 @@ export class ImageKnifeLoader {
         pixelMapList,
         delayList
       }
-      emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { 'value': res } })
+      emitter.emit(Constants.CALLBACK_EMITTER + request.memoryKey, { data: { "value": res } })
     } else {
-      ImageKnifeLoader.makeEmptyResult(request,'ImageKnifeAnimatorComponent not support format', ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_PARSE_IAMGE,LoadPixelMapCode.IMAGE_FORMAT_ERROR_CODE))
+      ImageKnifeLoader.makeEmptyResult(request,"ImageKnifeAnimatorComponent组件仅支持动态图", ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_PARSE_IAMGE,LoadPixelMapCode.IMAGE_FORMAT_ERROR_CODE))
     }
   }
   static getHeaderObj(request:RequestJobRequest){
@@ -455,62 +368,207 @@ export class ImageKnifeLoader {
     return headerObj
   }
   static FileCacheParseImage(request:RequestJobRequest,resBuf:ArrayBuffer,fileKey:string, callBackData: ImageKnifeData){
-    try {
-      // 保存文件缓存
-      if (resBuf !== undefined && request.writeCacheStrategy !== CacheStrategy.Memory) {
-        LogUtil.log('requestJob_saveFileCacheOnlyFile.start:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
-        FileCache.saveFileCacheOnlyFile(request.context, fileKey, resBuf , request.fileCacheFolder)
-        LogUtil.log('requestJob_saveFileCacheOnlyFile.end:' + request.componentId + ',srcType:' + request.requestSource + ',' + request.componentVersion)
-      }
-      ImageKnifeLoader.parseImage(resBuf,fileKey,request, callBackData)
-    } catch (e) {
-      ImageKnifeLoader.makeEmptyResult(request,
-        'image load FileCacheParseImage error:' + e + ',componentId' + request.componentId + ',srcType:' +
-        request.requestSource + ',' + request.componentVersion)
+    // 保存文件缓存
+    if (resBuf !== undefined && request.writeCacheStrategy !== CacheStrategy.Memory) {
+      LogUtil.log("ImageKnife_DataTime_requestJob_saveFileCacheOnlyFile.start:"+request.src)
+      FileCache.saveFileCacheOnlyFile(request.context, fileKey, resBuf , request.fileCacheFolder)
+      LogUtil.log("ImageKnife_DataTime_requestJob_saveFileCacheOnlyFile.end:"+request.src)
     }
+    ImageKnifeLoader.parseImage(resBuf,fileKey,request, callBackData)
   }
   // 获取图片资源
   static async getImageArrayBuffer(request: RequestJobRequest, requestList: List<ImageKnifeRequestWithSource> | undefined,fileKey:string) {
     let resBuf: ArrayBuffer | undefined
-    let loadError: string = ''
+    let loadError: string = ""
     //定义图片各个阶段错误信息
     let error: ErrorInfo = { code: 0, phase: LoadPhase.PHASE_LOAD }
     //定义加载时间点
     let callBackTimeInfo: TimeInfo = {};
     //定义加载信息回调数据
     let callBackData: ImageKnifeData = {
-      source: '',
+      source: "",
       imageWidth: 0,
       imageHeight: 0,
       timeInfo: callBackTimeInfo,
       errorInfo: error
     };
 
-    const loaderStrategy = ImageLoaderFactory.getLoaderStrategy(request);
-    if (loaderStrategy) {
-      await loaderStrategy.loadImage(request, requestList, fileKey, callBackData, callBackTimeInfo);
-    } else {
-      loadError = `Unsupported request type: ${request.src}`;
-      callBackTimeInfo.requestEndTime = Date.now();
-      ImageKnifeLoader.makeEmptyResult(request, loadError, callBackData);
-    }
-  }
-  static isLocalLoadSrc(context: Object | undefined, loadSrc: string): boolean {
-    if (context != undefined) {
-      let fileDir: string = (context as common.UIAbilityContext).filesDir as string;
-      let cacheDir: string = (context as common.UIAbilityContext).cacheDir as string
-      if (loadSrc.startsWith(fileDir) || loadSrc.startsWith(cacheDir)) {
-        return true;
+    // 判断自定义下载
+    if (request.customGetImage !== undefined && request.requestSource == ImageKnifeRequestSource.SRC && typeof request.src == "string") {
+      // 先从文件缓存获取
+      ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_CUSTOM_LOAD)
+      callBackTimeInfo.diskCheckStartTime = Date.now();
+      resBuf = FileCache.getFileCacheByFile(request.context, fileKey , request.fileCacheFolder)
+      callBackTimeInfo.diskCheckEndTime = Date.now();
+      if (resBuf === undefined) {
+        LogUtil.log("start customGetImage src=" + request.src)
+        const headerObj: Record<string, Object> = ImageKnifeLoader.getHeaderObj(request)
+        try {
+          request.customGetImage(request.context, request.src, headerObj)
+            .then((buffer)=>{
+              if(buffer != undefined) {
+                ImageKnifeLoader.FileCacheParseImage(request,buffer,fileKey,callBackData)
+              } else {
+                loadError = "customGetImage loadFail undefined"
+                ImageKnifeLoader.makeEmptyResult(request,loadError, ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CUSTOM_LOAD, LoadPixelMapCode.IMAGE_CUSTOM_LOAD_FAILED_CODE))
+              }
+            }).catch((err:string)=>{
+            ImageKnifeLoader.makeEmptyResult(request,err, ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CUSTOM_LOAD, LoadPixelMapCode.IMAGE_CUSTOM_LOAD_FAILED_CODE))
+          })
+        } catch (e) {
+          loadError = "customGetImage loadFail failed"
+          ImageKnifeLoader.makeEmptyResult(request,loadError + e, ImageKnifeLoader.assembleError(callBackData, LoadPhase.PHASE_CUSTOM_LOAD, LoadPixelMapCode.IMAGE_CUSTOM_LOAD_FAILED_CODE))
+        }
+        LogUtil.log("end customGetImage src=" + request.src)
+        return
       }
     }
-    return false;
+    else {
+      if (typeof request.src === 'string') {
+        if (request.src.indexOf("http://") == 0 || request.src.indexOf("https://") == 0) { //从网络下载
+          // 先从文件缓存获取
+          ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_NET)
+          callBackTimeInfo.diskCheckStartTime = Date.now()
+          resBuf = FileCache.getFileCacheByFile(request.context, fileKey , request.fileCacheFolder)
+          callBackTimeInfo.diskCheckEndTime = Date.now()
+          if (resBuf !== undefined){
+            LogUtil.log("success get image from filecache for key = " + fileKey + " src = " + request.src)
+          }
+          else if (request.onlyRetrieveFromCache != true) {
+            LogUtil.log("HttpDownloadClient.start:" + request.src)
+            callBackTimeInfo.netRequestStartTime = Date.now();
+            let httpRequest = http.createHttp();
+            let progress: number = 0
+            let arrayBuffers = new Array<ArrayBuffer>()
+            const headerObj: Record<string, Object> = ImageKnifeLoader.getHeaderObj(request)
+            httpRequest.on("dataReceive", (data: ArrayBuffer) => {
+              arrayBuffers.push(data)
+            });
+
+            if (request.isWatchProgress) {
+              httpRequest.on('dataReceiveProgress', (data: RequestData) => {
+                // 下载进度
+                if (data != undefined && (typeof data.receiveSize == 'number') && (typeof data.totalSize == 'number')) {
+                  let percent = Math.round(((data.receiveSize * 1.0) / (data.totalSize * 1.0)) * 100)
+                  if (progress !== percent) {
+                    progress = percent
+                    if (requestList === undefined) {
+                      // 子线程
+                      emitter.emit(Constants.PROGRESS_EMITTER + request.memoryKey, { data: { "value": progress } })
+                    }else {
+                      // 主线程请求
+                      requestList!.forEach((requestWithSource: ImageKnifeRequestWithSource) => {
+                        if (requestWithSource.request.imageKnifeOption.progressListener !== undefined && requestWithSource.source === ImageKnifeRequestSource.SRC) {
+                          requestWithSource.request.imageKnifeOption.progressListener(progress)
+                        }
+                      })
+                    }
+                  }
+                }
+              })
+            }
+            let promise = httpRequest.requestInStream(request.src, {
+              header: headerObj,
+              method: http.RequestMethod.GET,
+              expectDataType: http.HttpDataType.ARRAY_BUFFER,
+              connectTimeout: 60000,
+              readTimeout: 0,
+              // usingProtocol:http.HttpProtocol.HTTP1_1
+              // header: new Header('application/json')
+              caPath: request.caPath === undefined ? undefined : request.caPath,
+            });
+
+            promise.then((data: number) => {
+              ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_NET, undefined, data)
+              callBackTimeInfo.netRequestEndTime = Date.now();
+              if (data == 200 || data == 206 || data == 204) {
+                resBuf = combineArrayBuffers(arrayBuffers)
+                ImageKnifeLoader.FileCacheParseImage(request,resBuf,fileKey, callBackData)
+              } else {
+                loadError = "HttpDownloadClient has error, http code =" + JSON.stringify(data)
+                ImageKnifeLoader.makeEmptyResult(request,loadError, ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_NET, LoadPixelMapCode.IMAGE_HTTPS_LOAD_FAILED_CODE, data))
+              }
+            }).catch((err: Error) => {
+              loadError = "HttpDownloadClient download ERROR : err = " + JSON.stringify(err)
+              callBackTimeInfo.netRequestEndTime = Date.now();
+              ImageKnifeLoader.makeEmptyResult(request,loadError, ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_NET, LoadPixelMapCode.IMAGE_HTTPS_LOAD_FAILED_CODE, undefined))
+            });
+            LogUtil.log("HttpDownloadClient.end:" + request.src)
+            return
+          }
+          else {
+            callBackTimeInfo.netRequestEndTime = Date.now();
+            loadError = 'onlyRetrieveFromCache,do not fetch image src = ' + request.src
+          }
+        } else if (request.src.startsWith('datashare://') || request.src.startsWith('file://')) {
+          ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_SHARE_FILE)
+          await fs.open(request.src, fs.OpenMode.READ_ONLY).then(async (file) => {
+            await fs.stat(file.fd).then(async (stat) =>{
+              let buf = new ArrayBuffer(stat.size);
+              await fs.read(file.fd, buf).then((readLen) => {
+                resBuf = buf;
+                fs.closeSync(file.fd);
+              }).catch((err:BusinessError) => {
+                ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_SHARE_FILE, LoadPixelMapCode.IMAGE_LOAD_SHARE_FILE_FAILED_CODE)
+                loadError = 'LoadDataShareFileClient fs.read err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code
+              })
+            }).catch((err:BusinessError) => {
+              ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_SHARE_FILE, LoadPixelMapCode.IMAGE_LOAD_SHARE_FILE_FAILED_CODE)
+              loadError = 'LoadDataShareFileClient fs.stat err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code
+            })
+          }).catch((err:BusinessError) => {
+            ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_SHARE_FILE, LoadPixelMapCode.IMAGE_LOAD_SHARE_FILE_FAILED_CODE)
+            loadError = 'LoadDataShareFileClient fs.open err happened uri=' + request.src + " err.msg=" + err?.message + " err.code=" + err?.code
+          })
+        } else { //从本地文件获取
+          ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_LOCAL_FILE)
+          try {
+            let stat = fs.statSync(request.src);
+            if (stat.size > 0) {
+              let file = fs.openSync(request.src, fs.OpenMode.READ_ONLY);
+              resBuf = new ArrayBuffer(stat.size);
+              fs.readSync(file.fd, resBuf);
+              fs.closeSync(file);
+            }
+          } catch (err) {
+            ImageKnifeLoader.assembleError(callBackData,LoadPhase.PHASE_LOCAL_FILE, LoadPixelMapCode.IMAGE_LOAD_LOCAL_FILE_FAILED_CODE)
+            loadError = err
+          }
+        }
+      } else if (typeof request.src == "number") { //从资源文件获取
+        let manager = request.context.createModuleContext(request.moduleName).resourceManager
+        if (resBuf == undefined && request.onlyRetrieveFromCache != true && request.requestSource == ImageKnifeRequestSource.SRC) {
+          if(request.src == -1) {
+            let resName = request.resName as string
+            resBuf = (await manager.getMediaByName(resName.substring(10))).buffer as ArrayBuffer
+          } else {
+            resBuf = manager.getMediaContentSync(request.src).buffer as ArrayBuffer
+          }
+        } else if (resBuf == undefined && request.requestSource != ImageKnifeRequestSource.SRC) {
+          if(request.src == -1) {
+            let resName = request.resName as string
+            resBuf = (await manager.getMediaByName(resName.substring(10))).buffer as ArrayBuffer
+          } else {
+            resBuf = manager.getMediaContentSync(request.src).buffer as ArrayBuffer
+          }
+        }
+      }
+    }
+
+    if (resBuf === undefined){
+      callBackTimeInfo.requestEndTime = Date.now();
+      ImageKnifeLoader.makeEmptyResult(request,loadError ,callBackData)
+      return
+    }
+    ImageKnifeLoader.parseImage(resBuf,fileKey,request, callBackData)
   }
+
   static getDownsamplerDecodingOptions(typeValue: string, request: RequestJobRequest, size: Size,
     SRC?: ImageKnifeRequestSource):image.DecodingOptions {
     let reqSize =
-      new Downsampler().calculateScaling(typeValue, size.width, size.height,
-        vp2px(request.targetWidth), vp2px(request.targetHeight), request.downsampType)
-    if (typeValue == 'svg') {
+      new Downsampler().calculateScaling(typeValue, size.width, size.height, request.targetWidth, request.targetHeight,
+        request.downsampType)
+    if (typeValue == "svg") {
       return {
         editable: true,
         desiredSize: {
@@ -529,39 +587,4 @@ export class ImageKnifeLoader {
       }
     }
   }
-
-  static getOrientation(orientation: string | undefined){
-    let horizontal: boolean = false;
-    let vertical: boolean = false;
-    let rotate: number= 0;
-    switch (orientation){
-      case 'Top-left': break
-      case 'Top-right':
-        horizontal = true;
-        break;
-      case 'Bottom-left':
-        vertical = true;
-        break
-      case 'Bottom-right':
-        rotate = 180;
-        break;
-      case 'Left-top':
-        horizontal = true;
-        rotate = 270;
-        break
-      case 'Right-top':
-        rotate = 90;
-        break;
-      case 'Left-bottom':
-        rotate = 270;
-        break
-      case 'Right-bottom':
-        horizontal = true;
-        rotate = 90;
-        break;
-    }
-
-    let data: FlipRotate = { horizontal: horizontal, vertical: vertical, rotate:rotate };
-    return data
-  }
 }