From 38fc363b374ce06e953e31e9894fc6fcc9ec5286 Mon Sep 17 00:00:00 2001
From: dodozhou7 <abczp777777@163.com>
Date: Mon, 22 Aug 2022 01:03:59 -0700
Subject: [PATCH] 1.cropImage default size changed 2.delete MyAbilityStage.ts
 useless file 3.ImageKnife create DiskLruCache Function has changed 4.
 MaskTransformation.ets adapter stage mode getResourceManager

Signed-off-by: dodozhou7 <abczp777777@163.com>
---
 entry/src/main/ets/Application/MyAbilityStage.ts          | 7 -------
 entry/src/main/ets/pages/cropImagePage2.ets               | 4 ++--
 .../src/main/ets/components/imageknife/ImageKnife.ets     | 8 +++-----
 .../imageknife/transform/MaskTransformation.ets           | 6 +-----
 4 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 entry/src/main/ets/Application/MyAbilityStage.ts

diff --git a/entry/src/main/ets/Application/MyAbilityStage.ts b/entry/src/main/ets/Application/MyAbilityStage.ts
deleted file mode 100644
index 32dfe93..0000000
--- a/entry/src/main/ets/Application/MyAbilityStage.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import AbilityStage from "@ohos.application.AbilityStage"
-
-export default class MyAbilityStage extends AbilityStage {
-    onCreate() {
-        console.log("[Demo] MyAbilityStage onCreate")
-    }
-}
\ No newline at end of file
diff --git a/entry/src/main/ets/pages/cropImagePage2.ets b/entry/src/main/ets/pages/cropImagePage2.ets
index c9bc822..e95a584 100644
--- a/entry/src/main/ets/pages/cropImagePage2.ets
+++ b/entry/src/main/ets/pages/cropImagePage2.ets
@@ -44,8 +44,8 @@ export struct CropImagePage2 {
             .then(data => {
               let arrayBuffer = FileUtils.getInstance().uint8ArrayToBuffer(data);
               let optionx = new PixelMapCrop.Options();
-              optionx.setWidth(600)
-                .setHeight(400)
+              optionx.setWidth(800)
+                .setHeight(800)
                 .setCropFunction((err, pixelmap, sx, sy) => {
                   console.log('PMC setCropFunction callback')
                   if (err) {
diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
index b8a7341..7ff0827 100644
--- a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
+++ b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets
@@ -61,7 +61,7 @@ export class ImageKnife {
     this.memoryCache = new LruCache<string, any>(100);
 
     // 创建disk缓存 传入的size 为多少比特 比如20KB 传入20*1024
-    this.diskMemoryCache = DiskLruCache.create(this.imageKnifeContext.filesDir + ImageKnife.SEPARATOR + this.diskCacheFolder, 30 * 1024 * 1024);
+    this.diskMemoryCache = DiskLruCache.create(this.imageKnifeContext);
 
     // 创建网络下载能力
     this.dataFetch = new DownloadClient();
@@ -180,12 +180,10 @@ export class ImageKnife {
 
   // 替代原来的DiskLruCache
   public replaceDiskLruCache(size:number) {
-    //    this.diskMemoryCache = DiskLruCache.create(this.imageKnifeContext.filesDir+ImageKnife.SEPARATOR+this.diskCacheFolder, size);
-
     if (this.diskMemoryCache.getCacheMap().size() <= 0) {
-      this.diskMemoryCache = DiskLruCache.create(this.imageKnifeContext.filesDir + ImageKnife.SEPARATOR + this.diskCacheFolder, size);
+      this.diskMemoryCache = DiskLruCache.create(this.imageKnifeContext, size);
     } else {
-      let newDiskLruCache = DiskLruCache.create(this.imageKnifeContext.filesDir + ImageKnife.SEPARATOR + this.diskCacheFolder, size);
+      let newDiskLruCache = DiskLruCache.create(this.imageKnifeContext, size);
       this.diskMemoryCache.foreachDiskLruCache(function (value, key, map) {
         newDiskLruCache.set(key, value);
       })
diff --git a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets
index 4bf6ec0..27130e6 100644
--- a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets
+++ b/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets
@@ -83,10 +83,7 @@ export class MaskTransformation implements BaseTransform<PixelMap> {
     if (!this._mResourceData) {
       throw new Error("MaskTransformation resource is empty");
     }
-    resmgr.getResourceManager()
-      .then(result => {
-        result.getMedia(this._mResourceData
-        .id)
+    globalThis.ImageKnife.getImageKnifeContext().resourceManager.getMedia(this._mResourceData.id)
           .then(array => {
             let buffer = array.buffer.slice(array.byteOffset, array.byteLength + array.byteOffset);
             var imageSource = image.createImageSource(buffer as any);
@@ -105,6 +102,5 @@ export class MaskTransformation implements BaseTransform<PixelMap> {
           .catch(err => {
             func("MaskTransformation openInternal error" + err, null);
           })
-      })
   }
 }
\ No newline at end of file