From a766f210b4be64f5ee78bac284380d2eb440e24f Mon Sep 17 00:00:00 2001
From: zhoulisheng <635547767@qq.com>
Date: Tue, 24 Oct 2023 16:54:37 +0800
Subject: [PATCH 1/6] =?UTF-8?q?1.=E6=96=B0=E5=A2=9E=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E6=9A=82=E5=81=9C=E5=8A=A0=E8=BD=BD=E5=92=8C=E5=85=A8=E5=B1=80?=
 =?UTF-8?q?=E9=87=8D=E6=96=B0=E5=8A=A0=E8=BD=BD=E7=9A=84=E8=83=BD=E5=8A=9B?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhoulisheng <635547767@qq.com>
---
 .../src/main/ets/pages/manyPhotoShowPage.ets  |  19 +
 .../ets/components/imageknife/ImageKnife.ets  | 368 +++++++++++-------
 .../imageknife/ImageKnifeComponent.ets        |  61 +--
 .../components/imageknife/RequestOption.ets   |  40 +-
 .../networkmanage/DownloadClient.ets          |   7 +-
 .../networkmanage/HttpDownloadClient.ets      | 113 ++++++
 .../requestmanage/RequestManager.ets          |   2 +
 .../imageknife/utils/FileTypeUtil.ets         | 183 +++------
 .../utils/base/EasyLinkedHashMap.ets          | 194 +++++++++
 .../imageknife/utils/base/MethodMutex.ets     |  40 ++
 10 files changed, 720 insertions(+), 307 deletions(-)
 create mode 100644 imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets
 create mode 100644 imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets
 create mode 100644 imageknife/src/main/ets/components/imageknife/utils/base/MethodMutex.ets

