From cdfb4fafa9b665ec12afc638be63682ab5708fe1 Mon Sep 17 00:00:00 2001 From: zgf Date: Wed, 7 Aug 2024 17:42:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxts=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=9AImageKnifeOption=E7=94=A8=E6=B3=95=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zgf --- entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets | 4 ++-- entry/src/ohosTest/ets/test/FileLruCache.test.ets | 4 ++-- entry/src/ohosTest/ets/test/ImageKnife.test.ets | 4 ++-- entry/src/ohosTest/ets/test/MemoryLruCache.test.ets | 4 ++-- entry/src/ohosTest/ets/test/imageknifeOption.test.ets | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets b/entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets index eb13a71..4e02044 100644 --- a/entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets +++ b/entry/src/ohosTest/ets/test/DefaultJobQueueTest.test.ets @@ -70,10 +70,10 @@ export default function DefaultJobQueueTest() { } function makeRequest(src: string, context: common.UIAbilityContext, priority?: taskpool.Priority): ImageKnifeRequest { - let option: ImageKnifeOption = { + let option: ImageKnifeOption = new ImageKnifeOption({ loadSrc: src, priority: priority - } + }) return new ImageKnifeRequest( option, context, diff --git a/entry/src/ohosTest/ets/test/FileLruCache.test.ets b/entry/src/ohosTest/ets/test/FileLruCache.test.ets index 2dd76f3..3081972 100644 --- a/entry/src/ohosTest/ets/test/FileLruCache.test.ets +++ b/entry/src/ohosTest/ets/test/FileLruCache.test.ets @@ -153,9 +153,9 @@ export default function FileLruCacheTest() { }); it('fileCacheEngineKey', 0, () => { let engineKey: IEngineKey = new DefaultEngineKey() - let imageKnifeOption: ImageKnifeOption = { + let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({ loadSrc:"abc" - } + }) let imageKey = engineKey.generateFileKey(imageKnifeOption.loadSrc,"") let imageAnimatorKey = engineKey.generateFileKey(imageKnifeOption.loadSrc,"",true) expect(imageKey == imageAnimatorKey).assertFalse() diff --git a/entry/src/ohosTest/ets/test/ImageKnife.test.ets b/entry/src/ohosTest/ets/test/ImageKnife.test.ets index 8c6811f..7df3605 100644 --- a/entry/src/ohosTest/ets/test/ImageKnife.test.ets +++ b/entry/src/ohosTest/ets/test/ImageKnife.test.ets @@ -40,10 +40,10 @@ export default function ImageKnifeTest() { it('removeMemoryCache', 0, async () => { let a = 'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp'; - let option: ImageKnifeOption = { + let option: ImageKnifeOption = new ImageKnifeOption({ loadSrc: 'https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp', signature: '' - } + }) let key = ImageKnife.getInstance() .getEngineKeyImpl() .generateMemoryKey('https://hbimg.huabanimg.com/95a6d37a39aa0b70d48fa18dc7df8309e2e0e8e85571e-x4hhks_fw658/format/webp', ImageKnifeRequestSource.SRC, option) diff --git a/entry/src/ohosTest/ets/test/MemoryLruCache.test.ets b/entry/src/ohosTest/ets/test/MemoryLruCache.test.ets index 98f2514..26ade90 100644 --- a/entry/src/ohosTest/ets/test/MemoryLruCache.test.ets +++ b/entry/src/ohosTest/ets/test/MemoryLruCache.test.ets @@ -122,9 +122,9 @@ export default function MemoryLruCacheTest() { it('memoryCacheEngineKey', 0, () => { let engineKey: IEngineKey = new DefaultEngineKey() - let imageKnifeOption: ImageKnifeOption = { + let imageKnifeOption: ImageKnifeOption = new 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() diff --git a/entry/src/ohosTest/ets/test/imageknifeOption.test.ets b/entry/src/ohosTest/ets/test/imageknifeOption.test.ets index ffd20b9..4d12c58 100644 --- a/entry/src/ohosTest/ets/test/imageknifeOption.test.ets +++ b/entry/src/ohosTest/ets/test/imageknifeOption.test.ets @@ -44,7 +44,7 @@ export default function ImageKnifeOptionTest() { imageWidth: 0, imageHeight: 0, } - let ImageKnifeOption: ImageKnifeOption = { + let imageKnifeOption: ImageKnifeOption = new ImageKnifeOption({ loadSrc: $r("app.media.rabbit"), onLoadListener: { onLoadFailed: (err) => { @@ -58,7 +58,7 @@ export default function ImageKnifeOptionTest() { return data; }, }, - } + }) if (ImageKnifeOption.onLoadListener && ImageKnifeOption.onLoadListener.onLoadSuccess && ImageKnifeOption.onLoadListener.onLoadFailed) { ImageKnifeOption.onLoadListener.onLoadSuccess(a,imageData); ImageKnifeOption.onLoadListener.onLoadFailed(a); From 5c1b0578b6bdc9cfb4d2ef05f14ed89c572a12eb Mon Sep 17 00:00:00 2001 From: zgf Date: Wed, 7 Aug 2024 18:05:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dxts=E6=8A=A5=E9=94=99?= =?UTF-8?q?=EF=BC=9AImageKnifeOption=E7=94=A8=E6=B3=95=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zgf --- entry/src/ohosTest/ets/test/imageknifeOption.test.ets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entry/src/ohosTest/ets/test/imageknifeOption.test.ets b/entry/src/ohosTest/ets/test/imageknifeOption.test.ets index 4d12c58..6a3acac 100644 --- a/entry/src/ohosTest/ets/test/imageknifeOption.test.ets +++ b/entry/src/ohosTest/ets/test/imageknifeOption.test.ets @@ -59,9 +59,9 @@ export default function ImageKnifeOptionTest() { }, }, }) - if (ImageKnifeOption.onLoadListener && ImageKnifeOption.onLoadListener.onLoadSuccess && ImageKnifeOption.onLoadListener.onLoadFailed) { - ImageKnifeOption.onLoadListener.onLoadSuccess(a,imageData); - ImageKnifeOption.onLoadListener.onLoadFailed(a); + if (imageKnifeOption.onLoadListener && imageKnifeOption.onLoadListener.onLoadSuccess && imageKnifeOption.onLoadListener.onLoadFailed) { + imageKnifeOption.onLoadListener.onLoadSuccess(a,imageData); + imageKnifeOption.onLoadListener.onLoadFailed(a); } expect(a).assertEqual(b); });