Pre Merge pull request !342 from zgf/3.x

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

CHANGELOG.md

@@ -1,9 +1,7 @@
-## 3.0.1-rc.1
-- 新增ImageKnifeAnimatorComponent控制动图组件
-- 修复部分heif图无法解码
-
 ## 3.0.1-rc.0
 - 文件缓存设置最大缓存数量改为无限制
+- 新增ImageKnifeAnimatorComponent控制动图组件
+- 修复部分heif图无法解码
 
 ## 3.0.0
 - 修复图形变换的闪退问题

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

@@ -18,8 +18,6 @@ import Constants from '../../../main/ets/common/Constants';
 import taskpool from '@ohos.taskpool';
 import { GlobalContext } from '../../../main/ets/common/GlobalContext';
 import { FileCache } from '@ohos/imageknife/src/main/ets/utils/FileCache';
-import { IEngineKey, ImageKnifeOption } from '@ohos/imageknife';
-import { DefaultEngineKey } from '@ohos/imageknife/src/main/ets/key/DefaultEngineKey';
 
 
 export default function FileLruCacheTest() {
@@ -151,15 +149,6 @@ export default function FileLruCacheTest() {
       fileCache.put(JSON.stringify("xxxxx"),buf)
       expect(fileCache.get(JSON.stringify("xxxxx"))?.byteLength).assertEqual(1024 * 1024)
     });
-    it('fileCacheEngineKey', 0, () => {
-      let engineKey: IEngineKey = new DefaultEngineKey()
-      let imageKnifeOption: ImageKnifeOption = {
-        loadSrc:"abc"
-      }
-      let imageKey = engineKey.generateFileKey(imageKnifeOption.loadSrc,"")
-      let imageAnimatorKey = engineKey.generateFileKey(imageKnifeOption.loadSrc,"",true)
-      expect(imageKey == imageAnimatorKey).assertFalse()
-    });
   });
 }
 

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

@@ -19,8 +19,6 @@ import image from '@ohos.multimedia.image';
 import Constants from '../../../main/ets/common/Constants';
 import { MemoryLruCache } from '@ohos/imageknife/src/main/ets/utils/MemoryLruCache';
 import { ImageKnifeData } from '@ohos/imageknife/src/main/ets/model/ImageKnifeData';
-import { IEngineKey, ImageKnifeOption,ImageKnifeRequestSource } from '@ohos/imageknife';
-import { DefaultEngineKey } from '@ohos/imageknife/src/main/ets/key/DefaultEngineKey';
 
 
 export default function MemoryLruCacheTest() {
@@ -120,16 +118,6 @@ export default function MemoryLruCacheTest() {
       expect(memoryCache.get("ccc")).assertEqual(data)
     });
 
-    it('memoryCacheEngineKey', 0, () => {
-      let engineKey: IEngineKey = new DefaultEngineKey()
-      let imageKnifeOption: ImageKnifeOption = {
-        loadSrc:"abc"
-      }
-      let imageKey = engineKey.generateMemoryKey(imageKnifeOption.loadSrc,ImageKnifeRequestSource.SRC,imageKnifeOption)
-      let imageAnimatorKey = engineKey.generateMemoryKey(imageKnifeOption.loadSrc,ImageKnifeRequestSource.SRC,imageKnifeOption,true)
-      expect(imageKey == imageAnimatorKey).assertFalse()
-    });
-
   });
 }
 

library/oh-package.json5

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

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

@@ -40,6 +40,15 @@ export struct ImageKnifeAnimatorComponent {
   private currentContext: common.UIAbilityContext | undefined = undefined
 
   aboutToAppear(): void {
+    //闪动问题失效，注释相应代码后续修复
+    // let memoryCache: ImageKnifeData | undefined = ImageKnife.getInstance()
+    //   .loadFromMemoryCache(Tools.generateMemoryKey(this.ImageKnifeOption.loadSrc))
+    // if (memoryCache !== undefined){
+    //   LogUtil.log("aboutToAppear load from memory cache for key = "+ Tools.generateMemoryKey(this.ImageKnifeOption.loadSrc))
+    //   //画主图
+    //   this.pixelMap = memoryCache.source;
+    // }else {
+    // }
     this.objectFit = this.imageKnifeOption.objectFit === undefined ? ImageFit.Contain : this.imageKnifeOption.objectFit
   }