diff --git a/entry/src/main/ets/pages/manyPhotoShowPage.ets b/entry/src/main/ets/pages/manyPhotoShowPage.ets
index 1841360..c07919f 100644
--- a/entry/src/main/ets/pages/manyPhotoShowPage.ets
+++ b/entry/src/main/ets/pages/manyPhotoShowPage.ets
@@ -31,7 +31,26 @@ struct ManyPhotoShowPage {
   build() {
    Column() {
 
+    Button('点击暂停加载')
+     .margin({top:10,bottom:5})
+     .onClick(()=>{
+      let imageKnife = ImageKnifeGlobal.getInstance().getImageKnife();
+      if(imageKnife!= undefined){
+       imageKnife.pauseRequests()
+      }
+     })
+
+    Button('点击重新加载')
+     .margin({top:10,bottom:5})
+     .onClick(()=>{
+      let imageKnife = ImageKnifeGlobal.getInstance().getImageKnife();
+      if(imageKnife!= undefined){
+       imageKnife.resumeRequest()
+      }
+     })
+
     Button('设置磁盘存储为50M')
+     .margin({top:10,bottom:5})
     .onClick(()=>{
      if(ImageKnifeGlobal.getInstance().getImageKnife() != undefined) {
       let disk: DiskLruCache | undefined = (ImageKnifeGlobal.getInstance().getImageKnife())?.getDiskMemoryCache();
diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
index 464efba..3b9af37 100644
--- a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
+++ b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
@@ -15,60 +15,68 @@
 
 import { DiskLruCache } from "@ohos/disklrucache"
 import { LruCache } from "../cache/LruCache"
-import {EngineKeyFactories} from "../cache/key/EngineKeyFactories"
-import {EngineKeyInterface} from "../cache/key/EngineKeyInterface"
-import {RequestOption} from "../imageknife/RequestOption"
-import {AsyncCallback} from "../imageknife/interface/AsyncCallback"
-import {PlaceHolderManager} from "../imageknife/holder/PlaceHolderManager"
-import {RetryHolderManager} from "../imageknife/holder/RetryHolderManager"
-import {ErrorHolderManager} from "../imageknife/holder/ErrorHolderManager"
-import {RequestManager} from "../imageknife/requestmanage/RequestManager"
-import {NONE} from "../cache/diskstrategy/enum/NONE"
-import {FileTypeUtil} from '../imageknife/utils/FileTypeUtil'
-import {DownloadClient} from '../imageknife/networkmanage/DownloadClient'
-import  {IDataFetch} from '../imageknife/networkmanage/IDataFetch'
-import {ParseResClient} from '../imageknife/resourcemanage/ParseResClient'
-import  {IResourceFetch} from '../imageknife/resourcemanage/IResourceFetch'
-import {ImageKnifeData,ImageKnifeType} from '../imageknife/ImageKnifeData'
-import {ImageKnifeGlobal} from '../imageknife/ImageKnifeGlobal'
+import { EngineKeyFactories } from "../cache/key/EngineKeyFactories"
+import { EngineKeyInterface } from "../cache/key/EngineKeyInterface"
+import { RequestOption } from "../imageknife/RequestOption"
+import { AsyncCallback } from "../imageknife/interface/AsyncCallback"
+import { PlaceHolderManager } from "../imageknife/holder/PlaceHolderManager"
+import { RetryHolderManager } from "../imageknife/holder/RetryHolderManager"
+import { ErrorHolderManager } from "../imageknife/holder/ErrorHolderManager"
+import { RequestManager } from "../imageknife/requestmanage/RequestManager"
+import { NONE } from "../cache/diskstrategy/enum/NONE"
+import { FileTypeUtil } from '../imageknife/utils/FileTypeUtil'
+import { DownloadClient } from '../imageknife/networkmanage/DownloadClient'
+import { IDataFetch } from '../imageknife/networkmanage/IDataFetch'
+import { ParseResClient } from '../imageknife/resourcemanage/ParseResClient'
+import { IResourceFetch } from '../imageknife/resourcemanage/IResourceFetch'
+import { ImageKnifeData, ImageKnifeType } from '../imageknife/ImageKnifeData'
+import { ImageKnifeGlobal } from '../imageknife/ImageKnifeGlobal'
 import image from "@ohos.multimedia.image"
-import {CompressBuilder} from "../imageknife/compress/CompressBuilder"
+import { CompressBuilder } from "../imageknife/compress/CompressBuilder"
 import { IDrawLifeCycle } from '../imageknife/interface/IDrawLifeCycle'
-import {LogUtil} from '../imageknife/utils/LogUtil'
+import { LogUtil } from '../imageknife/utils/LogUtil'
+import { EasyLinkedHashMap } from './utils/base/EasyLinkedHashMap'
+import { MethodMutex } from './utils/base/MethodMutex'
 import worker from '@ohos.worker'
 import common from '@ohos.app.ability.common'
+import HashMap from '@ohos.util.HashMap'
+import LinkedList from '@ohos.util.LinkedList'
 
 export class ImageKnife {
   static readonly SEPARATOR: string = '/'
-
-   memoryCache: LruCache<string, ImageKnifeData>;
-   diskMemoryCache: DiskLruCache;
-   dataFetch: IDataFetch;
-   resourceFetch: IResourceFetch<ArrayBuffer>;
-   filesPath: string = ""; // data/data/包名/files目录
+  memoryCache: LruCache<string, ImageKnifeData>;
+  diskMemoryCache: DiskLruCache;
+  dataFetch: IDataFetch;
+  resourceFetch: IResourceFetch<ArrayBuffer>;
+  filesPath: string = ""; // data/data/包名/files目录
 
 
-   placeholderCache: string = "placeholderCache"
-   runningRequest: Array<RequestOption>;
-   pendingRequest: Array<RequestOption>;
-   fileTypeUtil: FileTypeUtil; // 通用文件格式辨别
-   diskCacheFolder: string = "ImageKnifeDiskCache"
-
-
-   defaultListener: AsyncCallback<ImageKnifeData> =  {
-    callback:(err: string, data: ImageKnifeData)=>{return false}
+  placeholderCache: string = "placeholderCache"
+  runningMaps: EasyLinkedHashMap<string, RequestOption>;
+  pendingMaps: EasyLinkedHashMap<string, RequestOption>;
+  pausedMaps: EasyLinkedHashMap<string, RequestOption>;
+  isPaused: boolean = false;
+  mutex: MethodMutex = new MethodMutex();
+  fileTypeUtil: FileTypeUtil; // 通用文件格式辨别
+  diskCacheFolder: string = "ImageKnifeDiskCache"
+  defaultListener: AsyncCallback<ImageKnifeData> = {
+    callback: (err: string, data: ImageKnifeData) => {
+      return false
+    }
   }; // 全局监听器
 
   // gifWorker
-   gifWorker: worker.ThreadWorker|undefined = undefined;
-
-   defaultLifeCycle: IDrawLifeCycle|undefined = undefined;
-
+  gifWorker: worker.ThreadWorker | undefined = undefined;
+  defaultLifeCycle: IDrawLifeCycle | undefined = undefined;
   // 开发者可配置全局缓存
-   engineKeyImpl: EngineKeyInterface;
+  engineKeyImpl: EngineKeyInterface;
 
   private constructor() {
 
+    this.runningMaps = new EasyLinkedHashMap();
+    this.pendingMaps = new EasyLinkedHashMap();
+    this.pausedMaps = new EasyLinkedHashMap();
+
     // 构造方法传入size 为保存文件个数
     this.memoryCache = new LruCache<string, ImageKnifeData>(100);
 
@@ -84,22 +92,21 @@ export class ImageKnife {
     // 初始化本地 文件保存
     this.filesPath = (ImageKnifeGlobal.getInstance().getHapContext() as common.UIAbilityContext).filesDir as string;
 
-    this.runningRequest = new Array();
-    this.pendingRequest = new Array();
-
     // 通用文件格式识别初始化
     this.fileTypeUtil = new FileTypeUtil();
 
     this.engineKeyImpl = new EngineKeyFactories();
+
+
   }
 
-  getMemoryCache(): LruCache<string, ImageKnifeData>{
+  getMemoryCache(): LruCache<string, ImageKnifeData> {
     return this.memoryCache;
   }
 
-  public static with(context:Object): ImageKnifeGlobal{
+  public static with(context: Object): ImageKnifeGlobal {
     // 存入hapContext;
-    let global:ImageKnifeGlobal = ImageKnifeGlobal.getInstance();
+    let global: ImageKnifeGlobal = ImageKnifeGlobal.getInstance();
     global.setHapContext(context)
 
     // 初始化ImageKnife
@@ -113,7 +120,7 @@ export class ImageKnife {
     return global;
   }
 
-  getDiskMemoryCache(): DiskLruCache{
+  getDiskMemoryCache(): DiskLruCache {
     return this.diskMemoryCache;
   };
 
@@ -121,7 +128,7 @@ export class ImageKnife {
     this.diskMemoryCache = diskLruCache;
   };
 
-  getFileTypeUtil(): FileTypeUtil{
+  getFileTypeUtil(): FileTypeUtil {
     return this.fileTypeUtil;
   }
 
@@ -137,22 +144,23 @@ export class ImageKnife {
     return this.defaultListener;
   }
 
-  setGifWorker(worker:worker.ThreadWorker){
+  setGifWorker(worker: worker.ThreadWorker) {
     this.gifWorker = worker
   }
-  getGifWorker(){
+
+  getGifWorker() {
     return this.gifWorker;
   }
 
-  getDefaultLifeCycle(){
+  getDefaultLifeCycle() {
     return this.defaultLifeCycle;
   }
 
-  setDefaultLifeCycle(viewLifeCycle:IDrawLifeCycle){
+  setDefaultLifeCycle(viewLifeCycle: IDrawLifeCycle) {
     this.defaultLifeCycle = viewLifeCycle;
   }
 
-  setEngineKeyImpl(impl:EngineKeyInterface){
+  setEngineKeyImpl(impl: EngineKeyInterface) {
     this.engineKeyImpl = impl;
   }
 
@@ -162,34 +170,34 @@ export class ImageKnife {
     this.defaultListener = newDefaultListener;
   }
 
-  public compressBuilder(): CompressBuilder{
+  public compressBuilder(): CompressBuilder {
     return new CompressBuilder();
   }
 
   // 替代原来的LruCache
-  public replaceLruCache(size:number){
-    if(this.memoryCache.map.size() <= 0) {
+  public replaceLruCache(size: number) {
+    if (this.memoryCache.map.size() <= 0) {
       this.memoryCache = new LruCache<string, ImageKnifeData>(size);
-    }else{
+    } else {
       let newLruCache = new LruCache<string, ImageKnifeData>(size);
-      this.memoryCache.foreachLruCache( (value:ImageKnifeData, key:string, map:Object)=> {
+      this.memoryCache.foreachLruCache((value: ImageKnifeData, key: string, map: Object) => {
         newLruCache.put(key, value);
       })
       this.memoryCache = newLruCache;
     }
   }
 
-  public replaceDataFetch(fetch:IDataFetch){
+  public replaceDataFetch(fetch: IDataFetch) {
     this.dataFetch = fetch;
   }
 
   // 替代原来的DiskLruCache
-  public replaceDiskLruCache(size:number) {
+  public replaceDiskLruCache(size: number) {
     if (this.diskMemoryCache.getCacheMap().size() <= 0) {
       this.diskMemoryCache = DiskLruCache.create(ImageKnifeGlobal.getInstance().getHapContext(), size);
     } else {
       let newDiskLruCache = DiskLruCache.create(ImageKnifeGlobal.getInstance().getHapContext(), size);
-      this.diskMemoryCache.foreachDiskLruCache( (value:string|ArrayBuffer, key:string, map:Object)=> {
+      this.diskMemoryCache.foreachDiskLruCache((value: string | ArrayBuffer, key: string, map: Object) => {
         newDiskLruCache.set(key, value);
       })
       this.diskMemoryCache = newDiskLruCache;
@@ -197,17 +205,74 @@ export class ImageKnife {
   }
 
   // 预加载 resource资源一级缓存，string资源实现二级缓存
-  preload(request: RequestOption):void {
+  preload(request: RequestOption): void {
     // 每个request 公共信息补充
     request.setFilesPath(this.filesPath);
-
     return this.parseSource(request);
   }
 
+  // 暂停所有请求
+  async pauseRequests(): Promise<void> {
+    await this.mutex.lock(async () => {
+      this.isPaused = true;
+
+      // 将未删除的所有request [run pend] 放入 [pause]
+      this.pausedMaps.clear()
+      console.log('dodo pauseRequests start1 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + '  pendMaps Size=' + this.pendingMaps.size())
+
+      // 将run存入pause
+      let runNode = this.runningMaps.getHead();
+      while (runNode) {
+        let request = runNode.value;
+        this.pausedMaps.put(request.uuid, request)
+        runNode = runNode.next;
+      }
+      this.runningMaps.clear();
+      console.log('dodo pauseRequests start2 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + '  pendMaps Size=' + this.pendingMaps.size())
+
+      let pendNode = this.pendingMaps.getHead();
+      while (pendNode) {
+        let request = pendNode.value;
+        this.pausedMaps.put(request.uuid, request)
+        pendNode = pendNode.next
+      }
+      this.pendingMaps.clear()
+      console.log('dodo pauseRequests start3 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + '  pendMaps Size=' + this.pendingMaps.size())
+    })
+  }
+
+
+  async resumeRequest(): Promise<void> {
+    await this.mutex.lock(async () => {
+      this.isPaused = false;
+      console.log('dodo resumeRequest start1 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + '  pendMaps Size=' + this.pendingMaps.size())
+      // 重启了之后需要把paused 里面的所有request重新发送
+      let headNode = this.pausedMaps.getHead();
+      while (headNode) {
+        let request = headNode.value
+        this.loadCacheManager(request)
+        headNode = headNode.next
+      }
+      this.pausedMaps.clear()
+      console.log('dodo resumeRequest start1 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + '  pendMaps Size=' + this.pendingMaps.size())
+    })
+  }
+
+  // 删除 请求
+  remove(uuid: string) {
+    if (this.isPaused) {
+      this.pausedMaps.remove(uuid)
+    } else {
+      // TODO 哪些请求可以删除
+      this.pendingMaps.remove(uuid)
+      this.runningMaps.remove(uuid)
+    }
+  }
+
   // 正常加载
-  call(request: RequestOption):void {
+  call(request: RequestOption): void {
     // 添加全局监听
-    if(this.defaultListener) {
+    if (this.defaultListener) {
       request.addListener(this.defaultListener)
     }
 
@@ -231,28 +296,28 @@ export class ImageKnife {
   }
 
   loadResources(request: RequestOption) {
-    let factories:EngineKeyInterface;
-    let cacheKey:string;
-    let transferKey:string;
-    let dataKey:string;
-    if(this.engineKeyImpl){
+    let factories: EngineKeyInterface;
+    let cacheKey: string;
+    let transferKey: string;
+    let dataKey: string;
+    if (this.engineKeyImpl) {
       factories = this.engineKeyImpl;
-    }else {
+    } else {
       factories = new EngineKeyFactories();
     }
     // 生成内存缓存key 内存 变换后磁盘
 
     let loadKey = '';
-    if(typeof request.loadSrc == 'string'){
+    if (typeof request.loadSrc == 'string') {
       loadKey = request.loadSrc;
-    }else{
+    } else {
       loadKey = JSON.stringify(request.loadSrc);
     }
 
     let size = JSON.stringify(request.size);
 
     let transformed = '';
-    if(request && request.transformations) {
+    if (request && request.transformations) {
       for (let i = 0; i < request.transformations.length; i++) {
         if (i == request.transformations.length - 1) {
           transformed += request.transformations[i].getName() + "";
@@ -289,120 +354,133 @@ export class ImageKnife {
 
   // 删除执行结束的running
   removeRunning(request: RequestOption) {
-    let index = -1;
-    for (let i = 0; i < this.runningRequest.length; i++) {
-      let tempRunning = this.runningRequest[i];
-      if (this.keyEqual(request, tempRunning)) {
-        // 如果key相同 说明找到执行的request，我们记录下当前request的index位置
-        index = i;
-        break;
-      }
-    }
-    if (index >= 0) {
-      let request = this.runningRequest.splice(index, 1)[0];
-      this.loadNextPending(request);
+    if (this.isPaused) {
+
+    } else {
+      this.runningMaps.remove(request.uuid);
+      console.log('dodo runningMaps length =' + this.runningMaps.size())
+      let previousRequest = request;
+      this.loadNextPending(previousRequest);
     }
   }
 
   // 执行相同key的pending队列请求
-  keyEqualPendingToRun(index:number){
-    let nextPending = this.pendingRequest.splice(index, 1)[0];
-    this.runningRequest.push(nextPending)
+  private keyEqualPendingToRun(nextPending: RequestOption) {
+    // let nextPending = this.pendingRequest.splice(index, 1)[0];
+    // this.runningRequest.push(nextPending)
+    // RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
+
+    this.pendingMaps.remove(nextPending.uuid)
+    this.runningMaps.put(nextPending.uuid, nextPending);
+
     RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
+
   }
 
-  searchNextKeyToRun(){
+  private searchNextKeyToRun() {
     // 其次则寻找pending中第一个和running不重复的requestOrKey
-    let index2 = -1;
-    for (let i = 0; i < this.pendingRequest.length; i++) {
-      let temppending = this.pendingRequest[i];
-      let hasKeyEqual = false;
-      for (let j = 0; j < this.runningRequest.length; j++) {
-        let temprunning = this.runningRequest[j];
-        if (this.requestOrKeyEqual(temppending, temprunning)) {
-          hasKeyEqual = true;
-          break;
+    let pendingTailNode = this.pendingMaps.getTail();
+    while (pendingTailNode) {
+      let pendingRequest = pendingTailNode.value;
+      let hasEqual = false;
+      let runningTailNode = this.runningMaps.getTail();
+      while (runningTailNode) {
+        let runningRequest = runningTailNode.value;
+        if (this.requestOrKeyEqual(pendingRequest, runningRequest)) {
+          hasEqual = true;
+          break
         }
+        runningTailNode = runningTailNode.prev;
       }
-      if (!hasKeyEqual) {
-        index2 = i;
+
+      if (hasEqual) {
         break;
       }
+      pendingTailNode = pendingTailNode.prev;
     }
-    if (index2 >= 0) {
-      let nextPending = this.pendingRequest.splice(index2, 1)[0];
-      this.runningRequest.push(nextPending)
+
+    if (pendingTailNode != null && pendingTailNode.value != null) {
+      let nextPending = pendingTailNode.value;
+      this.runningMaps.put(nextPending.uuid, nextPending)
+      this.pendingMaps.remove(nextPending.uuid)
       RequestManager.execute((nextPending as RequestOption), this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
-    } else {
-      // 不执行
     }
   }
 
 
   // 加载下一个key的请求
-  loadNextPending(request:RequestOption) {
-    // 首先寻找被移除key相同的request
-    let index = -1;
-    for (let i = 0; i < this.pendingRequest.length; i++) {
-      let temppending = this.pendingRequest[i];
-      if (this.requestOrKeyEqual(request, temppending)) {
-        // 如果key相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning
-        index = i;
+  private loadNextPending(request: RequestOption) {
+    let hasEqualRunning = false;
+    let tailNode = this.pendingMaps.getTail();
+    while (tailNode) {
+      if (this.requestOrKeyEqual(request, tailNode.value)) {
+        hasEqualRunning = true;
         break;
       }
+      tailNode = tailNode.prev;
     }
-    if (index >= 0) {
-      this.keyEqualPendingToRun(index);
+
+    if (hasEqualRunning) {
+      this.keyEqualPendingToRun(tailNode.value);
     } else {
       this.searchNextKeyToRun();
     }
   }
 
   // 启动新线程 去磁盘取 去网络取
-  loadCacheManager(request: RequestOption) {
-    if (this.keyNotEmpty(request)) {
-      let hasRunningRequest = false;
-      for (let i = 0; i < this.runningRequest.length; i++) {
-        let tempRunning = this.runningRequest[i];
-        if (this.requestOrKeyEqual(request, tempRunning)) {
+  private loadCacheManager(request: RequestOption) {
+    if (this.isPaused) {
+      // 将当前request存入pausedMaps
+      this.pausedMaps.put(request.uuid, request);
+    } else {
+      // 正常逻辑
+      if (this.keyNotEmpty(request)) {
+        let hasRunningRequest = false;
+        // 遍历双向链表 从尾巴到头
+        let tailNode = this.runningMaps.getTail();
+        while (tailNode) {
+          if (this.requestOrKeyEqual(request, tailNode.value)) {
+            hasRunningRequest = true;
+            break;
+          }
+          tailNode = tailNode.prev
+        }
 
-          // 如果requestOrKey相同 说明目前有任务正在执行，我们记录下当前request 放入pendingRunning
-          hasRunningRequest = true;
-          break;
+        if (hasRunningRequest) {
+          this.pendingMaps.put(request.uuid, request);
+
+          // this.pendingRequest.push(request);
+        } else {
+          this.runningMaps.put(request.uuid, request)
+
+          // this.runningRequest.push(request);
+          // 不存在相同key的 任务可以并行
+          RequestManager.execute(request, this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
         }
       }
-      if (hasRunningRequest) {
-        this.pendingRequest.push(request);
-      } else {
-        this.runningRequest.push(request);
-        // 不存在相同key的 任务可以并行
-        RequestManager.execute(request, this.memoryCache, this.diskMemoryCache, this.dataFetch, this.resourceFetch)
+      else {
+        LogUtil.log("key没有生成无法进入存取！")
       }
     }
-    else {
-      LogUtil.log("key没有生成无法进入存取！")
-    }
-
-
   }
 
-  private keyNotEmpty(request: RequestOption): boolean{
+  private keyNotEmpty(request: RequestOption): boolean {
     if (
       request.generateCacheKey != null && request.generateCacheKey.length > 0 &&
-      request.generateDataKey != null && request.generateDataKey.length > 0 &&
-      request.generateResourceKey != null && request.generateResourceKey.length > 0
+        request.generateDataKey != null && request.generateDataKey.length > 0 &&
+        request.generateResourceKey != null && request.generateResourceKey.length > 0
     ) {
       return true;
     }
     return false;
   }
 
-  private keyEqual(request1: RequestOption, request2: RequestOption): boolean{
+  private keyEqual(request1: RequestOption, request2: RequestOption): boolean {
     // key 完全相等的情况
     if (
       request1.generateCacheKey == request2.generateCacheKey &&
-      request1.generateResourceKey == request2.generateResourceKey &&
-      request1.generateDataKey == request2.generateDataKey
+        request1.generateResourceKey == request2.generateResourceKey &&
+        request1.generateDataKey == request2.generateDataKey
     ) {
       return true;
     }
@@ -411,18 +489,18 @@ export class ImageKnife {
   }
 
   // 非严格校验模式,如果所有key相等我们认为一定相等, 如果请求类型是string 网络请求url或者uri相等 我们也认为该请求应该只发送一个即可,后续请求会去缓存或者磁盘读取
-  private requestOrKeyEqual(request1: RequestOption, request2: RequestOption): boolean{
+  private requestOrKeyEqual(request1: RequestOption, request2: RequestOption): boolean {
     // key 完全相等的情况
     if (
       request1.generateCacheKey == request2.generateCacheKey &&
-      request1.generateResourceKey == request2.generateResourceKey &&
-      request1.generateDataKey == request2.generateDataKey
+        request1.generateResourceKey == request2.generateResourceKey &&
+        request1.generateDataKey == request2.generateDataKey
     ) {
       return true;
     }
 
     // 如果加载的是网络url或者是本地文件uri读取,那么loadSrc相同就认为是同一个请求
-    if(
+    if (
       typeof request1.loadSrc == 'string' && typeof request2.loadSrc == 'string' && request1.loadSrc == request2.loadSrc
     ) {
       return true;
@@ -431,7 +509,7 @@ export class ImageKnife {
     return false;
   }
 
-  parseSource(request: RequestOption):void {
+  private parseSource(request: RequestOption): void {
     if ((typeof (request.loadSrc as image.PixelMap).isEditable) == 'boolean') {
       let imageKnifeData = ImageKnifeData.createImagePixelMap(ImageKnifeType.PIXELMAP, request.loadSrc as PixelMap)
       request.loadComplete(imageKnifeData);
diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets
index ff291ce..6516eb9 100644
--- a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets
+++ b/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets
@@ -16,7 +16,7 @@
 import { ImageKnifeOption } from '../imageknife/ImageKnifeOption'
 import { ImageKnifeGlobal } from '../imageknife/ImageKnifeGlobal'
 import { TransformType } from '../imageknife/transform/TransformType'
-import { RequestOption, Size } from '../imageknife/RequestOption'
+import { DetachFromLayout, RequestOption, Size } from '../imageknife/RequestOption'
 import { ImageKnifeData } from '../imageknife/ImageKnifeData'
 import { GIFFrame } from '../imageknife/utils/gif/GIFFrame'
 import { IDrawLifeCycle } from '../imageknife/interface/IDrawLifeCycle'
@@ -82,6 +82,8 @@ export struct ImageKnifeComponent {
   private onReadyNext?: (data:ImageKnifeData|number|undefined) => void = undefined
   private onReadyNextData:ImageKnifeData|number|undefined = undefined
 
+  private  detachFromLayout:DetachFromLayout;
+
   build() {
     Canvas(this.context)
       .width('100%')
@@ -275,6 +277,7 @@ export struct ImageKnifeComponent {
     }
     this.resetGifData()
     let request = new RequestOption();
+    this.detachFromLayout = request.detachFromLayout;
     this.configNecessary(request);
     this.configCacheStrategy(request);
     this.configDisplay(request);
@@ -421,7 +424,7 @@ export struct ImageKnifeComponent {
 
   drawPlaceholder(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) {
     LogUtil.log('ImageKnifeComponent default drawPlaceholder start!')
-      
+
     data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => {
       LogUtil.log('ImageKnifeComponent imageinfo widht =' + imageInfo.size.width + ' height=' + imageInfo.size.height)
       let scaleType = (typeof imageKnifeOption.placeholderScaleType == 'number') ? imageKnifeOption.placeholderScaleType : ScaleType.FIT_CENTER
@@ -476,7 +479,7 @@ export struct ImageKnifeComponent {
 
   drawThumbSizeMultiplier(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) {
     LogUtil.log('ImageKnifeComponent default drawThumbSizeMultiplier start!')
-      
+
     data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => {
       LogUtil.log('ImageKnifeComponent imageinfo widht =' + imageInfo.size.width + ' height=' + imageInfo.size.height)
       let scaleType = (typeof imageKnifeOption.thumbSizeMultiplierScaleType == 'number') ? imageKnifeOption.thumbSizeMultiplierScaleType : ScaleType.FIT_CENTER
@@ -491,7 +494,7 @@ export struct ImageKnifeComponent {
   drawMainSource(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) {
     LogUtil.log('ImageKnifeComponent default drawMainSource start!')
     if (data.isPixelMap()) {
-        
+
       data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => {
         let scaleType = (typeof imageKnifeOption.mainScaleType == 'number') ? imageKnifeOption.mainScaleType : ScaleType.FIT_CENTER
         LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height + 'scaleType=' + scaleType)
@@ -508,7 +511,7 @@ export struct ImageKnifeComponent {
 
   drawRetryholder(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) {
     LogUtil.log('ImageKnifeComponent default drawRetryholder start!')
-      
+
     data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => {
       LogUtil.log('ImageKnifeComponent imageinfo width =' + imageInfo.size.width + ' height=' + imageInfo.size.height)
       let scaleType = (typeof imageKnifeOption.retryholderScaleType == 'number') ? imageKnifeOption.retryholderScaleType : ScaleType.FIT_CENTER
@@ -522,7 +525,7 @@ export struct ImageKnifeComponent {
 
   drawErrorholder(context: CanvasRenderingContext2D, data: ImageKnifeData, imageKnifeOption: ImageKnifeOption, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void) {
     LogUtil.log('ImageKnifeComponent default drawErrorholder start!')
-      
+
     data.drawPixelMap?.imagePixelMap?.getImageInfo().then((imageInfo) => {
       LogUtil.log('ImageKnifeComponent imageinfo widht =' + imageInfo.size.width + ' height=' + imageInfo.size.height)
       let scaleType = (typeof imageKnifeOption.errorholderSrcScaleType == 'number') ? imageKnifeOption.errorholderSrcScaleType : ScaleType.FIT_CENTER
@@ -584,6 +587,10 @@ export struct ImageKnifeComponent {
 
   aboutToDisappear() {
     LogUtil.log('ImageKnifeComponent aboutToDisappear happened!')
+    if(this.detachFromLayout){
+      this.detachFromLayout.detach();
+    }
+
     this.resetGifData();
   }
 
@@ -601,7 +608,7 @@ export struct ImageKnifeComponent {
   }
 
   private drawLifeCycleHasConsumed<K, T>( methodName: string,
-                                         context: CanvasRenderingContext2D, data: K, imageKnifeOption: T, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void,drawLifeCycle?: IDrawLifeCycle
+                                          context: CanvasRenderingContext2D, data: K, imageKnifeOption: T, compWidth: number, compHeight: number, setGifTimeId?: (timeId: number) => void,drawLifeCycle?: IDrawLifeCycle
   ):boolean {
     if (drawLifeCycle && (drawLifeCycle as Record<string,Function>)[methodName]) {
       return (drawLifeCycle as Record<string,Function>)[methodName](context, data, imageKnifeOption, compWidth, compHeight, setGifTimeId)
@@ -677,7 +684,7 @@ export struct ImageKnifeComponent {
       // 理论上该帧在屏幕上保留的时间
       let stayTime:number= 0
       if(this.renderFrames_frames != undefined) {
-         stayTime = this.renderFrames_frames[this.renderFrames_index].delay;
+        stayTime = this.renderFrames_frames[this.renderFrames_index].delay;
       }
       if (this.imageKnifeOption.gif && this.imageKnifeOption.gif.speedFactory) {
         stayTime = stayTime / (this.imageKnifeOption.gif?.speedFactory * 1.0);
@@ -706,9 +713,9 @@ export struct ImageKnifeComponent {
   }
 
   private drawFrame(frames: GIFFrame[]|undefined, index: number, context: CanvasRenderingContext2D|undefined, compWidth: number, compHeight: number) {
-     if(frames == undefined){
-       return
-     }
+    if(frames == undefined){
+      return
+    }
     // get current frame
     let frame = frames[index];
     if (!frame || !context) {
@@ -848,9 +855,9 @@ export class ScaleTypeHelper {
     let dy:number = (compHeight - imageHeight * minScale) / (minScale * 1.0);
     let dw:number = imageWidth;
     let dh:number = imageHeight;
-  if(source!= undefined) {
-    context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
-  }
+    if(source!= undefined) {
+      context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
+    }
   }
 
   static drawFitCenter(context: CanvasRenderingContext2D, source: PixelMap | undefined, minScale: number, imageWidth: number, imageHeight: number, compWidth: number, compHeight: number, imageOffsetX?: number, imageOffsetY?: number) {
@@ -859,9 +866,9 @@ export class ScaleTypeHelper {
     let dy:number = (compHeight - imageHeight * minScale) / (minScale * 2.0);
     let dw:number = imageWidth;
     let dh:number = imageHeight;
-  if(source!= undefined) {
-    context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
-  }
+    if(source!= undefined) {
+      context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
+    }
   }
 
   static drawCenter(context: CanvasRenderingContext2D, source: PixelMap | undefined, imageWidth: number, imageHeight: number, compWidth: number, compHeight: number, imageOffsetX?: number, imageOffsetY?: number) {
@@ -869,9 +876,9 @@ export class ScaleTypeHelper {
     let dy:number = (compHeight - imageHeight) / 2.0;
     let dw:number = imageWidth;
     let dh:number = imageHeight;
-     if(source!= undefined) {
-       context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
-     }
+    if(source!= undefined) {
+      context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
+    }
   }
 
   static drawCenterCrop(context: CanvasRenderingContext2D, source: PixelMap | undefined, maxScale: number, imageWidth: number, imageHeight: number, compWidth: number, compHeight: number, imageOffsetX?: number, imageOffsetY?: number) {
@@ -880,9 +887,9 @@ export class ScaleTypeHelper {
     let dy:number = (compHeight - imageHeight * maxScale) / (maxScale * 2.0);
     let dw:number = imageWidth;
     let dh:number = imageHeight;
-  if(source!= undefined) {
-    context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
-  }
+    if(source!= undefined) {
+      context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
+    }
   }
 
   static drawFitXY(context: CanvasRenderingContext2D, source: PixelMap | undefined, scaleW: number, scaleH: number, imageWidth: number, imageHeight: number, imageOffsetX?: number, imageOffsetY?: number) {
@@ -891,9 +898,9 @@ export class ScaleTypeHelper {
     let dy:number = 0;
     let dw:number = imageWidth;
     let dh:number = imageHeight;
-     if(source!= undefined) {
-       context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
-     }
+    if(source!= undefined) {
+      context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
+    }
   }
 
   static drawCenterInside(context: CanvasRenderingContext2D, source: PixelMap | undefined, minScale: number, imageWidth: number, imageHeight: number, compWidth: number, compHeight: number, imageOffsetX?: number, imageOffsetY?: number) {
@@ -912,7 +919,7 @@ export class ScaleTypeHelper {
     if(source!= undefined) {
       context.drawImage(source, dx + (imageOffsetX != undefined ? imageOffsetX : 0), dy + (imageOffsetY != undefined ? imageOffsetY : 0))
     }
-    }
+  }
 }
 
 
diff --git a/imageknife/src/main/ets/components/imageknife/RequestOption.ets b/imageknife/src/main/ets/components/imageknife/RequestOption.ets
index 14665ef..5daad2b 100644
--- a/imageknife/src/main/ets/components/imageknife/RequestOption.ets
+++ b/imageknife/src/main/ets/components/imageknife/RequestOption.ets
@@ -54,7 +54,12 @@ export interface Size {
   width: number,
   height: number
 }
+export interface DetachFromLayout{
+  detach:()=>void
+}
+
 export class RequestOption {
+  uuid:string ='' // 唯一标识
   loadSrc: string | PixelMap | Resource = '';
   strategy: DiskStrategy = new AUTOMATIC();
   dontAnimateFlag = false;
@@ -117,11 +122,30 @@ export class RequestOption {
   // 缩略图展示
   loadThumbnailReady = false;
 
-
+  detachFromLayout:DetachFromLayout = {
+    detach: ()=>{
+      let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife();
+      if(imageKnife != undefined) {
+        imageKnife.remove(this.uuid);
+      }
+    }
+  }
 
   constructor() {
     // 初始化全局监听
     this.requestListeners = new Array();
+    // 初始化唯一标识,可以用这个标识找到ImageKnife中的对象
+    this.uuid = this.generateUUID();
+  }
+
+  generateUUID(): string {
+    let d = new Date().getTime();
+    const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+      const r = (d + Math.random() * 16) % 16 | 0;
+      d = Math.floor(d / 16);
+      return (c === 'x' ? r : (r & 0x3 | 0x8)).toString(16);
+    });
+    return uuid;
   }
 
   /**
@@ -149,8 +173,6 @@ export class RequestOption {
     this.cachesPath = path;
   }
 
-
-
   load(src: string | PixelMap | Resource) {
     this.loadSrc = src;
     return this;
@@ -489,15 +511,15 @@ export class RequestOption {
       // 非落盘情况,直接进行寻找下一个加载
       let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife();
       if(imageKnife != undefined) {
-         imageKnife.removeRunning(this);
+        imageKnife.removeRunning(this);
       }
     }
 
-    // 加载成功之后
-    let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife();
-    if(imageKnife != undefined) {
-      imageKnife.removeRunning(this);
-    }
+    // // 加载成功之后
+    // let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife();
+    // if(imageKnife != undefined) {
+    //   imageKnife.removeRunning(this);
+    // }
   }
 
   // 图片文件落盘之后会自动去寻找下一个数据加载
diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets
index 820073b..1615075 100644
--- a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets
+++ b/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets
@@ -15,7 +15,8 @@
 
 import  { IDataFetch } from '../networkmanage/IDataFetch'
 import { RequestOption } from '../RequestOption'
-import { NetworkDownloadClient } from './NetworkDownloadClient'
+
+import { HttpDownloadClient } from './HttpDownloadClient'
 import { LoadLocalFileClient } from './LoadLocalFileClient'
 import { LoadDataShareFileClient } from './LoadDataShareFileClient'
 import loadRequest from '@ohos.request';
@@ -24,7 +25,7 @@ import common from '@ohos.app.ability.common'
 
 // 数据加载器
 export class DownloadClient implements IDataFetch {
-  private networkClient = new NetworkDownloadClient();
+  private httpDownloadClient = new HttpDownloadClient();
   private localFileClient = new LoadLocalFileClient();
   private dataShareFileClient = new LoadDataShareFileClient();
 
@@ -41,7 +42,7 @@ export class DownloadClient implements IDataFetch {
         this.dataShareFileClient.loadData(request, onCompleteFunction, onErrorFunction)
       } else {
         // 网络下载
-        this.networkClient.loadData(request, onCompleteFunction, onErrorFunction)
+        this.httpDownloadClient.loadData(request, onCompleteFunction, onErrorFunction)
       }
     }
   }
diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets
new file mode 100644
index 0000000..0551f72
--- /dev/null
+++ b/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets
@@ -0,0 +1,113 @@
+/*
+ * 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.
+ */
+
+import  { IDataFetch } from '../networkmanage/IDataFetch'
+import { RequestOption } from '../RequestOption'
+import { SparkMD5 } from '../../3rd_party/sparkmd5/spark-md5'
+import { FileUtils } from '../../cache/FileUtils'
+import loadRequest from '@ohos.request';
+import { LogUtil } from '../utils/LogUtil'
+import { ImageKnifeGlobal } from '../ImageKnifeGlobal'
+import common from '@ohos.app.ability.common'
+import { BusinessError } from '@ohos.base'
+import http from '@ohos.net.http'
+// 数据加载器
+class RequestData{
+  receiveSize: number = 2000
+  totalSize: number = 2000
+}
+
+export class HttpDownloadClient implements IDataFetch {
+  loadData(request: RequestOption, onComplete: (img: ArrayBuffer) => void, onError: (err: string) => void) {
+    try {
+      let httpRequest = http.createHttp()
+      let arrayBuffers = new Array();
+      httpRequest.on('headersReceive', (header: Object) => {
+        // 跟服务器连接成功准备下载
+        if (request.progressFunc) {
+          // 进度条为0
+          request.progressFunc.asyncSuccess(0)
+        }
+      })
+      httpRequest.on('dataReceive', (data: ArrayBuffer) => {
+        // 下载数据流多次返回
+        arrayBuffers.push(data);
+      })
+
+      httpRequest.on('dataReceiveProgress', (data: RequestData) => {
+        // 下载进度
+        let percent = Math.round(((data.receiveSize * 1.0) / (data.totalSize * 1.0)) * 100)
+        if (request.progressFunc) {
+          request.progressFunc.asyncSuccess(percent)
+        }
+      })
+
+      httpRequest.on('dataEnd', () => {
+        // 下载完毕
+        let combineArray = this.combineArrayBuffers(arrayBuffers);
+        onComplete(combineArray)
+      })
+
+      httpRequest.requestInStream(
+        request.loadSrc as string,
+        {
+          method: http.RequestMethod.GET,
+          expectDataType: http.HttpDataType.ARRAY_BUFFER,
+          connectTimeout: 60000, // 可选 默认60000ms
+          readTimeout: 0, //可选, 默认为60000ms
+          usingProtocol: http.HttpProtocol.HTTP1_1, // 可选,协议类型默认值由系统自动指定
+        },
+        (err: BusinessError, data: number) => {
+          if (!err && data == 200) {
+
+          } else {
+            httpRequest.off('headersReceive');
+            httpRequest.off('dataReceive');
+            httpRequest.off('dataReceiveProgress');
+            httpRequest.off('dataEnd');
+            httpRequest.destroy()
+            onError('HttpDownloadClient err message =' + err.message)
+          }
+        }
+      )
+    } catch (err) {
+      onError('HttpDownloadClient catch err request uuid ='+request.uuid)
+    }
+  }
+
+  combineArrayBuffers(arrayBuffers: ArrayBuffer[]): ArrayBuffer {
+    // 计算多个ArrayBuffer的总字节大小
+    let totalByteLength = 0;
+    for (const arrayBuffer of arrayBuffers) {
+      totalByteLength += arrayBuffer.byteLength;
+    }
+
+    // 创建一个新的ArrayBuffer
+    const combinedArrayBuffer = new ArrayBuffer(totalByteLength);
+
+    // 创建一个Uint8Array来操作新的ArrayBuffer
+    const combinedUint8Array = new Uint8Array(combinedArrayBuffer);
+
+    // 依次复制每个ArrayBuffer的内容到新的ArrayBuffer中
+    let offset = 0;
+    for (const arrayBuffer of arrayBuffers) {
+      const sourceUint8Array = new Uint8Array(arrayBuffer);
+      combinedUint8Array.set(sourceUint8Array, offset);
+      offset += sourceUint8Array.length;
+    }
+
+    return combinedArrayBuffer;
+  }
+}
\ No newline at end of file
diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets b/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets
index ac20bca..33b41d5 100644
--- a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets
+++ b/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets
@@ -292,6 +292,8 @@ export class RequestManager {
       // 处理磁盘加载 网络加载
       this.runWrapped(this.options, this.mRunReason, onComplete, onError)
     } else {
+      // 需要清理状态
+      cache.waitSaveDisk = false;
       onComplete(cache);
       return
 
diff --git a/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets b/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets
index 21e28c7..51ca851 100644
--- a/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets
+++ b/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets
@@ -12,143 +12,80 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {LogUtil} from '../../imageknife/utils/LogUtil'
+import { LogUtil } from '../../imageknife/utils/LogUtil'
+
+// jpg = 'jpg,0,FFD8',
+// png = 'png,0,89504E470D0A1A0A',
+// bmp = 'bmp,0,424D',
+// gif = 'gif,0,474946383961',
+// svg = 'svg,0,3C3F786D6C',
+// webp = 'webp,0,52494646',
+// tiff = 'tiff,0,492049|49492A00|4D4D002A|4D4D002B'
+
 export class FileTypeUtil {
-  private map:Map<string,string> = new Map<string,string>();
-  private READ_MIN_LENGTH:number = 0;
-  private SUPPORT_FORMATS = [
-    PhotoFormat.jpg,
-    PhotoFormat.png,
-    PhotoFormat.tiff,
-    PhotoFormat.bmp,
-    PhotoFormat.webp,
-    PhotoFormat.svg,
-    PhotoFormat.gif
-  ]
+  private fileSignatureMap: Record<string, Array<Uint8Array>> = {
+    // 添加文件类型和对应的文件头部特征
+    'jpg': [new Uint8Array([0xFF, 0xD8])],
+    'png': [new Uint8Array([0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A])],
+    'gif': [new Uint8Array([0x47, 0x49, 0x46, 0x38, 0x39, 0x61])],
+    'bmp': [new Uint8Array([0x42, 0x4D])],
+    'svg': [new Uint8Array([0x3C, 0x3F, 0x78, 0x6D, 0x6C])],
+    'webp': [new Uint8Array([0x52, 0x49, 0x46, 0x46])],
+    'tiff': [new Uint8Array([0x49, 0x20, 0x49]), new Uint8Array([0x49, 0x49, 0x2A, 0x00]), new Uint8Array([0x4D, 0x4D, 0x00, 0x2A]), new Uint8Array([0x4D, 0x4D, 0x00, 0x2B])],
+    // 添加更多的文件类型和特征
+  };
+
 
   constructor() {
-    this.initImageType();
-
   }
 
-  private getDataViewAt(dataView:DataView,index:number): string{
-    return this.dec2Hex(dataView.getUint8(index))
-  }
-
-
-
-  getFileType(arraybuffer: ArrayBuffer):string {
-    let fileType:string = '';
-    if (arraybuffer == null || arraybuffer == undefined || arraybuffer.byteLength <= this.READ_MIN_LENGTH) {
-      return '';
-    }
-
-    let dataView = new DataView(arraybuffer);
-    LogUtil.log('dataView +'+this.getDataViewAt(dataView,0)+this.getDataViewAt(dataView,1))
-    let entries: IterableIterator<Object[]> = this.map.entries();
-    for (let i = 0; i < this.map.size; i++) {
-      let entry:Object[] = entries.next().value;
-      let key = entry[0] as string
-      let value = entry[1] as string
-      let keySplit = key.split(',')
-      if(keySplit.length == 2){
-        let offset = Number(keySplit[0])
-        let magicStringLength = keySplit[1].length;
-        let readLength = magicStringLength/2;
-        let start = 0;
-        let fileMagic = ''
-        while(start< readLength){
-          fileMagic+=this.getDataViewAt(dataView,offset+start)
-          start++;
-        }
-        if(fileMagic == keySplit[1]){
-          LogUtil.log('匹配到了 fileType='+value)
-          fileType = value
-          break;
-        }
-      }
-    }
-    return fileType;
-  }
-
-  dec2Hex(uint8: number) {
-    let hex = uint8.toString(16);
-    if (hex.length <= 1) {
-      hex = "0" + hex;
-    }
-    return hex.toUpperCase();
-  }
-
-  private initImageType() {
-    if(!this.map){
-      this.map = new Map()
-    }
-    this.SUPPORT_FORMATS.forEach((value,index,arrs)=>{
-      let values = value.split(',')
-      if(values.length == 3){
-        let magicSplits = values[2].split("|")
-        if(magicSplits.length  == 1){
-          this.map.set(values[1]+','+values[2],values[0])
-        }else if(magicSplits.length > 1){
-          for(let i=0; i<magicSplits.length; i++){
-            let magicStr = magicSplits[i];
-            this.map.set(values[1]+','+magicStr,values[0])
-          }
-        }else{
-          // 文件魔数不存在,不处理
-        }
-      }
-    })
-    this.initReadMinLength();
-
-    this.printMapContent();
-  }
-
-  private printMapContent(){
-
-    let entries: IterableIterator<Object[]> = this.map.entries();
-    for (let i = 0; i < this.map.size; i++) {
-      let entry:Object[] = entries.next().value;
-      let key = entry[0] as string
-      let value = entry[1] as string
-      LogUtil.log('key='+key+'---value='+value)
-      }
-  }
-
-    private initReadMinLength(){
-      let max = 0;
-      this.map.forEach((value,key,map)=>{
-        let keySplit = key.split(',');
-        if(keySplit.length == 2){
-          let offset = Number(keySplit[0])
-          let magicStringLength = keySplit[1].length;
-          let tempMax = offset + magicStringLength/2;
-          if(tempMax > max){
-            max = tempMax;
-          }
-        }
-      })
-      this.READ_MIN_LENGTH =max;
-    }
-
-  isImage(arraybuffer:ArrayBuffer){
+  isImage(arraybuffer: ArrayBuffer) {
     let value = this.getFileType(arraybuffer);
-    if(
+    if (
       value == SupportFormat.jpg ||
-      value == SupportFormat.png ||
-      value == SupportFormat.tiff ||
-      value == SupportFormat.webp ||
-      value == SupportFormat.bmp ||
-      value == SupportFormat.gif ||
-      value == SupportFormat.svg
-    ){
+        value == SupportFormat.png ||
+        value == SupportFormat.tiff ||
+        value == SupportFormat.webp ||
+        value == SupportFormat.bmp ||
+        value == SupportFormat.gif ||
+        value == SupportFormat.svg
+    ) {
       return true;
     }
     return false;
   }
 
+  getFileType(file: ArrayBuffer): string | null {
+    const fileData = new Uint8Array(file);
+    for (const fileType in this.fileSignatureMap) {
+      const bufferList = this.fileSignatureMap[fileType];
+      for (let i = 0; i < bufferList.length; i++) {
+        let signature = bufferList[i];
+        if(this.matchesSignature(fileData,signature)){
+          return fileType;
+        }
+      }
+    }
+
+    return null; // 若无法识别文件类型，返回null
+  }
+
+
+  matchesSignature(fileData: Uint8Array, signature: Uint8Array): boolean {
+    if (fileData.length < signature.length) {
+      return false; // 文件长度不足，无法匹配魔数
+    }
+
+    for (let i = 0; i < signature.length; i++) {
+      if (fileData[i] !== signature[i]) {
+        return false; // 魔数不匹配
+      }
+    }
+    return true; // 文件头部魔数匹配
+  }
 }
 
+
 export enum PhotoFormat {
   jpg = 'jpg,0,FFD8',
   png = 'png,0,89504E470D0A1A0A',
diff --git a/imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets b/imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets
new file mode 100644
index 0000000..7f19340
--- /dev/null
+++ b/imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets
@@ -0,0 +1,194 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+
+
+class Node<K, V> {
+  key: K;
+  value: V;
+  next: Node<K, V> | null;
+  prev: Node<K, V> | null;
+
+  constructor(key: K, value: V) {
+    this.key = key;
+    this.value = value;
+    this.next = null;
+    this.prev = null;
+  }
+}
+// 链表的tail是最近访问,head是最晚访问,对顺序有要求需要访问tail
+export class EasyLinkedHashMap<K, V> {
+  private map: Map<K, Node<K, V>>; // 存储键值对的哈希映射
+  private head: Node<K, V> | null; // 链表头节点
+  private tail: Node<K, V> | null; // 链表尾节点
+
+  constructor() {
+    this.map = new Map<K, Node<K, V>>();
+    this.head = null;
+    this.tail = null;
+  }
+
+  // 添加键值对到映射中，并在链表尾部添加新节点
+  put(key: K, value: V) {
+    if (this.map.has(key)) {
+      // 如果键已存在，则更新对应的值
+      const node = this.map.get(key)!;
+      node.value = value;
+      this.moveToTail(node);
+    } else {
+      // 创建新节点并加入链表尾部
+      const newNode = new Node(key, value);
+      this.map.set(key, newNode);
+      if (this.tail) {
+        this.tail.next = newNode;
+        newNode.prev = this.tail;
+        this.tail = newNode;
+      } else {
+        this.head = newNode;
+        this.tail = newNode;
+      }
+    }
+  }
+
+  // 从映射中移除键值对，并从链表中删除对应节点
+  remove(key: K) {
+    if (this.map.has(key)) {
+      const node = this.map.get(key)!;
+      this.map.delete(key);
+      this.removeNode(node);
+    }
+  }
+
+  // 获取键对应的值，并将对应节点移到链表尾部（表示最近访问）
+  get(key: K): V | undefined {
+    if (this.map.has(key)) {
+      const node = this.map.get(key)!;
+      this.moveToTail(node);
+      return node.value;
+    }
+    return undefined;
+  }
+
+  // 将节点移动到链表尾部
+  private moveToTail(node: Node<K, V>) {
+    if (node === this.tail) {
+      return; // 节点已在链表尾部，无需移动
+    }
+
+    if (node === this.head) {
+      this.head = node.next;
+    } else {
+      node.prev!.next = node.next;
+    }
+
+    node.next!.prev = node.prev;
+    this.tail!.next = node;
+    node.prev = this.tail;
+    node.next = null;
+    this.tail = node;
+  }
+
+  // 从链表中删除节点
+  private removeNode(node: Node<K, V>) {
+    if (node === this.head) {
+      this.head = node.next;
+    } else {
+      node.prev!.next = node.next;
+    }
+
+    if (node === this.tail) {
+      this.tail = node.prev;
+    } else {
+      node.next!.prev = node.prev;
+    }
+  }
+
+  // 返回映射中的键值对数量
+  size(): number {
+    return this.map.size;
+  }
+  // 返回顺序双向链表
+  getTail(){
+    return this.tail;
+  }
+
+  getHead(){
+    return this.head;
+  }
+  clear(){
+    this.map.clear()
+    this.head = null;
+    this.tail=null;
+  }
+}
+
+function  testLinkedHashMap(){
+  // 创建一个新的 LinkedHashMap 实例
+  let linkedHashMap = new EasyLinkedHashMap<string, number>();
+
+  // 添加键值对，并验证插入是否正确
+  linkedHashMap.put('key1', 1);
+  linkedHashMap.put('key2', 2);
+  linkedHashMap.put('key3', 3);
+
+  console.log('dodo '+linkedHashMap.get('key1')); // 1
+  console.log('dodo '+linkedHashMap.get('key2')); // 2
+  console.log('dodo '+linkedHashMap.get('key3')); // 3
+
+  // 验证键值对更新是否正确
+  linkedHashMap.put('key2', 20);
+  console.log('dodo '+linkedHashMap.get('key2')); // 20
+
+  // 验证移除键值对是否正确
+  linkedHashMap.remove('key1');
+  console.log('dodo '+linkedHashMap.get('key1')); // undefined
+  console.log('dodo '+linkedHashMap.size()); // 2
+
+  // 添加更多键值对
+  linkedHashMap.put('key4', 4);
+  linkedHashMap.put('key5', 5);
+  linkedHashMap.put('key6', 6);
+
+  console.log('dodo '+linkedHashMap.size()); // 5
+
+  // 验证访问顺序是否正确，最近访问的键值对应该在链表尾部
+  console.log('dodo '+linkedHashMap.get('key2')); // 20
+  console.log('dodo '+linkedHashMap.get('key3')); // 3
+  console.log('dodo '+linkedHashMap.get('key4')); // 4
+
+  // 添加更多键值对，超出容量限制（假设容量限制为 5）
+  linkedHashMap.put('key7', 7);
+  linkedHashMap.put('key8', 8);
+  linkedHashMap.put('key9', 9);
+
+  console.log('dodo '+linkedHashMap.size()); // 5
+  console.log('dodo '+linkedHashMap.get('key1')); // undefined，因为已经超过容量限制，最早访问的键值对被移除
+
+  // 验证移除最近访问的键值对后，访问顺序是否正确
+  linkedHashMap.remove('key4');
+  console.log('dodo '+linkedHashMap.get('key4')); // undefined
+  console.log('dodo '+linkedHashMap.get('key2')); // 20
+  console.log('dodo '+linkedHashMap.get('key3')); // 3
+
+  // 清空 LinkedHashMap
+  linkedHashMap.remove('key2');
+  linkedHashMap.remove('key3');
+  linkedHashMap.remove('key5');
+  linkedHashMap.remove('key6');
+  linkedHashMap.remove('key7');
+  linkedHashMap.remove('key8');
+  linkedHashMap.remove('key9');
+
+  console.log('dodo '+linkedHashMap.size()); // 0
+}
\ No newline at end of file
diff --git a/imageknife/src/main/ets/components/imageknife/utils/base/MethodMutex.ets b/imageknife/src/main/ets/components/imageknife/utils/base/MethodMutex.ets
new file mode 100644
index 0000000..e3165d8
--- /dev/null
+++ b/imageknife/src/main/ets/components/imageknife/utils/base/MethodMutex.ets
@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) 2023 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export class MethodMutex {
+  private mutex: Promise<void>;
+  private release: () => void;
+
+  constructor() {
+    this.mutex = Promise.resolve();
+    this.release = () => {};
+  }
+
+  async lock<T>(fn: () => Promise<T>): Promise<T> {
+    await this.mutex;
+    let result: T;
+
+    try {
+      this.mutex = new Promise<void>((resolve) => {
+        this.release = resolve;
+      });
+      result = await fn();
+    } finally {
+      this.release();
+    }
+
+    return result;
+  }
+}
\ No newline at end of file

From fc4ab718bb6410fd2cbb4bc2b393bc029ac48651 Mon Sep 17 00:00:00 2001
From: zhoulisheng <635547767@qq.com>
Date: Wed, 25 Oct 2023 11:31:14 +0800
Subject: [PATCH 2/6] =?UTF-8?q?1.Hsp=E9=80=82=E9=85=8D,=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E5=88=B0resourceManager=E7=9A=84=E5=9C=B0=E6=96=B9=E9=9C=80?=
 =?UTF-8?q?=E8=A6=81=E8=BF=9B=E8=A1=8C=E6=95=B4=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhoulisheng <635547767@qq.com>
---
 .../components/imageknife/ImageKnifeComponent.ets    | 10 ++++++++++
 .../ets/components/imageknife/ImageKnifeOption.ets   |  3 ++-
 .../main/ets/components/imageknife/RequestOption.ets | 12 ++++++++++++
 .../imageknife/holder/ErrorHolderManager.ets         |  2 +-
 .../imageknife/holder/PlaceHolderManager.ets         |  2 +-
 .../imageknife/holder/RetryHolderManager.ets         |  2 +-
 .../networkmanage/NetworkDownloadClient.ets          |  2 +-
 .../imageknife/requestmanage/RequestManager.ets      |  4 +++-
 .../imageknife/resourcemanage/IResourceFetch.ets     |  4 +++-
 .../imageknife/resourcemanage/ParseResClient.ets     |  4 ++--
 .../resourcemanage/ParseResClientBase64.ets          |  6 +++---
 .../imageknife/transform/MaskTransformation.ets      |  6 +++---
 12 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets b/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets
index 6516eb9..353d7cb 100644
--- a/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets
+++ b/imageknife/src/main/ets/components/imageknife/ImageKnifeComponent.ets
@@ -22,6 +22,7 @@ import { GIFFrame } from '../imageknife/utils/gif/GIFFrame'
 import { IDrawLifeCycle } from '../imageknife/interface/IDrawLifeCycle'
 import { LogUtil } from '../imageknife/utils/LogUtil'
 import { BusinessError } from '@ohos.base'
+import common from '@ohos.app.ability.common'
 
 @Component
 export struct ImageKnifeComponent {
@@ -256,6 +257,14 @@ export struct ImageKnifeComponent {
     }
   }
 
+  configHspContext(request: RequestOption){
+    if(this.imageKnifeOption.context != undefined){
+      request.setModuleContext(this.imageKnifeOption.context)
+    }else{
+      request.setModuleContext(getContext(this) as common.UIAbilityContext)
+    }
+  }
+
   configRenderGpu(request: RequestOption) {
     if (this.imageKnifeOption.enableGpu) {
       request.enableGPU()
@@ -281,6 +290,7 @@ export struct ImageKnifeComponent {
     this.configNecessary(request);
     this.configCacheStrategy(request);
     this.configDisplay(request);
+    this.configHspContext(request)
     this.configRenderGpu(request);
     if(ImageKnifeGlobal.getInstance().getImageKnife()!=undefined) {
       ImageKnifeGlobal.getInstance().getImageKnife()?.call(request);
diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets b/imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets
index 2180386..0c4e00d 100644
--- a/imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets
+++ b/imageknife/src/main/ets/components/imageknife/ImageKnifeOption.ets
@@ -25,6 +25,7 @@ import { ScaleType } from '../imageknife/ImageKnifeComponent'
 import { rgbColor } from './transform/CropCircleWithBorderTransformation'
 import { RoundCorner } from './transform/RoundedCornersTransformation'
 import { ObjectKey } from './ObjectKey'
+import common from '@ohos.app.ability.common'
 
 export interface CropCircleWithBorder{
   border: number,
@@ -125,7 +126,7 @@ export class ImageKnifeOption {
   allCacheInfoCallback?: IAllCacheInfoCallback;
 
 
-
+  context?: common.UIAbilityContext;
 //  sizeAnimate?: AnimateParam 由业务自定义不再支持
 
   constructor() {
diff --git a/imageknife/src/main/ets/components/imageknife/RequestOption.ets b/imageknife/src/main/ets/components/imageknife/RequestOption.ets
index 5daad2b..b8fb0f2 100644
--- a/imageknife/src/main/ets/components/imageknife/RequestOption.ets
+++ b/imageknife/src/main/ets/components/imageknife/RequestOption.ets
@@ -49,6 +49,7 @@ import { LogUtil } from '../imageknife/utils/LogUtil'
 import { ImageKnifeGlobal } from './ImageKnifeGlobal'
 import { BusinessError } from '@ohos.base'
 import { ObjectKey } from './ObjectKey'
+import common from '@ohos.app.ability.common'
 
 export interface Size {
   width: number,
@@ -131,6 +132,9 @@ export class RequestOption {
     }
   }
 
+  // module资源的需要当前的module context
+  moduleContext:common.UIAbilityContext;
+
   constructor() {
     // 初始化全局监听
     this.requestListeners = new Array();
@@ -148,6 +152,14 @@ export class RequestOption {
     return uuid;
   }
 
+  setModuleContext(moduleCtx:common.UIAbilityContext){
+    this.moduleContext = moduleCtx;
+  }
+
+  getModuleContext():common.UIAbilityContext{
+    return this.moduleContext;
+  }
+
   /**
    * set image Component size
    */
diff --git a/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets b/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets
index 527d447..fa3a9d4 100644
--- a/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets
+++ b/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets
@@ -72,7 +72,7 @@ export class ErrorHolderManager<T> {
               break;
           }
         }
-        resourceFetch.loadResource(res, suc, onError)
+        resourceFetch.loadResource(this.options.getModuleContext(),res, suc, onError)
       } else {
         onError("ErrorHolderManager 输入参数有问题!")
       }
diff --git a/imageknife/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets b/imageknife/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets
index 612a10f..80f4c50 100644
--- a/imageknife/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets
+++ b/imageknife/src/main/ets/components/imageknife/holder/PlaceHolderManager.ets
@@ -73,7 +73,7 @@ export class PlaceHolderManager<T> {
               break;
           }
         }
-        resourceFetch.loadResource(res, suc, onError)
+        resourceFetch.loadResource(this.options.getModuleContext(),res, suc, onError)
       } else {
         onError("PlaceHolderManager 输入参数有问题!")
       }
diff --git a/imageknife/src/main/ets/components/imageknife/holder/RetryHolderManager.ets b/imageknife/src/main/ets/components/imageknife/holder/RetryHolderManager.ets
index aaf2245..f769ea6 100644
--- a/imageknife/src/main/ets/components/imageknife/holder/RetryHolderManager.ets
+++ b/imageknife/src/main/ets/components/imageknife/holder/RetryHolderManager.ets
@@ -73,7 +73,7 @@ export class RetryHolderManager<T> {
               break;
           }
         }
-        resourceFetch.loadResource(res, suc, onError)
+        resourceFetch.loadResource(this.options.getModuleContext(), res, suc, onError)
       } else {
         onError("PlaceHolderManager 输入参数有问题!")
       }
diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets
index 6733caa..ae7d9c5 100644
--- a/imageknife/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets
+++ b/imageknife/src/main/ets/components/imageknife/networkmanage/NetworkDownloadClient.ets
@@ -43,7 +43,7 @@ export class NetworkDownloadClient implements IDataFetch {
       enableMetered: true,
     };
 
-    loadRequest.downloadFile( (ImageKnifeGlobal.getInstance().getHapContext() as common.BaseContext ), downloadConfig).then((downloadTask:loadRequest.DownloadTask) => {
+    loadRequest.downloadFile( (request.getModuleContext()  as common.BaseContext ), downloadConfig).then((downloadTask:loadRequest.DownloadTask) => {
       if (downloadTask) {
        let loadTask:loadRequest.DownloadTask | null = downloadTask;
 
diff --git a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets b/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets
index 33b41d5..55d22a0 100644
--- a/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets
+++ b/imageknife/src/main/ets/components/imageknife/requestmanage/RequestManager.ets
@@ -241,7 +241,7 @@ export class RequestManager {
         }
       }
     }
-    this.mIResourceFetch.loadResource(request.loadSrc as Resource, success, onError);
+    this.mIResourceFetch.loadResource(request.getModuleContext(),request.loadSrc as Resource, success, onError);
   }
   // 加载磁盘缓存 原图
   private loadDiskFromSource(request: RequestOption, onComplete:(value:ImageKnifeData)=>void|PromiseLike<ImageKnifeData>, onError:(reason?:BusinessError|string)=>void) {
@@ -323,6 +323,7 @@ export class RequestManager {
             width: Math.round(this.options.thumbSizeMultiplier * this.options.size.width),
             height: Math.round(this.options.thumbSizeMultiplier * this.options.size.height)
           })
+          thumbOption.setModuleContext(this.options.getModuleContext())
           let thumbCallback = this.options.thumbholderOnComplete;
           let thumbError = this.options.thumbholderOnError;
           this.options.transformations[0].transform(source, thumbOption,{asyncTransform: (error:BusinessError|string, pixelMap: PixelMap|null) => {
@@ -539,6 +540,7 @@ export class RequestManager {
 
   thumbnailProcess(source:ArrayBuffer, filetype:string, onComplete:(value:ImageKnifeData)=>void|PromiseLike<ImageKnifeData>, onError:(reason?:BusinessError|string)=>void){
     let thumbOption = new RequestOption();
+    thumbOption.setModuleContext(this.options.getModuleContext())
     thumbOption.setImageViewSize({
       width: Math.round(this.options.thumbSizeMultiplier * this.options.size.width),
       height: Math.round(this.options.thumbSizeMultiplier * this.options.size.height)
diff --git a/imageknife/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets b/imageknife/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets
index 70057e5..1c65221 100644
--- a/imageknife/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets
+++ b/imageknife/src/main/ets/components/imageknife/resourcemanage/IResourceFetch.ets
@@ -14,7 +14,9 @@
  */
 
 import { BusinessError } from '@ohos.base'
+import common from '@ohos.app.ability.common';
+
 // 本地资源解析抽象接口
 export interface IResourceFetch<T> {
-  loadResource:(res: Resource, onCompleteFunction:(value:T)=>void | PromiseLike<T>, onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
+  loadResource:(context:common.UIAbilityContext ,res: Resource, onCompleteFunction:(value:T)=>void | PromiseLike<T>, onErrorFunction:(reason?:BusinessError|string)=>void)=>void;
 }
\ No newline at end of file
diff --git a/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets b/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets
index fd27e74..6faadc2 100644
--- a/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets
+++ b/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets
@@ -20,11 +20,11 @@ import { ImageKnifeGlobal } from '../ImageKnifeGlobal';
 import { BusinessError } from '@ohos.base'
 import common from '@ohos.app.ability.common';
 export class ParseResClient implements IResourceFetch<ArrayBuffer> {
-  loadResource(res: Resource, onCompleteFunction:(value:ArrayBuffer)=>void | PromiseLike<ArrayBuffer>, onErrorFunction:(reason?:BusinessError|string)=>void) {
+  loadResource(context:common.UIAbilityContext,res: Resource, onCompleteFunction:(value:ArrayBuffer)=>void | PromiseLike<ArrayBuffer>, onErrorFunction:(reason?:BusinessError|string)=>void) {
     let resId = res.id;
     let resType = res.type;
     if (resType == ResourceTypeEts.MEDIA) {
-      ((ImageKnifeGlobal.getInstance().getHapContext() as common.UIAbilityContext).resourceManager as resourceManager.ResourceManager)
+      (context.resourceManager as resourceManager.ResourceManager)
         .getMediaContent(resId)
         .then(data => {
           let arrayBuffer = this.typedArrayToBuffer(data);
diff --git a/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets b/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets
index 6f563b5..983a982 100644
--- a/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets
+++ b/imageknife/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets
@@ -19,14 +19,14 @@ import { Base64 } from '../../cache/Base64'
 import { BusinessError } from '@ohos.base'
 import resourceManager from '@ohos.resourceManager';
 import { ImageKnifeGlobal } from '../ImageKnifeGlobal';
+import common from '@ohos.app.ability.common'
 
 export class ParseResClientBase64 implements IResourceFetch<ArrayBuffer> {
-  loadResource(res: Resource, onCompleteFunction: (value: ArrayBuffer) => void | PromiseLike<ArrayBuffer>, onErrorFunction: (reason?: BusinessError | string) => void) {
+  loadResource(context:common.UIAbilityContext,res: Resource, onCompleteFunction: (value: ArrayBuffer) => void | PromiseLike<ArrayBuffer>, onErrorFunction: (reason?: BusinessError | string) => void) {
     let resId = res.id;
     let resType = res.type;
     if (resType == ResourceTypeEts.MEDIA) {
-      ((ImageKnifeGlobal.getInstance()
-        .getHapContext() as Record<string, Object>).resourceManager as resourceManager.ResourceManager)
+      (context.resourceManager as resourceManager.ResourceManager)
         .getMediaContentBase64(resId)
         .then(data => {
           let matchReg = ';base64,';
diff --git a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets
index 4c04a40..20a9a2f 100644
--- a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets
+++ b/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets
@@ -78,20 +78,20 @@ export class MaskTransformation implements BaseTransform<PixelMap> {
     }
     imageSource.createPixelMap(options)
       .then(data => {
-        this.openInternal(data, targetWidth, targetHeight, func)
+        this.openInternal(request,data, targetWidth, targetHeight, func)
       })
       .catch((e:BusinessError )=> {
         func?.asyncTransform(e, null);
       })
   }
 
-  private openInternal(bitmap: PixelMap, width: number, height: number, func?: AsyncTransform<PixelMap>) {
+  private openInternal(request: RequestOption,bitmap: PixelMap, width: number, height: number, func?: AsyncTransform<PixelMap>) {
     if (!this._mResourceData) {
       if(func != undefined){
         func.asyncTransform("MaskTransformation resource is empty", null)
       }
     }
-    let context = (ImageKnifeGlobal.getInstance().getHapContext() as common.UIAbilityContext)
+    let context = (request.getModuleContext() as common.UIAbilityContext)
     if(context != undefined){
       let resourceManager = context.resourceManager as resourceManager.ResourceManager
       if(resourceManager != undefined && this._mResourceData != undefined)

From 219504ea8a8cafb271f0d05ea4061406c13cc096 Mon Sep 17 00:00:00 2001
From: zhoulisheng <635547767@qq.com>
Date: Wed, 25 Oct 2023 11:32:41 +0800
Subject: [PATCH 3/6] =?UTF-8?q?1.Hsp=E9=80=82=E9=85=8D,=E6=96=B0=E5=A2=9Eh?=
 =?UTF-8?q?sp=E7=9A=84library=E6=A8=A1=E5=9D=97,=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E5=90=8E=E7=BB=AD=E6=B5=8B=E8=AF=95hsp=E8=83=BD=E5=8A=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhoulisheng <635547767@qq.com>
---
 library/.gitignore                            |   6 ++
 library/build-profile.json5                   |  10 +++
 library/hvigorfile.ts                         |   2 +
 library/oh-package.json5                      |  11 +++
 library/src/main/ets/Index.ets                |  14 ++++
 library/src/main/ets/pages/Index.ets          |  78 ++++++++++++++++++
 library/src/main/module.json5                 |  13 +++
 .../main/resources/base/element/color.json    |   8 ++
 .../main/resources/base/element/string.json   |   8 ++
 .../src/main/resources/base/media/icon.png    | Bin 0 -> 6790 bytes
 .../main/resources/base/media/setting.jpeg    | Bin 0 -> 11320 bytes
 .../resources/base/profile/main_pages.json    |   5 ++
 12 files changed, 155 insertions(+)
 create mode 100644 library/.gitignore
 create mode 100644 library/build-profile.json5
 create mode 100644 library/hvigorfile.ts
 create mode 100644 library/oh-package.json5
 create mode 100644 library/src/main/ets/Index.ets
 create mode 100644 library/src/main/ets/pages/Index.ets
 create mode 100644 library/src/main/module.json5
 create mode 100644 library/src/main/resources/base/element/color.json
 create mode 100644 library/src/main/resources/base/element/string.json
 create mode 100644 library/src/main/resources/base/media/icon.png
 create mode 100644 library/src/main/resources/base/media/setting.jpeg
 create mode 100644 library/src/main/resources/base/profile/main_pages.json

diff --git a/library/.gitignore b/library/.gitignore
new file mode 100644
index 0000000..e2713a2
--- /dev/null
+++ b/library/.gitignore
@@ -0,0 +1,6 @@
+/node_modules
+/oh_modules
+/.preview
+/build
+/.cxx
+/.test
\ No newline at end of file
diff --git a/library/build-profile.json5 b/library/build-profile.json5
new file mode 100644
index 0000000..befa101
--- /dev/null
+++ b/library/build-profile.json5
@@ -0,0 +1,10 @@
+{
+  "apiType": 'stageMode',
+  "buildOption": {
+  },
+  "targets": [
+    {
+      "name": "default"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/library/hvigorfile.ts b/library/hvigorfile.ts
new file mode 100644
index 0000000..0e65ea8
--- /dev/null
+++ b/library/hvigorfile.ts
@@ -0,0 +1,2 @@
+// Script for compiling build behavior. It is built in the build plug-in and cannot be modified currently.
+module.exports = require('@ohos/hvigor-ohos-plugin').hspTasks
diff --git a/library/oh-package.json5 b/library/oh-package.json5
new file mode 100644
index 0000000..beeccdc
--- /dev/null
+++ b/library/oh-package.json5
@@ -0,0 +1,11 @@
+{
+  "name": "library",
+  "version": "1.0.0",
+  "description": "Please describe the basic information.",
+  "main": "./src/main/ets/Index.ets",
+  "author": "",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@ohos/imageknife": "file:../imageknife"
+  }
+}
\ No newline at end of file
diff --git a/library/src/main/ets/Index.ets b/library/src/main/ets/Index.ets
new file mode 100644
index 0000000..f99aa38
--- /dev/null
+++ b/library/src/main/ets/Index.ets
@@ -0,0 +1,14 @@
+/*
+ * Copyright (C) 2023 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.
+ */
\ No newline at end of file
diff --git a/library/src/main/ets/pages/Index.ets b/library/src/main/ets/pages/Index.ets
new file mode 100644
index 0000000..dc7606c
--- /dev/null
+++ b/library/src/main/ets/pages/Index.ets
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2023 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, FileUtils } from '@ohos/imageknife'
+import common from '@ohos.app.ability.common'
+
+@Entry
+@Component
+struct Index {
+
+
+  @State imageOption1:ImageKnifeOption = {
+    loadSrc: $r('app.media.icon'),
+    context: getContext(this).createModuleContext('library') as common.UIAbilityContext
+  }
+  @State imageOption2:ImageKnifeOption = {
+    loadSrc: $r('app.media.icon'),
+    context: getContext(this).createModuleContext('library') as common.UIAbilityContext
+  }
+  @State imageOption3:ImageKnifeOption = {
+    loadSrc: $r('app.media.icon'),
+    context: getContext(this).createModuleContext('library') as common.UIAbilityContext
+  }
+
+  build() {
+    Scroll() {
+      Column() {
+        Button('点击加载Resource').onClick(()=>{
+          this.imageOption1 = {
+            loadSrc: $r('app.media.setting'),
+            // 只要涉及resource加载 在HSP中都要带上context属性
+            context: getContext(this).createModuleContext('library') as common.UIAbilityContext
+          }
+        })
+        ImageKnifeComponent({imageKnifeOption:this.imageOption1}).width(300).height(300).backgroundColor(Color.Pink)
+        Button('点击加载网络图片').onClick(()=>{
+          this.imageOption2 = {
+            loadSrc: 'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB',
+            context: getContext(this).createModuleContext('library') as common.UIAbilityContext
+          }
+        })
+        ImageKnifeComponent({imageKnifeOption:this.imageOption2}).width(300).height(300).backgroundColor(Color.Pink)
+
+        Button('点击加载本地文件').onClick(()=>{
+          getContext(this).createModuleContext('library').resourceManager.getMediaContent($r('app.media.setting').id).then((data:Uint8Array)=>{
+            let path = globalThis.ImageKnife.getImageKnifeContext().filesDir+"/set.jpeg";
+            FileUtils.getInstance().writeFile(path,data.buffer)
+            FileUtils.getInstance().readFilePicAsync(path).then(buffer=>{
+              this.imageOption3 = {
+                loadSrc: path,
+                context: getContext(this).createModuleContext('library') as common.UIAbilityContext
+              }
+            })
+          })
+
+        })
+        ImageKnifeComponent({imageKnifeOption:this.imageOption3}).width(300).height(300).backgroundColor(Color.Pink)
+
+
+
+      }.width('100%')
+
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file
diff --git a/library/src/main/module.json5 b/library/src/main/module.json5
new file mode 100644
index 0000000..74570f9
--- /dev/null
+++ b/library/src/main/module.json5
@@ -0,0 +1,13 @@
+{
+  "module": {
+    "name": "library",
+    "type": "shared",
+    "description": "$string:shared_desc",
+    "deviceTypes": [
+      "default",
+      "tablet"
+    ],
+    "deliveryWithInstall": true,
+    "pages": "$profile:main_pages"
+  }
+}
\ No newline at end of file
diff --git a/library/src/main/resources/base/element/color.json b/library/src/main/resources/base/element/color.json
new file mode 100644
index 0000000..1bbc9aa
--- /dev/null
+++ b/library/src/main/resources/base/element/color.json
@@ -0,0 +1,8 @@
+{
+  "color": [
+    {
+      "name": "white",
+      "value": "#FFFFFF"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/library/src/main/resources/base/element/string.json b/library/src/main/resources/base/element/string.json
new file mode 100644
index 0000000..98e1d8a
--- /dev/null
+++ b/library/src/main/resources/base/element/string.json
@@ -0,0 +1,8 @@
+{
+  "string": [
+    {
+      "name": "shared_desc",
+      "value": "description"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/library/src/main/resources/base/media/icon.png b/library/src/main/resources/base/media/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce307a8827bd75456441ceb57d530e4c8d45d36c
GIT binary patch
literal 6790
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

literal 0
HcmV?d00001

diff --git a/library/src/main/resources/base/media/setting.jpeg b/library/src/main/resources/base/media/setting.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..57e67dd49d39ad64ef090f59db3db9dfe6632106
GIT binary patch
literal 11320
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
XfA^|$32%<NVcqlr;QHsdJQ@5y`?wwc

literal 0
HcmV?d00001

diff --git a/library/src/main/resources/base/profile/main_pages.json b/library/src/main/resources/base/profile/main_pages.json
new file mode 100644
index 0000000..1898d94
--- /dev/null
+++ b/library/src/main/resources/base/profile/main_pages.json
@@ -0,0 +1,5 @@
+{
+  "src": [
+    "pages/Index"
+  ]
+}

From 10271566277c9c0303e1d6fe12a126f3fd36b91e Mon Sep 17 00:00:00 2001
From: zhoulisheng <635547767@qq.com>
Date: Wed, 25 Oct 2023 15:50:10 +0800
Subject: [PATCH 4/6] =?UTF-8?q?1.=E6=96=B0=E5=A2=9Ehps=20=E5=85=B1?=
 =?UTF-8?q?=E4=BA=AB=E5=8C=85library?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhoulisheng <635547767@qq.com>
---
 build-profile.json5                           | 18 ++++-
 entry/src/main/ets/pages/hspCacheTestPage.ets | 65 +++++++++++++++++++
 .../ets/pages/imageknifeTestCaseIndex.ets     | 20 ++++++
 .../src/main/ets/pages/manyPhotoShowPage.ets  |  2 +-
 .../resources/base/profile/main_pages.json    |  3 +-
 .../ets/components/imageknife/ImageKnife.ets  |  2 +-
 6 files changed, 104 insertions(+), 6 deletions(-)
 create mode 100644 entry/src/main/ets/pages/hspCacheTestPage.ets

diff --git a/build-profile.json5 b/build-profile.json5
index eca7ce7..fa5c415 100644
--- a/build-profile.json5
+++ b/build-profile.json5
@@ -8,12 +8,12 @@
         "compatibleSdkVersion": 9
       }
     ],
-    "buildModeSet":[
+    "buildModeSet": [
       {
-        "name":"debug"
+        "name": "debug"
       },
       {
-        "name":"release"
+        "name": "release"
       }
     ]
   },
@@ -37,6 +37,18 @@
     {
       "name": "gpu_transform",
       "srcPath": "./gpu_transform"
+    },
+    {
+      "name": "library",
+      "srcPath": "./library",
+      "targets": [
+        {
+          "name": "default",
+          "applyToProducts": [
+            "default"
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/hspCacheTestPage.ets b/entry/src/main/ets/pages/hspCacheTestPage.ets
new file mode 100644
index 0000000..f5a981c
--- /dev/null
+++ b/entry/src/main/ets/pages/hspCacheTestPage.ets
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2023 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, FileUtils } from '@ohos/imageknife'
+
+@Entry
+@Component
+struct Index {
+
+
+  @State imageOption1:ImageKnifeOption = {
+    loadSrc: $r('app.media.icon'),
+
+  }
+  @State imageOption2:ImageKnifeOption = {
+    loadSrc: $r('app.media.icon'),
+
+  }
+  @State imageOption3:ImageKnifeOption = {
+    loadSrc: $r('app.media.icon'),
+
+  }
+
+  build() {
+    Scroll() {
+      Column() {
+        Button('点击加载网络图片').onClick(()=>{
+          this.imageOption2 = {
+            loadSrc: 'https://hbimg.huabanimg.com/cc6af25f8d782d3cf3122bef4e61571378271145735e9-vEVggB',
+          }
+        })
+        ImageKnifeComponent({imageKnifeOption:this.imageOption2}).width(300).height(300).backgroundColor(Color.Pink)
+
+        Button('点击加载本地文件').onClick(()=>{
+          let path = globalThis.ImageKnife.getImageKnifeContext().filesDir+"/set.jpeg";
+          FileUtils.getInstance().readFilePicAsync(path).then(buffer=>{
+            this.imageOption3 = {
+              loadSrc: path
+            }
+          })
+
+        })
+        ImageKnifeComponent({imageKnifeOption:this.imageOption3}).width(300).height(300).backgroundColor(Color.Pink)
+
+
+
+      }.width('100%')
+
+    }
+    .width('100%')
+    .height('100%')
+  }
+}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets b/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets
index 5683d4d..87a9c56 100644
--- a/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets
+++ b/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets
@@ -248,6 +248,26 @@ struct IndexFunctionDemo {
               router.pushUrl({ url: "pages/testGifLoadWithWorkerPage" });
             }).margin({ top: 5, left: 3 })
         }.width('100%').height(60).backgroundColor(Color.Pink)
+        Text("HSP相关测试").fontSize(15)
+        Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
+
+          Button("进入HSP的library共享包")
+            .onClick(() => {
+              router.pushUrl({url:'@bundle:com.openharmony.imageknife/library/ets/pages/Index'})
+                .then(()=>{
+                  console.log('push page suceess')
+                }).catch(err => {
+                console.log(`pushUrl failed, code is ${err.code}, message is ${err.message}`)
+              })
+            }).margin({ top: 15 })
+          Button("hsp加载后缓存情况,先点左侧按钮")
+            .onClick(() => {
+              console.log("pages/tempUrlTestPage 页面跳转")
+              router.pushUrl({ url: "pages/hspCacheTestPage" });
+            }).margin({ top: 15 })
+
+
+        }.width('100%').height(60).backgroundColor(Color.Pink)
       }
     }
     .width('100%')
diff --git a/entry/src/main/ets/pages/manyPhotoShowPage.ets b/entry/src/main/ets/pages/manyPhotoShowPage.ets
index c07919f..ed8d488 100644
--- a/entry/src/main/ets/pages/manyPhotoShowPage.ets
+++ b/entry/src/main/ets/pages/manyPhotoShowPage.ets
@@ -36,7 +36,7 @@ struct ManyPhotoShowPage {
      .onClick(()=>{
       let imageKnife = ImageKnifeGlobal.getInstance().getImageKnife();
       if(imageKnife!= undefined){
-       imageKnife.pauseRequests()
+       imageKnife.pauseRequest()
       }
      })
 
diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json
index 87811b4..d387c99 100644
--- a/entry/src/main/resources/base/profile/main_pages.json
+++ b/entry/src/main/resources/base/profile/main_pages.json
@@ -31,6 +31,7 @@
     "pages/testSingleFrameGifPage",
     "pages/testGifLoadWithWorkerPage",
     "pages/OptionTestPage",
-    "pages/SignatureTestPage"
+    "pages/SignatureTestPage",
+    "pages/hspCacheTestPage"
   ]
 }
\ No newline at end of file
diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
index 3b9af37..03575be 100644
--- a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
+++ b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
@@ -212,7 +212,7 @@ export class ImageKnife {
   }
 
   // 暂停所有请求
-  async pauseRequests(): Promise<void> {
+  async pauseRequest(): Promise<void> {
     await this.mutex.lock(async () => {
       this.isPaused = true;
 

From 8f01a3a3b40a7dec80ce5a49f0e3712a459dda4d Mon Sep 17 00:00:00 2001
From: zhoulisheng <635547767@qq.com>
Date: Tue, 31 Oct 2023 10:58:17 +0800
Subject: [PATCH 5/6] =?UTF-8?q?1.imageknife=E5=9C=A8library=E4=B8=AD?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96,=E5=B9=B6=E4=B8=94=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E7=BB=99entry=E4=BD=BF=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhoulisheng <635547767@qq.com>
---
 entry/oh-package.json5                        |   2 +-
 .../ets/entryability/CustomEngineKeyImpl.ets  |   4 +-
 .../main/ets/entryability/EntryAbility.ets    |   4 +-
 .../main/ets/pages/CacheRuleChangedPage.ets   |   2 +-
 entry/src/main/ets/pages/OptionTestPage.ets   |   2 +-
 .../src/main/ets/pages/SignatureTestPage.ets  |   2 +-
 .../ets/pages/basicTestFeatureAbilityPage.ets |   2 +-
 .../main/ets/pages/basicTestFileIOPage.ets    |   2 +-
 .../main/ets/pages/basicTestMediaImage.ets    |  10 +-
 .../pages/basicTestResourceManagerPage.ets    |   8 +-
 entry/src/main/ets/pages/compressPage.ets     |   8 +-
 entry/src/main/ets/pages/cropImagePage2.ets   |  16 +--
 .../main/ets/pages/dataShareUriLoadPage.ets   |   2 +-
 .../main/ets/pages/drawFactoryTestPage.ets    |   2 +-
 .../ets/pages/frescoRetryTestCasePage.ets     |   8 +-
 entry/src/main/ets/pages/gifTestCasePage.ets  |   6 +-
 entry/src/main/ets/pages/hspCacheTestPage.ets |   2 +-
 entry/src/main/ets/pages/index.ets            |   2 +-
 .../src/main/ets/pages/manyPhotoShowPage.ets  |   8 +-
 entry/src/main/ets/pages/pngjTestCasePage.ets |   4 +-
 .../ets/pages/showErrorholderTestCasePage.ets |   8 +-
 .../main/ets/pages/storageTestLruCache.ets    |   2 +-
 entry/src/main/ets/pages/svgTestCasePage.ets  |   4 +-
 entry/src/main/ets/pages/tempUrlTestPage.ets  |   2 +-
 .../main/ets/pages/testAllCacheInfoPage.ets   |  16 +--
 .../main/ets/pages/testGifDontAnimatePage.ets |  10 +-
 .../ets/pages/testGifLoadWithWorkerPage.ets   |   2 +-
 .../pages/testImageKnifeOptionChangedPage.ets |  10 +-
 .../testImageKnifeOptionChangedPage2.ets      |  12 +-
 .../testImageKnifeOptionChangedPage3.ets      |  18 +--
 .../testImageKnifeOptionChangedPage4.ets      |   2 +-
 .../testImageKnifeOptionChangedPage5.ets      |   2 +-
 entry/src/main/ets/pages/testPreloadPage.ets  |  10 +-
 .../main/ets/pages/testSingleFrameGifPage.ets |   4 +-
 .../main/ets/pages/transformPixelMapPage.ets  |  36 +++---
 .../src/ohosTest/ets/test/imageknife.test.ets |   2 +-
 entry/src/ohosTest/ets/test/logutil.test.ets  |   2 +-
 entry/src/ohosTest/ets/test/lrucache.test.ets |   2 +-
 .../ohosTest/ets/test/requestoption.test.ets  |   2 +-
 .../src/ohosTest/ets/test/transfrom.test.ets  |   2 +-
 .../ohosTest/ets/testability/TestAbility.ets  |   2 +-
 imageknife/index.ets                          |   1 +
 library/src/main/ets/Index.ets                | 122 +++++++++++++++++-
 library/src/main/ets/pages/InitImageKnife.ets |   8 ++
 44 files changed, 253 insertions(+), 124 deletions(-)
 create mode 100644 library/src/main/ets/pages/InitImageKnife.ets

diff --git a/entry/oh-package.json5 b/entry/oh-package.json5
index 6d37d6c..70fa217 100644
--- a/entry/oh-package.json5
+++ b/entry/oh-package.json5
@@ -6,7 +6,7 @@
   "repository": {},
   "version": "2.1.1-rc.0",
   "dependencies": {
-    "@ohos/imageknife": "file:../imageknife",
+    "@ohos/libraryimageknife": "file:../library",
     "@ohos/disklrucache": "^2.0.2-rc.0"
   }
 }
diff --git a/entry/src/main/ets/entryability/CustomEngineKeyImpl.ets b/entry/src/main/ets/entryability/CustomEngineKeyImpl.ets
index 45d3300..81a6863 100644
--- a/entry/src/main/ets/entryability/CustomEngineKeyImpl.ets
+++ b/entry/src/main/ets/entryability/CustomEngineKeyImpl.ets
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EngineKeyFactories, EngineKeyInterface, RequestOption } from '@ohos/imageknife'
-import { ObjectKey } from '@ohos/imageknife/src/main/ets/components/imageknife/ObjectKey';
+import { EngineKeyFactories, EngineKeyInterface, RequestOption } from '@ohos/libraryimageknife'
+import { ObjectKey } from '@ohos/libraryimageknife';
 
 export class CustomEngineKeyImpl implements EngineKeyInterface {
   redefineUrl: (loadSrc: string) => string;
diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets
index c3d114b..3e816e7 100644
--- a/entry/src/main/ets/entryability/EntryAbility.ets
+++ b/entry/src/main/ets/entryability/EntryAbility.ets
@@ -15,7 +15,7 @@
 import UIAbility from '@ohos.app.ability.UIAbility';
 import hilog from '@ohos.hilog';
 import window from '@ohos.window';
-import { ImageKnifeGlobal,ImageKnife,ImageKnifeDrawFactory,LogUtil } from '@ohos/imageknife'
+import {InitImageKnife, ImageKnifeGlobal,ImageKnife,ImageKnifeDrawFactory,LogUtil } from '@ohos/libraryimageknife'
 import { CustomEngineKeyImpl } from './CustomEngineKeyImpl'
 import abilityAccessCtrl,{Permissions} from '@ohos.abilityAccessCtrl';
 import { BusinessError } from '@ohos.base'
@@ -38,7 +38,7 @@ export default class EntryAbility extends UIAbility {
         windowStage.loadContent('pages/index', (err:BusinessError, data:void) => {
         });
 
-        ImageKnife.with(this.context);
+        InitImageKnife.init(this.context);
 
         let imageKnife:ImageKnife|undefined = ImageKnifeGlobal.getInstance().getImageKnife()
         if(imageKnife != undefined) {
diff --git a/entry/src/main/ets/pages/CacheRuleChangedPage.ets b/entry/src/main/ets/pages/CacheRuleChangedPage.ets
index a5592c9..ce1ef94 100644
--- a/entry/src/main/ets/pages/CacheRuleChangedPage.ets
+++ b/entry/src/main/ets/pages/CacheRuleChangedPage.ets
@@ -17,7 +17,7 @@ import {
   ImageKnifeOption,
   RotateImageTransformation,
   RoundedCornersTransformation
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/OptionTestPage.ets b/entry/src/main/ets/pages/OptionTestPage.ets
index 1c19004..6f7f6e2 100644
--- a/entry/src/main/ets/pages/OptionTestPage.ets
+++ b/entry/src/main/ets/pages/OptionTestPage.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ImageKnifeComponent, ImageKnifeOption,NONE,DiskStrategy } from '@ohos/imageknife'
+import { ImageKnifeComponent, ImageKnifeOption,NONE,DiskStrategy } from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/SignatureTestPage.ets b/entry/src/main/ets/pages/SignatureTestPage.ets
index f2a2551..177061d 100644
--- a/entry/src/main/ets/pages/SignatureTestPage.ets
+++ b/entry/src/main/ets/pages/SignatureTestPage.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ImageKnifeComponent, ImageKnifeOption, NONE, DiskStrategy } from '@ohos/imageknife'
+import { ImageKnifeComponent, ImageKnifeOption, NONE, DiskStrategy } from '@ohos/libraryimageknife'
 import { ObjectKey } from '@ohos/imageknife/src/main/ets/components/imageknife/ObjectKey';
 
 @Entry
diff --git a/entry/src/main/ets/pages/basicTestFeatureAbilityPage.ets b/entry/src/main/ets/pages/basicTestFeatureAbilityPage.ets
index fb31384..cc787cc 100644
--- a/entry/src/main/ets/pages/basicTestFeatureAbilityPage.ets
+++ b/entry/src/main/ets/pages/basicTestFeatureAbilityPage.ets
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeOption,ImageKnifeComponent} from '@ohos/imageknife'
+import {ImageKnifeOption,ImageKnifeComponent} from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/basicTestFileIOPage.ets b/entry/src/main/ets/pages/basicTestFileIOPage.ets
index aabc863..e8f468c 100644
--- a/entry/src/main/ets/pages/basicTestFileIOPage.ets
+++ b/entry/src/main/ets/pages/basicTestFileIOPage.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { FileUtils,  ImageKnifeGlobal} from '@ohos/imageknife'
+import { FileUtils,  ImageKnifeGlobal} from '@ohos/libraryimageknife'
 import resourceManager from '@ohos.resourceManager';
 import { BusinessError } from '@ohos.base'
 import common from '@ohos.app.ability.common';
diff --git a/entry/src/main/ets/pages/basicTestMediaImage.ets b/entry/src/main/ets/pages/basicTestMediaImage.ets
index 089eec6..e448f79 100644
--- a/entry/src/main/ets/pages/basicTestMediaImage.ets
+++ b/entry/src/main/ets/pages/basicTestMediaImage.ets
@@ -13,12 +13,12 @@
  * limitations under the License.
  */
 import featureAbility from '@ohos.ability.featureAbility';
-import { FileUtils } from '@ohos/imageknife'
-import { FileTypeUtil } from '@ohos/imageknife'
+import { FileUtils } from '@ohos/libraryimageknife'
+import { FileTypeUtil } from '@ohos/libraryimageknife'
 import resourceManager from '@ohos.resourceManager';
-import { Base64 } from '@ohos/imageknife'
-import { ParseImageUtil } from '@ohos/imageknife'
-import { ImageKnifeGlobal } from '@ohos/imageknife'
+import { Base64 } from '@ohos/libraryimageknife'
+import { ParseImageUtil } from '@ohos/libraryimageknife'
+import { ImageKnifeGlobal } from '@ohos/libraryimageknife'
 import { BusinessError } from '@ohos.base'
 import common from '@ohos.app.ability.common';
 @Entry
diff --git a/entry/src/main/ets/pages/basicTestResourceManagerPage.ets b/entry/src/main/ets/pages/basicTestResourceManagerPage.ets
index edc59e8..509dd53 100644
--- a/entry/src/main/ets/pages/basicTestResourceManagerPage.ets
+++ b/entry/src/main/ets/pages/basicTestResourceManagerPage.ets
@@ -13,11 +13,11 @@
  * limitations under the License.
  */
 import featureAbility from '@ohos.ability.featureAbility';
-import {FileUtils} from '@ohos/imageknife'
-import {FileTypeUtil} from '@ohos/imageknife'
+import {FileUtils} from '@ohos/libraryimageknife'
+import {FileTypeUtil} from '@ohos/libraryimageknife'
 import resourceManager from '@ohos.resourceManager';
-import {Base64} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
+import {Base64} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
 import { BusinessError } from '@ohos.base'
 import common from '@ohos.app.ability.common';
 @Entry
diff --git a/entry/src/main/ets/pages/compressPage.ets b/entry/src/main/ets/pages/compressPage.ets
index b76a7ba..578840a 100644
--- a/entry/src/main/ets/pages/compressPage.ets
+++ b/entry/src/main/ets/pages/compressPage.ets
@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnife} from '@ohos/imageknife'
-import {OnRenameListener} from '@ohos/imageknife'
-import {OnCompressListener} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
+import {ImageKnife} from '@ohos/libraryimageknife'
+import {OnRenameListener} from '@ohos/libraryimageknife'
+import {OnCompressListener} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/cropImagePage2.ets b/entry/src/main/ets/pages/cropImagePage2.ets
index fc76184..df4ad5d 100644
--- a/entry/src/main/ets/pages/cropImagePage2.ets
+++ b/entry/src/main/ets/pages/cropImagePage2.ets
@@ -13,14 +13,14 @@
  * limitations under the License.
  */
 
-import { CropImage } from '@ohos/imageknife'
-import { CropOptions } from '@ohos/imageknife'
-import { Crop } from '@ohos/imageknife'
-import { RecourseProvider } from '@ohos/imageknife'
-import { PixelMapCrop,Options } from '@ohos/imageknife'
-import { CropCallback } from '@ohos/imageknife'
-import { FileUtils } from '@ohos/imageknife'
-import { ImageKnifeGlobal } from '@ohos/imageknife'
+import { CropImage } from '@ohos/libraryimageknife'
+import { CropOptions } from '@ohos/libraryimageknife'
+import { Crop } from '@ohos/libraryimageknife'
+import { RecourseProvider } from '@ohos/libraryimageknife'
+import { PixelMapCrop,Options } from '@ohos/libraryimageknife'
+import { CropCallback } from '@ohos/libraryimageknife'
+import { FileUtils } from '@ohos/libraryimageknife'
+import { ImageKnifeGlobal } from '@ohos/libraryimageknife'
 import { BusinessError } from '@ohos.base'
 import resourceManager from '@ohos.resourceManager';
 import common from '@ohos.app.ability.common'
diff --git a/entry/src/main/ets/pages/dataShareUriLoadPage.ets b/entry/src/main/ets/pages/dataShareUriLoadPage.ets
index 2a22952..fd3859f 100644
--- a/entry/src/main/ets/pages/dataShareUriLoadPage.ets
+++ b/entry/src/main/ets/pages/dataShareUriLoadPage.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 import mediaLibrary from '@ohos.multimedia.mediaLibrary';
-import { ImageKnifeComponent, ImageKnifeOption, } from '@ohos/imageknife'
+import { ImageKnifeComponent, ImageKnifeOption, } from '@ohos/libraryimageknife'
 
 
 @Entry
diff --git a/entry/src/main/ets/pages/drawFactoryTestPage.ets b/entry/src/main/ets/pages/drawFactoryTestPage.ets
index 24bbb35..433475b 100644
--- a/entry/src/main/ets/pages/drawFactoryTestPage.ets
+++ b/entry/src/main/ets/pages/drawFactoryTestPage.ets
@@ -18,7 +18,7 @@ import {
   ImageKnifeOption,
   ImageKnifeDrawFactory,
   ScaleType
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/frescoRetryTestCasePage.ets b/entry/src/main/ets/pages/frescoRetryTestCasePage.ets
index b44bfba..c6ae9d5 100644
--- a/entry/src/main/ets/pages/frescoRetryTestCasePage.ets
+++ b/entry/src/main/ets/pages/frescoRetryTestCasePage.ets
@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
-import {RoundedCornersTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
+import {RoundedCornersTransformation} from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/gifTestCasePage.ets b/entry/src/main/ets/pages/gifTestCasePage.ets
index 771a395..d45ffa3 100644
--- a/entry/src/main/ets/pages/gifTestCasePage.ets
+++ b/entry/src/main/ets/pages/gifTestCasePage.ets
@@ -12,9 +12,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {GIFParseImpl} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
-import {ImageKnife} from '@ohos/imageknife'
+import {GIFParseImpl} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import {ImageKnife} from '@ohos/libraryimageknife'
 import worker from '@ohos.worker';
 import resourceManager from '@ohos.resourceManager';
 import { BusinessError } from '@ohos.base'
diff --git a/entry/src/main/ets/pages/hspCacheTestPage.ets b/entry/src/main/ets/pages/hspCacheTestPage.ets
index f5a981c..000f881 100644
--- a/entry/src/main/ets/pages/hspCacheTestPage.ets
+++ b/entry/src/main/ets/pages/hspCacheTestPage.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import { ImageKnifeComponent, ImageKnifeOption, FileUtils } from '@ohos/imageknife'
+import { ImageKnifeComponent, ImageKnifeOption, FileUtils } from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/index.ets b/entry/src/main/ets/pages/index.ets
index 7d6dd99..9043edd 100644
--- a/entry/src/main/ets/pages/index.ets
+++ b/entry/src/main/ets/pages/index.ets
@@ -18,7 +18,7 @@ import {
   ImageKnifeOption,
   ImageKnifeGlobal,
   ImageKnife
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 import worker from '@ohos.worker';
 import { ObjectKey } from '@ohos/imageknife/src/main/ets/components/imageknife/ObjectKey';
 
diff --git a/entry/src/main/ets/pages/manyPhotoShowPage.ets b/entry/src/main/ets/pages/manyPhotoShowPage.ets
index ed8d488..2a1e8b6 100644
--- a/entry/src/main/ets/pages/manyPhotoShowPage.ets
+++ b/entry/src/main/ets/pages/manyPhotoShowPage.ets
@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent, ScaleType} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent, ScaleType} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
 import {Material} from './model/Material'
 import {TestDataSource} from './model/TestDataSource'
 import {DiskLruCache} from '@ohos/disklrucache'
diff --git a/entry/src/main/ets/pages/pngjTestCasePage.ets b/entry/src/main/ets/pages/pngjTestCasePage.ets
index 390ddae..d1bcab9 100644
--- a/entry/src/main/ets/pages/pngjTestCasePage.ets
+++ b/entry/src/main/ets/pages/pngjTestCasePage.ets
@@ -13,9 +13,9 @@
  * limitations under the License.
  */
 import router from '@system.router';
-import { Pngj } from '@ohos/imageknife'
+import { Pngj } from '@ohos/libraryimageknife'
 import resourceManager from '@ohos.resourceManager';
-import { FileUtils,ImageKnifeGlobal } from '@ohos/imageknife'
+import { FileUtils,ImageKnifeGlobal } from '@ohos/libraryimageknife'
 import featureability from '@ohos.ability.featureAbility'
 import ArkWorker from '@ohos.worker'
 import worker from '@ohos.worker';
diff --git a/entry/src/main/ets/pages/showErrorholderTestCasePage.ets b/entry/src/main/ets/pages/showErrorholderTestCasePage.ets
index ad82adf..15ea013 100644
--- a/entry/src/main/ets/pages/showErrorholderTestCasePage.ets
+++ b/entry/src/main/ets/pages/showErrorholderTestCasePage.ets
@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
-import {RoundedCornersTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
+import {RoundedCornersTransformation} from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/storageTestLruCache.ets b/entry/src/main/ets/pages/storageTestLruCache.ets
index abe8e07..018c002 100644
--- a/entry/src/main/ets/pages/storageTestLruCache.ets
+++ b/entry/src/main/ets/pages/storageTestLruCache.ets
@@ -13,7 +13,7 @@
  * limitations under the License.
  */
 
-import {LruCache} from '@ohos/imageknife'
+import {LruCache} from '@ohos/libraryimageknife'
 
 function getRandomInt(min:number, max:number):number {
   min = Math.ceil(min);
diff --git a/entry/src/main/ets/pages/svgTestCasePage.ets b/entry/src/main/ets/pages/svgTestCasePage.ets
index 6157a96..edcd299 100644
--- a/entry/src/main/ets/pages/svgTestCasePage.ets
+++ b/entry/src/main/ets/pages/svgTestCasePage.ets
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {SVGParseImpl} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
+import {SVGParseImpl} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
 import resourceManager from '@ohos.resourceManager';
 import {BusinessError} from '@ohos.base'
 import common from '@ohos.app.ability.common';
diff --git a/entry/src/main/ets/pages/tempUrlTestPage.ets b/entry/src/main/ets/pages/tempUrlTestPage.ets
index 3353fdc..8057c30 100644
--- a/entry/src/main/ets/pages/tempUrlTestPage.ets
+++ b/entry/src/main/ets/pages/tempUrlTestPage.ets
@@ -20,7 +20,7 @@ import {
   ImageKnife,
   ImageKnifeDrawFactory,
   ScaleType
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 import worker from '@ohos.worker';
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/testAllCacheInfoPage.ets b/entry/src/main/ets/pages/testAllCacheInfoPage.ets
index 9d5003f..f39920a 100644
--- a/entry/src/main/ets/pages/testAllCacheInfoPage.ets
+++ b/entry/src/main/ets/pages/testAllCacheInfoPage.ets
@@ -12,14 +12,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {RequestOption} from '@ohos/imageknife'
-import {ImageKnifeData} from '@ohos/imageknife'
-import {AllCacheInfo,IAllCacheInfoCallback} from '@ohos/imageknife'
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {TransformType} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
+import {RequestOption} from '@ohos/libraryimageknife'
+import {ImageKnifeData} from '@ohos/libraryimageknife'
+import {AllCacheInfo,IAllCacheInfoCallback} from '@ohos/libraryimageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {TransformType} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
 import {BusinessError} from '@ohos.base'
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/testGifDontAnimatePage.ets b/entry/src/main/ets/pages/testGifDontAnimatePage.ets
index 69a56cc..3ba4ae7 100644
--- a/entry/src/main/ets/pages/testGifDontAnimatePage.ets
+++ b/entry/src/main/ets/pages/testGifDontAnimatePage.ets
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
-import {ImageKnife} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import {ImageKnife} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
 import worker from '@ohos.worker'
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/testGifLoadWithWorkerPage.ets b/entry/src/main/ets/pages/testGifLoadWithWorkerPage.ets
index 3f044a4..5753429 100644
--- a/entry/src/main/ets/pages/testGifLoadWithWorkerPage.ets
+++ b/entry/src/main/ets/pages/testGifLoadWithWorkerPage.ets
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnife,ImageKnifeGlobal, ImageKnifeComponent, ImageKnifeOption } from '@ohos/imageknife'
+import { ImageKnife,ImageKnifeGlobal, ImageKnifeComponent, ImageKnifeOption } from '@ohos/libraryimageknife'
 import worker, { MessageEvents } from '@ohos.worker'
 import Prompt from '@system.prompt'
 
diff --git a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets
index 687a98b..8298de4 100644
--- a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets
+++ b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage.ets
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
-import {ImageKnife} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import {ImageKnife} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
 import ArkWorker from '@ohos.worker'
 import worker from '@ohos.worker'
 @Entry
diff --git a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage2.ets b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage2.ets
index 1966689..44c646f 100644
--- a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage2.ets
+++ b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage2.ets
@@ -12,12 +12,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {BaseTransform} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
-import {GrayscaleTransformation} from '@ohos/imageknife'
-import {SketchFilterTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {BaseTransform} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
+import {GrayscaleTransformation} from '@ohos/libraryimageknife'
+import {SketchFilterTransformation} from '@ohos/libraryimageknife'
 import image from '@ohos.multimedia.image'
 
 @Entry
diff --git a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage3.ets b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage3.ets
index 8871b1a..0079d94 100644
--- a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage3.ets
+++ b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage3.ets
@@ -12,17 +12,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {ImageKnifeGlobal} from '@ohos/imageknife'
-import {ImageKnife} from '@ohos/imageknife'
-import {ScaleType} from '@ohos/imageknife'
-import {RotateImageTransformation} from '@ohos/imageknife'
-import {GrayscaleTransformation} from '@ohos/imageknife'
-import {SketchFilterTransformation} from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import {ImageKnife} from '@ohos/libraryimageknife'
+import {ScaleType} from '@ohos/libraryimageknife'
+import {RotateImageTransformation} from '@ohos/libraryimageknife'
+import {GrayscaleTransformation} from '@ohos/libraryimageknife'
+import {SketchFilterTransformation} from '@ohos/libraryimageknife'
 import ArkWorker from '@ohos.worker'
 import worker from '@ohos.worker'
-import {BaseTransform} from '@ohos/imageknife'
+import {BaseTransform} from '@ohos/libraryimageknife'
 import image from '@ohos.multimedia.image'
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage4.ets b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage4.ets
index 5585b14..fd11e45 100644
--- a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage4.ets
+++ b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage4.ets
@@ -24,7 +24,7 @@ import {
   ScaleType,
   ImageKnifeGlobal,
   BaseTransform
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 import ArkWorker from '@ohos.worker'
 import worker from '@ohos.worker';
 import image from '@ohos.multimedia.image';
diff --git a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage5.ets b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage5.ets
index ef672cd..d3de95f 100644
--- a/entry/src/main/ets/pages/testImageKnifeOptionChangedPage5.ets
+++ b/entry/src/main/ets/pages/testImageKnifeOptionChangedPage5.ets
@@ -25,7 +25,7 @@ import {
   IDrawLifeCycle,
   ScaleType,
   ImageKnifeDrawFactory
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 import worker from '@ohos.worker';
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/testPreloadPage.ets b/entry/src/main/ets/pages/testPreloadPage.ets
index 7924e71..f8e1098 100644
--- a/entry/src/main/ets/pages/testPreloadPage.ets
+++ b/entry/src/main/ets/pages/testPreloadPage.ets
@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {ImageKnifeComponent} from '@ohos/imageknife'
-import {ImageKnifeData} from '@ohos/imageknife'
-import {ImageKnifeOption} from '@ohos/imageknife'
-import {RequestOption} from '@ohos/imageknife'
-import {ImageKnifeGlobal } from '@ohos/imageknife'
+import {ImageKnifeComponent} from '@ohos/libraryimageknife'
+import {ImageKnifeData} from '@ohos/libraryimageknife'
+import {ImageKnifeOption} from '@ohos/libraryimageknife'
+import {RequestOption} from '@ohos/libraryimageknife'
+import {ImageKnifeGlobal } from '@ohos/libraryimageknife'
 import worker from '@ohos.worker'
 import { BusinessError } from '@ohos.base'
 
diff --git a/entry/src/main/ets/pages/testSingleFrameGifPage.ets b/entry/src/main/ets/pages/testSingleFrameGifPage.ets
index 0e292c6..7e7a8f7 100644
--- a/entry/src/main/ets/pages/testSingleFrameGifPage.ets
+++ b/entry/src/main/ets/pages/testSingleFrameGifPage.ets
@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent } from '@ohos/imageknife'
-import { ImageKnifeOption } from '@ohos/imageknife'
+import { ImageKnifeComponent } from '@ohos/libraryimageknife'
+import { ImageKnifeOption } from '@ohos/libraryimageknife'
 
 @Entry
 @Component
diff --git a/entry/src/main/ets/pages/transformPixelMapPage.ets b/entry/src/main/ets/pages/transformPixelMapPage.ets
index e9cabbb..96d47d7 100644
--- a/entry/src/main/ets/pages/transformPixelMapPage.ets
+++ b/entry/src/main/ets/pages/transformPixelMapPage.ets
@@ -12,28 +12,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { RequestOption,ImageKnifeGlobal} from '@ohos/imageknife'
-import { CropCircleTransformation } from '@ohos/imageknife'
-import { RoundedCornersTransformation } from '@ohos/imageknife'
+import { RequestOption,ImageKnifeGlobal} from '@ohos/libraryimageknife'
+import { CropCircleTransformation } from '@ohos/libraryimageknife'
+import { RoundedCornersTransformation } from '@ohos/libraryimageknife'
 import {
   CropCircleWithBorderTransformation
 } from '@ohos/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation'
-import { RotateImageTransformation } from '@ohos/imageknife'
-import { CropSquareTransformation } from '@ohos/imageknife'
-import { CropTransformation } from '@ohos/imageknife'
-import { CropType } from '@ohos/imageknife'
-import { GrayscaleTransformation } from '@ohos/imageknife'
-import { BrightnessFilterTransformation } from '@ohos/imageknife'
-import { ContrastFilterTransformation } from '@ohos/imageknife'
-import { InvertFilterTransformation } from '@ohos/imageknife'
-import { SepiaFilterTransformation } from '@ohos/imageknife'
-import { SketchFilterTransformation } from '@ohos/imageknife'
-import { BlurTransformation } from '@ohos/imageknife'
-import { PixelationFilterTransformation } from '@ohos/imageknife'
-import { MaskTransformation } from '@ohos/imageknife'
-import { SwirlFilterTransformation } from '@ohos/imageknife'
+import { RotateImageTransformation } from '@ohos/libraryimageknife'
+import { CropSquareTransformation } from '@ohos/libraryimageknife'
+import { CropTransformation } from '@ohos/libraryimageknife'
+import { CropType } from '@ohos/libraryimageknife'
+import { GrayscaleTransformation } from '@ohos/libraryimageknife'
+import { BrightnessFilterTransformation } from '@ohos/libraryimageknife'
+import { ContrastFilterTransformation } from '@ohos/libraryimageknife'
+import { InvertFilterTransformation } from '@ohos/libraryimageknife'
+import { SepiaFilterTransformation } from '@ohos/libraryimageknife'
+import { SketchFilterTransformation } from '@ohos/libraryimageknife'
+import { BlurTransformation } from '@ohos/libraryimageknife'
+import { PixelationFilterTransformation } from '@ohos/libraryimageknife'
+import { MaskTransformation } from '@ohos/libraryimageknife'
+import { SwirlFilterTransformation } from '@ohos/libraryimageknife'
 import { BusinessError } from '@ohos.base'
-import {ImageKnifeData} from '@ohos/imageknife'
+import {ImageKnifeData} from '@ohos/libraryimageknife'
 /**
  * PixelMap transform 示例
  */
diff --git a/entry/src/ohosTest/ets/test/imageknife.test.ets b/entry/src/ohosTest/ets/test/imageknife.test.ets
index 368a7a6..2186d29 100644
--- a/entry/src/ohosTest/ets/test/imageknife.test.ets
+++ b/entry/src/ohosTest/ets/test/imageknife.test.ets
@@ -14,7 +14,7 @@
  */
 import hilog from '@ohos.hilog';
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import {ImageKnife,ImageKnifeDrawFactory,ImageKnifeGlobal} from '@ohos/imageknife'
+import {ImageKnife,ImageKnifeDrawFactory,ImageKnifeGlobal} from '@ohos/libraryimageknife'
 
 export default function ImageKnifeTest() {
   describe('ImageKnifeTest',  ()=> {
diff --git a/entry/src/ohosTest/ets/test/logutil.test.ets b/entry/src/ohosTest/ets/test/logutil.test.ets
index 71f61a1..4ab90ac 100644
--- a/entry/src/ohosTest/ets/test/logutil.test.ets
+++ b/entry/src/ohosTest/ets/test/logutil.test.ets
@@ -14,7 +14,7 @@
  */
 import hilog from '@ohos.hilog';
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import {LogUtil} from '@ohos/imageknife'
+import {LogUtil} from '@ohos/libraryimageknife'
 
 export default function LogUtilTest() {
   describe('LogUtilTest',  ()=> {
diff --git a/entry/src/ohosTest/ets/test/lrucache.test.ets b/entry/src/ohosTest/ets/test/lrucache.test.ets
index 3238954..b5ef887 100644
--- a/entry/src/ohosTest/ets/test/lrucache.test.ets
+++ b/entry/src/ohosTest/ets/test/lrucache.test.ets
@@ -14,7 +14,7 @@
  */
 import hilog from '@ohos.hilog';
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import {LruCache} from '@ohos/imageknife' // DiskLruCache用例由DiskLruCache三方库提供
+import {LruCache} from '@ohos/libraryimageknife' // DiskLruCache用例由DiskLruCache三方库提供
 
 export default function lruCacheTest() {
   describe('lruCacheTest',  ()=> {
diff --git a/entry/src/ohosTest/ets/test/requestoption.test.ets b/entry/src/ohosTest/ets/test/requestoption.test.ets
index e2b0621..b83bd10 100644
--- a/entry/src/ohosTest/ets/test/requestoption.test.ets
+++ b/entry/src/ohosTest/ets/test/requestoption.test.ets
@@ -15,7 +15,7 @@
  */
 import hilog from '@ohos.hilog';
 import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'
-import {RequestOption,Size} from '@ohos/imageknife'
+import {RequestOption,Size} from '@ohos/libraryimageknife'
 
 export default function RequestOptionTest() {
   describe('RequestOptionTest',  ()=> {
diff --git a/entry/src/ohosTest/ets/test/transfrom.test.ets b/entry/src/ohosTest/ets/test/transfrom.test.ets
index 8802154..c1b1e8c 100644
--- a/entry/src/ohosTest/ets/test/transfrom.test.ets
+++ b/entry/src/ohosTest/ets/test/transfrom.test.ets
@@ -36,7 +36,7 @@ import {
   ToonFilterTransform,
   VignetteFilterTransform,
 
-} from '@ohos/imageknife'
+} from '@ohos/libraryimageknife'
 
 export default function Transform() {
   describe('Transform', ()=>{
diff --git a/entry/src/ohosTest/ets/testability/TestAbility.ets b/entry/src/ohosTest/ets/testability/TestAbility.ets
index 22b0877..140dbda 100644
--- a/entry/src/ohosTest/ets/testability/TestAbility.ets
+++ b/entry/src/ohosTest/ets/testability/TestAbility.ets
@@ -18,7 +18,7 @@ import hilog from '@ohos.hilog';
 import { Hypium } from '@ohos/hypium';
 import testsuite from '../test/List.test';
 import window from '@ohos.window';
-import {ImageKnife,ImageKnifeDrawFactory,ImageKnifeGlobal} from '@ohos/imageknife'
+import {ImageKnife,ImageKnifeDrawFactory,ImageKnifeGlobal} from '@ohos/libraryimageknife'
 import AbilityConstant from '@ohos.app.ability.AbilityConstant';
 import Want from '@ohos.app.ability.Want';
 import { BusinessError } from '@ohos.base'
diff --git a/imageknife/index.ets b/imageknife/index.ets
index 739c6ca..624208a 100644
--- a/imageknife/index.ets
+++ b/imageknife/index.ets
@@ -96,6 +96,7 @@ export { UPNG } from './src/main/ets/components/3rd_party/upng/UPNG'
 export { ImageKnife } from './src/main/ets/components/imageknife/ImageKnife'
 export { ImageKnifeGlobal } from './src/main/ets/components/imageknife/ImageKnifeGlobal'
 export {RequestOption,Size} from './src/main/ets/components/imageknife/RequestOption'
+export {ObjectKey} from './src/main/ets/components/imageknife/ObjectKey'
 export { ImageKnifeComponent, ScaleType, ScaleTypeHelper } from './src/main/ets/components/imageknife/ImageKnifeComponent'
 export { ImageKnifeDrawFactory } from './src/main/ets/components/imageknife/ImageKnifeDrawFactory'
 export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions} from './src/main/ets/components/imageknife/ImageKnifeOption'
diff --git a/library/src/main/ets/Index.ets b/library/src/main/ets/Index.ets
index f99aa38..1b34845 100644
--- a/library/src/main/ets/Index.ets
+++ b/library/src/main/ets/Index.ets
@@ -11,4 +11,124 @@
  * 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.
- */
\ No newline at end of file
+ */
+
+
+// ImageKnife 对外暴露的接口由library提供
+
+/**
+ * cache
+ */
+
+export { FileUtils } from '@ohos/imageknife'
+export { Base64 } from '@ohos/imageknife'
+export { LruCache } from '@ohos/imageknife'
+export { DiskStrategy } from '@ohos/imageknife'
+export { ALL } from '@ohos/imageknife'
+export { AUTOMATIC } from '@ohos/imageknife'
+export { DATA } from '@ohos/imageknife'
+export { NONE } from '@ohos/imageknife'
+export { RESOURCE } from '@ohos/imageknife'
+export { EngineKeyInterface } from '@ohos/imageknife'
+export { EngineKeyFactories } from '@ohos/imageknife'
+
+/**
+ * compress
+ */
+export { CompressBuilder } from '@ohos/imageknife'
+export { OnCompressListener } from '@ohos/imageknife'
+export { OnRenameListener } from '@ohos/imageknife'
+export { CompressDataListener } from '@ohos/imageknife'
+export { CompressionPredicate } from '@ohos/imageknife'
+export { CompressAdapter } from '@ohos/imageknife'
+export { CompressProvider } from '@ohos/imageknife'
+export { DataStringPathProvider } from '@ohos/imageknife'
+export { RecourseProvider } from '@ohos/imageknife'
+
+/**
+ * crop
+ */
+
+export { CropImage } from '@ohos/imageknife'
+export { CropOptions } from '@ohos/imageknife'
+export { PixelMapCrop,Options } from '@ohos/imageknife'
+export { CropCallback } from '@ohos/imageknife'
+
+/**
+ * transform
+ */
+export { BaseTransform } from '@ohos/imageknife'
+export { BlurTransformation } from '@ohos/imageknife'
+export { BrightnessFilterTransformation } from '@ohos/imageknife'
+export { ContrastFilterTransformation } from '@ohos/imageknife'
+export { CropCircleTransformation } from '@ohos/imageknife'
+export { CropCircleWithBorderTransformation,rgbColor } from '@ohos/imageknife'
+export { CropSquareTransformation } from '@ohos/imageknife'
+export { CropTransformation,CropType } from '@ohos/imageknife'
+export { GrayscaleTransformation } from '@ohos/imageknife'
+export { InvertFilterTransformation } from '@ohos/imageknife'
+export { PixelationFilterTransformation } from '@ohos/imageknife'
+export { RotateImageTransformation } from '@ohos/imageknife'
+export { RoundedCornersTransformation,RoundCorner } from '@ohos/imageknife'
+export { SepiaFilterTransformation } from '@ohos/imageknife'
+export { SketchFilterTransformation } from '@ohos/imageknife'
+export { MaskTransformation } from '@ohos/imageknife'
+export { SwirlFilterTransformation } from '@ohos/imageknife'
+export { KuwaharaFilterTransform } from '@ohos/imageknife'
+export { ToonFilterTransform } from '@ohos/imageknife'
+export { VignetteFilterTransform } from '@ohos/imageknife'
+export { TransformUtils } from '@ohos/imageknife'
+export { TransformType } from '@ohos/imageknife'
+export { CenterCrop } from '@ohos/imageknife'
+export { CenterInside } from '@ohos/imageknife'
+export { FitCenter } from '@ohos/imageknife'
+
+/**
+ * pngj
+ */
+export { Pngj } from '@ohos/imageknife'
+export {handler} from '@ohos/imageknife'
+export { UPNG } from '@ohos/imageknife'
+
+
+
+/**
+ * ImageKnife
+ */
+export { ImageKnife } from '@ohos/imageknife'
+export { ImageKnifeGlobal } from '@ohos/imageknife'
+export {RequestOption,Size} from '@ohos/imageknife'
+export {ObjectKey} from '@ohos/imageknife'
+export { ImageKnifeComponent, ScaleType, ScaleTypeHelper } from '@ohos/imageknife'
+export { ImageKnifeDrawFactory } from '@ohos/imageknife'
+export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions} from '@ohos/imageknife'
+export { ImageKnifeData } from '@ohos/imageknife'
+export {IAllCacheInfoCallback,AllCacheInfo,ResourceCacheInfo,MemoryCacheInfo,DataCacheInfo}  from '@ohos/imageknife'
+export {IParseImage} from '@ohos/imageknife'
+export {IDataFetch} from '@ohos/imageknife'
+export {ICache} from '@ohos/imageknife'
+export { FileTypeUtil } from '@ohos/imageknife'
+export { ParseImageUtil } from '@ohos/imageknife'
+
+/**
+ * svg parse
+ */
+export { SVGParseImpl } from '@ohos/imageknife'
+
+/**
+ * gif parse
+ */
+export { GIFParseImpl } from '@ohos/imageknife'
+export { GIFFrame } from '@ohos/imageknife'
+// 能力增强worker 解析GIF数据
+export { gifHandler } from '@ohos/imageknife'
+
+// 自定义组件新增
+// 自定义组件绘制生命周期
+export { IDrawLifeCycle } from '@ohos/imageknife'
+
+// 日志管理
+export { LogUtil } from '@ohos/imageknife'
+
+// 额外开放初始化ImageKnife的方法
+export {InitImageKnife} from './src/main/ets/pages/InitImageKnife'
\ No newline at end of file
diff --git a/library/src/main/ets/pages/InitImageKnife.ets b/library/src/main/ets/pages/InitImageKnife.ets
new file mode 100644
index 0000000..b05c84f
--- /dev/null
+++ b/library/src/main/ets/pages/InitImageKnife.ets
@@ -0,0 +1,8 @@
+import common from '@ohos.app.ability.common'
+import { ImageKnifeComponent, ImageKnifeOption, FileUtils } from '@ohos/imageknife'
+import { ImageKnifeGlobal,ImageKnife,ImageKnifeDrawFactory,LogUtil } from '@ohos/imageknife'
+export class InitImageKnife{
+  static init(entryContext:common.UIAbilityContext){
+    ImageKnife.with(entryContext);
+  }
+}
\ No newline at end of file

From ff532ec8c16e578bbbffbfce48216135cb92f80c Mon Sep 17 00:00:00 2001
From: zhoulisheng <635547767@qq.com>
Date: Tue, 31 Oct 2023 11:30:30 +0800
Subject: [PATCH 6/6] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9library=E5=8A=A0?=
 =?UTF-8?q?=E8=BD=BD=E7=9A=84=E4=BB=A3=E7=A0=81,=E8=8E=B7=E5=8F=96context?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zhoulisheng <635547767@qq.com>
---
 library/src/main/ets/Index.ets       | 2 +-
 library/src/main/ets/pages/Index.ets | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/library/src/main/ets/Index.ets b/library/src/main/ets/Index.ets
index 1b34845..c526015 100644
--- a/library/src/main/ets/Index.ets
+++ b/library/src/main/ets/Index.ets
@@ -131,4 +131,4 @@ export { IDrawLifeCycle } from '@ohos/imageknife'
 export { LogUtil } from '@ohos/imageknife'
 
 // 额外开放初始化ImageKnife的方法
-export {InitImageKnife} from './src/main/ets/pages/InitImageKnife'
\ No newline at end of file
+export {InitImageKnife} from '../ets/pages/InitImageKnife'
\ No newline at end of file
diff --git a/library/src/main/ets/pages/Index.ets b/library/src/main/ets/pages/Index.ets
index dc7606c..86f8d60 100644
--- a/library/src/main/ets/pages/Index.ets
+++ b/library/src/main/ets/pages/Index.ets
@@ -12,7 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { ImageKnifeComponent, ImageKnifeOption, FileUtils } from '@ohos/imageknife'
+import {ImageKnifeGlobal, ImageKnifeComponent, ImageKnifeOption, FileUtils } from '@ohos/imageknife'
 import common from '@ohos.app.ability.common'
 
 @Entry
@@ -54,7 +54,8 @@ struct Index {
 
         Button('点击加载本地文件').onClick(()=>{
           getContext(this).createModuleContext('library').resourceManager.getMediaContent($r('app.media.setting').id).then((data:Uint8Array)=>{
-            let path = globalThis.ImageKnife.getImageKnifeContext().filesDir+"/set.jpeg";
+           let ctx = ImageKnifeGlobal.getInstance().getHapContext() as common.UIAbilityContext;
+            let path = ctx.filesDir+"/set.jpeg";
             FileUtils.getInstance().writeFile(path,data.buffer)
             FileUtils.getInstance().readFilePicAsync(path).then(buffer=>{
               this.imageOption3 = {