修复设置磁盘容量最大值jscrash

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

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.1.2-rc.11
+- 修复设置磁盘容量最大值出现闪退
+
 ## 2.1.2-rc.10
 - 修复部分gif图片识别成静态图
 - 修复同一张图片发送多次请求

entry/oh-package.json5

@@ -4,7 +4,7 @@
   "name": "entry",
   "description": "example description",
   "repository": {},
-  "version": "2.1.2-rc.10",
+  "version": "2.1.2-rc.11",
   "dependencies": {
     "@ohos/libraryimageknife": "file:../sharedlibrary",
     "@ohos/sharedlibrary2": "file:../sharedlibrary2",

entry/src/main/ets/pages/basicTestFileIOPage.ets

@@ -109,13 +109,18 @@ struct basicTestFileIOPage {
               this.imageHint2 = 'appFilePath未取到值,请按顺序从上往下,从左往右依次测试'
               return
             }
-            let filePath1 = this.appFilePath + '/Folder1/jpgSample.gif';
-            let filePath2 = this.appFilePath + '/Folder2/jpgSample.gif';
-            FileUtils.getInstance().createFolder(this.appFilePath + '/Folder1')
-            FileUtils.getInstance().createFolder(this.appFilePath + '/Folder2')
-            FileUtils.getInstance().copyFile(filePath1, filePath2);
-            this.imageFile = 'file://' + this.appFilePath + '/Folder2/jpgSample.gif'
-            console.log('Folder2 imaeFile =' + this.imageFile)
+            try {
+              let filePath1 = this.appFilePath + '/Folder1/jpgSample.gif';
+              let filePath2 = this.appFilePath + '/Folder2/jpgSample.gif';
+              FileUtils.getInstance().createFolder(this.appFilePath + '/Folder1')
+              FileUtils.getInstance().createFolder(this.appFilePath + '/Folder2')
+              FileUtils.getInstance().copyFile(filePath1, filePath2);
+              this.imageFile = 'file://' + this.appFilePath + '/Folder2/jpgSample.gif'
+              console.log('Folder2 imaeFile =' + this.imageFile)
+            } catch (e) {
+              console.log('appFilePath未取到值,请按顺序从上往下,从左往右依次测试:'+JSON.stringify(e))
+            }
+
           })
         Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) {
           Button('显示空PixelMap')

library/oh-package.json5

@@ -14,7 +14,7 @@
   "main": "index.ets",
   "repository": "https://gitee.com/openharmony-tpc/ImageKnife",
   "type": "module",
-  "version": "2.1.2-rc.10",
+  "version": "2.1.2-rc.11",
   "dependencies": {
     "pako": "^2.1.0",
     "@ohos/disklrucache": "^2.0.2-rc.0",

library/src/main/ets/components/imageknife/ImageKnife.ets

@@ -202,15 +202,16 @@ export class ImageKnife {
 
   // 替代原来的DiskLruCache
   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) => {
-        newDiskLruCache.set(key, value);
-      })
-      this.diskMemoryCache = newDiskLruCache;
-    }
+    this.diskMemoryCache.setMaxSize(size)
+    // 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) => {
+    //     newDiskLruCache.set(key, value);
+    //   })
+    //   this.diskMemoryCache = newDiskLruCache;
+    // }
   }
 
   // 预加载 resource资源一级缓存，string资源实现二级缓存

oh-package.json5

@@ -6,6 +6,6 @@
   "name": "imageknife",
   "description": "example description",
   "repository": {},
-  "version": "2.1.2-rc.10",
+  "version": "2.1.2-rc.11",
   "dependencies": {}
 }