From 5a7b175bdc1df4068d4f02cc42b4c971b1a71417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E6=9C=88=E6=B8=85=E9=A3=8E?= <2928139825@qq.com> Date: Tue, 24 Oct 2023 15:56:42 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=EF=BC=9A=201=E3=80=81=E4=BF=AE=E6=94=B9=E4=BA=86signature?= =?UTF-8?q?=E6=9C=AA=E5=88=A4=E7=A9=BA=E5=AF=BC=E8=87=B4=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 明月清风 <2928139825@qq.com> --- CHANGELOG.md | 2 +- .../main/ets/components/cache/key/EngineKeyInterface.ets | 6 +++--- .../src/main/ets/components/imageknife/ImageKnife.ets | 6 ------ 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8189342..500b50d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ ## 2.1.0 -- ArkTs语法整改: +- ArkTs语法适配: globalThis.ImageKnife方式已经不可使用 diff --git a/imageknife/src/main/ets/components/cache/key/EngineKeyInterface.ets b/imageknife/src/main/ets/components/cache/key/EngineKeyInterface.ets index 637b4d2..90985a0 100644 --- a/imageknife/src/main/ets/components/cache/key/EngineKeyInterface.ets +++ b/imageknife/src/main/ets/components/cache/key/EngineKeyInterface.ets @@ -17,11 +17,11 @@ import { RequestOption } from '../../imageknife/RequestOption' export interface EngineKeyInterface { // 生成内存缓存 - generateMemoryCacheKey(loadSrc: string, size: string, transformed: string, dontAnimate: boolean, signature: ObjectKey): string + generateMemoryCacheKey(loadSrc: string, size: string, transformed: string, dontAnimate: boolean, signature: ObjectKey | undefined): string // 生成原图变换后的图片的磁盘缓存 - generateTransformedDiskCacheKey(loadSrc: string, size: string, transformed: string, dontAnimate: boolean, signature: ObjectKey): string + generateTransformedDiskCacheKey(loadSrc: string, size: string, transformed: string, dontAnimate: boolean, signature: ObjectKey | undefined): string // 生成原图的磁盘缓存 - generateOriginalDiskCacheKey(loadSrc: string, signature: ObjectKey): string + generateOriginalDiskCacheKey(loadSrc: string, signature: ObjectKey | undefined): string } diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets index 464efba..fb7a857 100644 --- a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets +++ b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets @@ -266,12 +266,6 @@ export class ImageKnife { let signature = request.signature; - if (signature) { - console.log("唯一标识：" + signature.getKey()) - } - - - cacheKey = factories.generateMemoryCacheKey(loadKey,size,transformed,dontAnimateFlag,signature); // 生成磁盘缓存变换后数据key 变换后数据保存在磁盘 From 3077af9dc3126e242b3e89b57fc3e55d39132eec Mon Sep 17 00:00:00 2001 From: zhoulisheng <635547767@qq.com> Date: Thu, 2 Nov 2023 10:07:39 +0800 Subject: [PATCH 2/6] =?UTF-8?q?1.=E6=96=B0=E5=A2=9EMemoryLruCache=E4=B8=BB?= =?UTF-8?q?=E5=8A=A8=E8=B0=83=E7=94=A8PixelMap=E7=9A=84release=E6=96=B9?= =?UTF-8?q?=E6=B3=95,=E9=87=8A=E6=94=BEnative=E7=9A=84PixelMap=E5=86=85?= =?UTF-8?q?=E5=AD=98=202.=E6=96=B0=E5=A2=9EImageSource=E4=B8=BB=E5=8A=A8?= =?UTF-8?q?=E8=B0=83=E7=94=A8release=E6=96=B9=E6=B3=95=E9=87=8A=E6=94=BEna?= =?UTF-8?q?tive=E6=8C=81=E6=9C=89=E7=9A=84ImageSource=E5=86=85=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhoulisheng <635547767@qq.com> --- AppScope/app.json5 | 2 +- CHANGELOG.md | 2 + README.md | 2 +- entry/oh-package.json5 | 2 +- .../ets/entryability/CustomEngineKeyImpl.ets | 2 +- .../main/ets/pages/basicTestFileIOPage.ets | 11 +- .../pages/basicTestResourceManagerPage.ets | 8 +- .../src/main/ets/pages/manyPhotoShowPage.ets | 39 +- entry/src/main/ets/pages/pngjTestCasePage.ets | 3 +- .../main/ets/pages/transformPixelMapPage.ets | 2 +- imageknife/index.ets | 1 + .../ets/components/cache/MemoryLruCache.ets | 45 ++ .../ets/components/imageknife/ImageKnife.ets | 386 +++++++++++------- .../imageknife/ImageKnifeComponent.ets | 89 ++-- .../components/imageknife/ImageKnifeData.ets | 41 ++ .../components/imageknife/RequestOption.ets | 40 +- .../components/imageknife/compress/Engine.ets | 5 +- .../compress/provider/RecourseProvider.ets | 5 +- .../ets/components/imageknife/crop/Crop.ets | 2 + .../imageknife/crop/PixelMapCrop.ets | 1 + .../imageknife/holder/ErrorHolderManager.ets | 39 +- .../networkmanage/DownloadClient.ets | 9 +- .../networkmanage/HttpDownloadClient.ets | 110 +++++ .../requestmanage/RequestManager.ets | 25 +- .../transform/BlurTransformation.ets | 4 +- .../BrightnessFilterTransformation.ets | 2 +- .../ContrastFilterTransformation.ets | 2 +- .../transform/CropCircleTransformation.ets | 2 + .../CropCircleWithBorderTransformation.ets | 2 + .../transform/CropSquareTransformation.ets | 2 + .../transform/CropTransformation.ets | 2 + .../transform/GrayscaleTransformation.ets | 2 +- .../transform/InvertFilterTransformation.ets | 2 +- .../transform/KuwaharaFilterTransform.ets | 2 + .../transform/MaskTransformation.ets | 2 + .../PixelationFilterTransformation.ets | 2 + .../transform/RotateImageTransformation.ets | 2 + .../RoundedCornersTransformation.ets | 2 + .../transform/SepiaFilterTransformation.ets | 2 +- .../transform/SketchFilterTransformation.ets | 2 + .../transform/SwirlFilterTransformation.ets | 2 + .../transform/ToonFilterTransform.ets | 2 + .../imageknife/transform/TransformUtils.ets | 12 +- .../transform/VignetteFilterTransform.ets | 2 + .../imageknife/utils/FileTypeUtil.ets | 193 ++++----- .../imageknife/utils/ParseImageUtil.ets | 1 + .../utils/base/EasyLinkedHashMap.ets | 134 ++++++ .../imageknife/utils/base/MethodMutex.ets | 40 ++ oh-package.json5 | 2 +- 49 files changed, 913 insertions(+), 380 deletions(-) create mode 100644 imageknife/src/main/ets/components/cache/MemoryLruCache.ets 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/AppScope/app.json5 b/AppScope/app.json5 index 3cfb263..e357c41 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "com.openharmony.imageknife", "vendor": "example", "versionCode": 1000000, - "versionName": "2.1.1-rc.0", + "versionName": "2.1.1-rc.1", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index 500b50d..ae32f59 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## 2.1.1-rc.1 - 新增自定义key参数配置 +- 新增MemoryLruCache主动调用PixelMap的release方法,释放native的PixelMap内存 +- 新增ImageSource主动调用release方法释放native持有的ImageSource内存 ## 2.1.1-rc.0 diff --git a/README.md b/README.md index 2bc2225..32cb3bc 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ohpm install @ohos/imageknife "author": "", "license": "", "dependencies": { - "@ohos/imageknife": "^2.0.6" + "@ohos/imageknife": "^2.1.1-rc.1" } } ``` diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 6d37d6c..fcbc00a 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.1.1-rc.0", + "version": "2.1.1-rc.1", "dependencies": { "@ohos/imageknife": "file:../imageknife", "@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..ee6521b 100644 --- a/entry/src/main/ets/entryability/CustomEngineKeyImpl.ets +++ b/entry/src/main/ets/entryability/CustomEngineKeyImpl.ets @@ -13,7 +13,7 @@ * limitations under the License. */ import { EngineKeyFactories, EngineKeyInterface, RequestOption } from '@ohos/imageknife' -import { ObjectKey } from '@ohos/imageknife/src/main/ets/components/imageknife/ObjectKey'; +import { ObjectKey } from '@ohos/imageknife'; export class CustomEngineKeyImpl implements EngineKeyInterface { redefineUrl: (loadSrc: string) => string; diff --git a/entry/src/main/ets/pages/basicTestFileIOPage.ets b/entry/src/main/ets/pages/basicTestFileIOPage.ets index aabc863..0a5fddd 100644 --- a/entry/src/main/ets/pages/basicTestFileIOPage.ets +++ b/entry/src/main/ets/pages/basicTestFileIOPage.ets @@ -23,8 +23,10 @@ struct basicTestFileIOPage { @State filePath: string = '查看featureAbility路径'; appFilePath = ''; appCachePath = ''; - @State imageHint: string = '' - @State imageFile: string = '文字提醒' + @State imageHint: string = '文字提醒1' + @State imageHint2: string = '文字提醒2' + @State imageFile: string = '' + @State imageRes: Resource = $r('app.media.pngSample') @State imagePixelMap?: PixelMap = undefined @State normalPixelMap: boolean = false; @@ -63,7 +65,7 @@ struct basicTestFileIOPage { .margin({ top: 10 }) .onClick(() => { if(this.appFilePath == '' || this.appFilePath == null){ - this.appFilePath = 'appFilePath未取到值,请按顺序从上往下,从左往右依次测试' + this.imageHint = 'appFilePath未取到值,请按顺序从上往下,从左往右依次测试' return } console.log('files目录创建Folder1和Folder2 验证statSync mkdirSync') @@ -94,12 +96,13 @@ struct basicTestFileIOPage { console.log('basicTestFileIOPage - 本地加载资源err' + JSON.stringify(err as BusinessError)); }) }) + Text(this.imageHint2) Button('copy:Folder1至Folder2， 验证copyFileSync') .margin({ top: 10 }) .onClick(() => { console.log('copy:Folder1至Folder2， 验证copyFileSync') if(this.appFilePath == '' || this.appFilePath == null){ - this.appFilePath = 'appFilePath未取到值,请按顺序从上往下,从左往右依次测试' + this.imageHint2 = 'appFilePath未取到值,请按顺序从上往下,从左往右依次测试' return } let filePath1 = this.appFilePath + '/Folder1/jpgSample.gif'; diff --git a/entry/src/main/ets/pages/basicTestResourceManagerPage.ets b/entry/src/main/ets/pages/basicTestResourceManagerPage.ets index edc59e8..824b00c 100644 --- a/entry/src/main/ets/pages/basicTestResourceManagerPage.ets +++ b/entry/src/main/ets/pages/basicTestResourceManagerPage.ets @@ -41,7 +41,9 @@ struct BasicTestResourceManagerPage { let arrayBuffer = this.typedArrayToBuffer(data); let filetypeUtil = new FileTypeUtil(); let fileType = filetypeUtil.getFileType(arrayBuffer); - this.fileTypeStr = fileType; + if(fileType != null) { + this.fileTypeStr = fileType; + } }) .catch((err:BusinessError) => { console.log('basicTestFileIOPage - 本地加载资源err' + JSON.stringify(err)); @@ -63,7 +65,9 @@ struct BasicTestResourceManagerPage { .decode(data); let filetypeUtil = new FileTypeUtil(); let fileType = filetypeUtil.getFileType(arrayBuffer); - this.fileTypeStr = fileType; + if(fileType != null) { + this.fileTypeStr = fileType; + } }) .catch((err:BusinessError) => { console.log('basicTestFileIOPage - 本地加载资源err' + JSON.stringify(err)); diff --git a/entry/src/main/ets/pages/manyPhotoShowPage.ets b/entry/src/main/ets/pages/manyPhotoShowPage.ets index 1841360..c5d9a37 100644 --- a/entry/src/main/ets/pages/manyPhotoShowPage.ets +++ b/entry/src/main/ets/pages/manyPhotoShowPage.ets @@ -31,16 +31,35 @@ struct ManyPhotoShowPage { build() { Column() { - Button('设置磁盘存储为50M') - .onClick(()=>{ - if(ImageKnifeGlobal.getInstance().getImageKnife() != undefined) { - let disk: DiskLruCache | undefined = (ImageKnifeGlobal.getInstance().getImageKnife())?.getDiskMemoryCache(); - if(disk != undefined) { - disk.setMaxSize(50 * 1024 * 1024) - Prompt.showToast({ message: "设置成功" }) - } - } - }) + // 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.resumeRequests() + // } + // }) + // + // Button('设置磁盘存储为50M') + // .margin({top:10,bottom:5}) + // .onClick(()=>{ + // if(ImageKnifeGlobal.getInstance().getImageKnife() != undefined) { + // let disk: DiskLruCache | undefined = (ImageKnifeGlobal.getInstance().getImageKnife())?.getDiskMemoryCache(); + // if(disk != undefined) { + // disk.setMaxSize(50 * 1024 * 1024) + // Prompt.showToast({ message: "设置成功" }) + // } + // } + // }) List({ space: 20, scroller: this.elementScroller }) { LazyForEach(this.data, (item: Material, index) => { diff --git a/entry/src/main/ets/pages/pngjTestCasePage.ets b/entry/src/main/ets/pages/pngjTestCasePage.ets index 390ddae..15ec0fe 100644 --- a/entry/src/main/ets/pages/pngjTestCasePage.ets +++ b/entry/src/main/ets/pages/pngjTestCasePage.ets @@ -120,7 +120,8 @@ struct PngjTestCasePage { name: 'readPngImageAsync' }) pngj.readPngImageAsync(png_worker, this.pngSource2!, {pngCallback: (sender:ArrayBuffer, value:Record) => { - this.pngSource1 = sender + this.pngSource2 = sender + this.hint8 = '重新获取buffer才能测试' this.hint2 = 'img with=' + value.width + ' img height=' + value.height + ' img depth=' + value.depth + ' img ctype=' + value.ctype this.pngdecodeRun2 = false; diff --git a/entry/src/main/ets/pages/transformPixelMapPage.ets b/entry/src/main/ets/pages/transformPixelMapPage.ets index e9cabbb..226b8ed 100644 --- a/entry/src/main/ets/pages/transformPixelMapPage.ets +++ b/entry/src/main/ets/pages/transformPixelMapPage.ets @@ -17,7 +17,7 @@ import { CropCircleTransformation } from '@ohos/imageknife' import { RoundedCornersTransformation } from '@ohos/imageknife' import { CropCircleWithBorderTransformation -} from '@ohos/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation' +} from '@ohos/imageknife' import { RotateImageTransformation } from '@ohos/imageknife' import { CropSquareTransformation } from '@ohos/imageknife' import { CropTransformation } from '@ohos/imageknife' diff --git a/imageknife/index.ets b/imageknife/index.ets index 739c6ca..1dbd5ef 100644 --- a/imageknife/index.ets +++ b/imageknife/index.ets @@ -95,6 +95,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 { ObjectKey } from './src/main/ets/components/imageknife/ObjectKey' export {RequestOption,Size} from './src/main/ets/components/imageknife/RequestOption' export { ImageKnifeComponent, ScaleType, ScaleTypeHelper } from './src/main/ets/components/imageknife/ImageKnifeComponent' export { ImageKnifeDrawFactory } from './src/main/ets/components/imageknife/ImageKnifeDrawFactory' diff --git a/imageknife/src/main/ets/components/cache/MemoryLruCache.ets b/imageknife/src/main/ets/components/cache/MemoryLruCache.ets new file mode 100644 index 0000000..df78b51 --- /dev/null +++ b/imageknife/src/main/ets/components/cache/MemoryLruCache.ets @@ -0,0 +1,45 @@ +/* + * 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 { ImageKnife } from '../imageknife/ImageKnife'; +import { ImageKnifeData } from '../imageknife/ImageKnifeData'; +import { LruCache } from './LruCache'; + +export class MemoryLruCache extends LruCache{ + constructor(maxsize:number) { + super(maxsize) + } + + // 移除较少使用的缓存数据 + trimToSize(tempsize: number) { + while (true) { + if (tempsize < 0) { + this.map.clear() + this.size = 0 + break + } + if (this.size <= tempsize || this.map.isEmpty()) { + break + } + let delkey = this.map.getFirstKey() + let data : ImageKnifeData|undefined = this.map.get(delkey) + if(data != undefined){ + data.release() + } + this.map.remove(delkey) + this.size-- + } + } + +} \ 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 fb7a857..151d060 100644 --- a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets +++ b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets @@ -14,63 +14,71 @@ */ 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' +import { MemoryLruCache } from '../cache/MemoryLruCache' export class ImageKnife { static readonly SEPARATOR: string = '/' - - memoryCache: LruCache; - diskMemoryCache: DiskLruCache; - dataFetch: IDataFetch; - resourceFetch: IResourceFetch; - filesPath: string = ""; // data/data/包名/files目录 + memoryCache: MemoryLruCache; + diskMemoryCache: DiskLruCache; + dataFetch: IDataFetch; + resourceFetch: IResourceFetch; + filesPath: string = ""; // data/data/包名/files目录 - placeholderCache: string = "placeholderCache" - runningRequest: Array; - pendingRequest: Array; - fileTypeUtil: FileTypeUtil; // 通用文件格式辨别 - diskCacheFolder: string = "ImageKnifeDiskCache" - - - defaultListener: AsyncCallback = { - callback:(err: string, data: ImageKnifeData)=>{return false} + placeholderCache: string = "placeholderCache" + runningMaps: EasyLinkedHashMap; + pendingMaps: EasyLinkedHashMap; + pausedMaps: EasyLinkedHashMap; + isPaused: boolean = false; + mutex: MethodMutex = new MethodMutex(); + fileTypeUtil: FileTypeUtil; // 通用文件格式辨别 + diskCacheFolder: string = "ImageKnifeDiskCache" + defaultListener: AsyncCallback = { + 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(100); + this.memoryCache = new MemoryLruCache(100); // 创建disk缓存 传入的size 为多少比特 比如20KB 传入20*1024 this.diskMemoryCache = DiskLruCache.create(ImageKnifeGlobal.getInstance().getHapContext()); @@ -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{ + getMemoryCache(): MemoryLruCache { 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; } @@ -129,7 +136,7 @@ export class ImageKnife { return ImageKnifeGlobal.getInstance().getHapContext(); } - setMemoryCache(lrucache: LruCache) { + setMemoryCache(lrucache: MemoryLruCache) { this.memoryCache = lrucache; } @@ -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) { - this.memoryCache = new LruCache(size); - }else{ - let newLruCache = new LruCache(size); - this.memoryCache.foreachLruCache( (value:ImageKnifeData, key:string, map:Object)=> { + public replaceLruCache(size: number) { + if (this.memoryCache.map.size() <= 0) { + this.memoryCache = new MemoryLruCache(size); + } else { + let newLruCache = new MemoryLruCache(size); + 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 { + // 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 resumeRequests(): Promise { + // 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() + ""; @@ -266,6 +331,12 @@ export class ImageKnife { let signature = request.signature; + if (signature != undefined) { + console.log("唯一标识：" + signature.getKey()) + } + + + cacheKey = factories.generateMemoryCacheKey(loadKey,size,transformed,dontAnimateFlag,signature); // 生成磁盘缓存变换后数据key 变换后数据保存在磁盘 @@ -283,120 +354,135 @@ 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) { + if(tailNode != null && tailNode.value != null) { + 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; } @@ -405,18 +491,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; @@ -425,7 +511,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..37d80b7 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,24 +82,30 @@ export struct ImageKnifeComponent { private onReadyNext?: (data:ImageKnifeData|number|undefined) => void = undefined private onReadyNextData:ImageKnifeData|number|undefined = undefined + private detachFromLayout:DetachFromLayout|undefined = undefined; + build() { Canvas(this.context) .width('100%') .height('100%') .onAreaChange((oldValue: Area, newValue: Area) => { - this.currentWidth = newValue.width as number - this.currentHeight = newValue.height as number - if (this.currentWidth <= 0 || this.currentHeight <= 0) { - // 存在宽或者高为0,此次重回无意义,无需进行request请求 - } else { - // 前提：宽高值均有效,值>0. 条件1：当前宽高与上一次宽高不同 条件2:当前是第一次绘制 - if ((this.currentHeight != this.lastHeight || this.currentWidth != this.lastWidth) || this.firstDrawFlag) { - this.firstDrawFlag = false; - LogUtil.log('ImageKnifeComponent onAreaChange And Next To Execute. Canvas currentWidth =' + this.currentWidth + ' currentHeight=' + this.currentHeight) - this.lastWidth = this.currentWidth - this.lastHeight = this.currentHeight - this.imageKnifeExecute() + if(newValue != undefined && newValue.width != undefined && newValue.height != undefined) { + this.currentWidth = newValue.width as number + this.currentHeight = newValue.height as number + if (this.currentWidth <= 0 || this.currentHeight <= 0) { + // 存在宽或者高为0,此次重回无意义,无需进行request请求 + } else { + // 前提：宽高值均有效,值>0. 条件1：当前宽高与上一次宽高不同 条件2:当前是第一次绘制 + if ((this.currentHeight != this.lastHeight || this.currentWidth != this.lastWidth) || this.firstDrawFlag) { + this.firstDrawFlag = false; + LogUtil.log('ImageKnifeComponent onAreaChange And Next To Execute. Canvas currentWidth =' + this.currentWidth + ' currentHeight=' + this.currentHeight) + this.lastWidth = this.currentWidth + this.lastHeight = this.currentHeight + this.imageKnifeExecute() + } } + }else{ + LogUtil.log('ImageKnifeComponent onAreaChange Error newValue is undefined') } }) .onReady(() => { @@ -275,6 +281,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 +428,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 +483,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 +498,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 +515,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 +529,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 +591,10 @@ export struct ImageKnifeComponent { aboutToDisappear() { LogUtil.log('ImageKnifeComponent aboutToDisappear happened!') + if(this.detachFromLayout != undefined){ + this.detachFromLayout.detach(); + } + this.resetGifData(); } @@ -601,7 +612,7 @@ export struct ImageKnifeComponent { } private drawLifeCycleHasConsumed( 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)[methodName]) { return (drawLifeCycle as Record)[methodName](context, data, imageKnifeOption, compWidth, compHeight, setGifTimeId) @@ -677,7 +688,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 +717,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 +859,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 +870,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 +880,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 +891,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 +902,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 +923,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/ImageKnifeData.ets b/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets index d291b67..2179d11 100644 --- a/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets +++ b/imageknife/src/main/ets/components/imageknife/ImageKnifeData.ets @@ -84,4 +84,45 @@ export class ImageKnifeData { isResource(): boolean { return ImageKnifeType.RESOURCE == this.imageKnifeType; } + + release(){ + if(this.isPixelMap()){ + if(this.drawPixelMap != undefined && this.drawPixelMap.imagePixelMap != undefined){ + this.drawPixelMap.imagePixelMap.release() + .then(()=>{ + if(this.drawPixelMap != undefined && this.drawPixelMap.imagePixelMap !=undefined){ + this.drawPixelMap.imagePixelMap = undefined; + } + }) + } + } + if(this.isGIFFrame()){ + if(this.drawGIFFrame != undefined){ + let gifFrames = this.drawGIFFrame.imageGIFFrames; + if(gifFrames != undefined){ + for (let i = 0; i < gifFrames.length; i++) { + let tempFrame = gifFrames[i]; + if(tempFrame.drawPixelMap != undefined){ + tempFrame.drawPixelMap.release() + } + } + this.drawGIFFrame.imageGIFFrames = undefined + } + } + } + + if(this.isString()){ + if(this.drawString != undefined && this.drawString.imageString!=undefined){ + this.drawString.imageString = undefined + } + } + + if(this.isResource()){ + if(this.drawResource != undefined && this.drawResource.imageResource != undefined){ + this.drawResource.imageResource = undefined + } + } + + } + } \ No newline at end of file diff --git a/imageknife/src/main/ets/components/imageknife/RequestOption.ets b/imageknife/src/main/ets/components/imageknife/RequestOption.ets index 14665ef..cd25be0 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( new RegExp("[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/compress/Engine.ets b/imageknife/src/main/ets/components/imageknife/compress/Engine.ets index 2a70970..5c2aa3a 100644 --- a/imageknife/src/main/ets/components/imageknife/compress/Engine.ets +++ b/imageknife/src/main/ets/components/imageknife/compress/Engine.ets @@ -98,10 +98,11 @@ export class Engine { } imageResource.createPixelMap(options) .then(bitmap => { - + imageResource.release() }) .catch((error: BusinessError) => { this.mCompressListener.onError("ptah createPixelMap fail,because error:" + JSON.stringify(error as BusinessError)) + imageResource.release() }) @@ -173,11 +174,13 @@ export class Engine { if (this.mCompressListener) { this.mCompressListener.onSuccess(bitmap, path); } + imageRes.release() }) .catch((error:BusinessError) => { if (this.mCompressListener) { this.mCompressListener.onError("buffer generated pixelMap fail,because error:" + JSON.stringify(error as BusinessError)) } + imageRes.release() }) } diff --git a/imageknife/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets b/imageknife/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets index f1eadc2..1329175 100644 --- a/imageknife/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets +++ b/imageknife/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets @@ -51,7 +51,10 @@ export class RecourseProvider extends CompressAdapter { .then(data => { let buffer = this.uint8ArrayToBuffer(data); let fileTypeUtil = new FileTypeUtil() - this._mPixelMapHeader = fileTypeUtil.getFileType(buffer); + let fileType = fileTypeUtil.getFileType(buffer); + if(fileType != null) { + this._mPixelMapHeader = fileType; + } callback.compressDataListener(buffer); }) .catch((err: BusinessError) => { diff --git a/imageknife/src/main/ets/components/imageknife/crop/Crop.ets b/imageknife/src/main/ets/components/imageknife/crop/Crop.ets index fa087f5..da7ded7 100644 --- a/imageknife/src/main/ets/components/imageknife/crop/Crop.ets +++ b/imageknife/src/main/ets/components/imageknife/crop/Crop.ets @@ -66,9 +66,11 @@ export namespace Crop { } else { func?.cropCallback("", data); } + imageSource.release() }) .catch((e:BusinessError) => { func?.cropCallback(e, null); + imageSource.release() }) } } diff --git a/imageknife/src/main/ets/components/imageknife/crop/PixelMapCrop.ets b/imageknife/src/main/ets/components/imageknife/crop/PixelMapCrop.ets index d01c282..a319dac 100644 --- a/imageknife/src/main/ets/components/imageknife/crop/PixelMapCrop.ets +++ b/imageknife/src/main/ets/components/imageknife/crop/PixelMapCrop.ets @@ -893,6 +893,7 @@ export class Options { if (readyCrop) { readyCrop(); } + imageSource.release() }) }); diff --git a/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets b/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets index 527d447..9732a7b 100644 --- a/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets +++ b/imageknife/src/main/ets/components/imageknife/holder/ErrorHolderManager.ets @@ -53,23 +53,28 @@ export class ErrorHolderManager { if (typeof res.id != 'undefined' && typeof res.id != 'undefined') { let resourceFetch = new ParseResClient(); let suc = (arraybuffer:ArrayBuffer) => { - let fileTypeUtil:FileTypeUtil = new FileTypeUtil(); - let typeValue:string = fileTypeUtil.getFileType(arraybuffer); - switch (typeValue) { - case SupportFormat.svg: - this.svgProcess(onComplete, onError, arraybuffer, typeValue) - break; - case SupportFormat.jpg: - case SupportFormat.png: - case SupportFormat.bmp: - case SupportFormat.gif: - case SupportFormat.tiff: - case SupportFormat.webp: - this.mediaImageProcess(onComplete, onError, arraybuffer, typeValue) - break; - default: - onError("ErrorHolderManager 文件类型不支持") - break; + let fileTypeUtil: FileTypeUtil = new FileTypeUtil(); + + let typeValue: string | null = fileTypeUtil.getFileType(arraybuffer); + if (typeValue != null) { + switch (typeValue) { + case SupportFormat.svg: + this.svgProcess(onComplete, onError, arraybuffer, typeValue) + break; + case SupportFormat.jpg: + case SupportFormat.png: + case SupportFormat.bmp: + case SupportFormat.gif: + case SupportFormat.tiff: + case SupportFormat.webp: + this.mediaImageProcess(onComplete, onError, arraybuffer, typeValue) + break; + default: + onError("ErrorHolderManager 文件类型不支持") + break; + } + }else{ + onError("ErrorHolderManager 文件类型为null,请检查数据源arraybuffer") } } resourceFetch.loadResource(res, suc, onError) diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets index 820073b..114216e 100644 --- a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets +++ b/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets @@ -15,16 +15,19 @@ 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'; import { ImageKnifeGlobal } from '../ImageKnifeGlobal' import common from '@ohos.app.ability.common' +import { NetworkDownloadClient } from './NetworkDownloadClient' // 数据加载器 export class DownloadClient implements IDataFetch { - private networkClient = new NetworkDownloadClient(); + private networkDownloadClient = new NetworkDownloadClient(); + private httpDownloadClient = new HttpDownloadClient(); private localFileClient = new LoadLocalFileClient(); private dataShareFileClient = new LoadDataShareFileClient(); @@ -41,7 +44,7 @@ export class DownloadClient implements IDataFetch { this.dataShareFileClient.loadData(request, onCompleteFunction, onErrorFunction) } else { // 网络下载 - this.networkClient.loadData(request, onCompleteFunction, onErrorFunction) + this.networkDownloadClient.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..e9be823 --- /dev/null +++ b/imageknife/src/main/ets/components/imageknife/networkmanage/HttpDownloadClient.ets @@ -0,0 +1,110 @@ +/* + * 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) => { + // 下载进度 + if(data != undefined && (typeof data.receiveSize == 'number') && (typeof data.totalSize == 'number') ) { + 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 { + onError(`HttpDownloadClient has error, http code = ${data}`) + } + } + ) + } 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..a7615ba 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 @@ -431,7 +433,12 @@ export class RequestManager { // 步骤二: 文件名保存一份全局 // 步骤三:查看文件是否支持 非支持类型直接返回 let fileTypeUtil = new FileTypeUtil(); - let filetype = fileTypeUtil.getFileType(source); + let filetype:string|null = fileTypeUtil.getFileType(source); + if(filetype == null){ + onError("下载文件解析后类型为null,请检查数据源！"); + return; + } + if (!fileTypeUtil.isImage(source)) { onError("暂不支持 下载文件类型！类型=" + filetype); return; @@ -471,11 +478,15 @@ export class RequestManager { if (this.options.transformations[0]) { // thumbnail 缩略图部分 if (this.options.thumbSizeMultiplier) { - this.thumbnailProcess(source, filetype, onComplete, onError); + if(filetype != null) { + this.thumbnailProcess(source, filetype, onComplete, onError); + } } else { this.options.transformations[0].transform(source, this.options, {asyncTransform: (error:BusinessError|string, pixelMap: PixelMap|null) => { if (pixelMap) { - this.saveCacheAndDisk(pixelMap, filetype, onComplete, source); + if(filetype != null) { + this.saveCacheAndDisk(pixelMap, filetype, onComplete, source); + } } else { onError(error); } @@ -493,13 +504,17 @@ export class RequestManager { this.mParseImageUtil.parseImageThumbnail(this.options.thumbSizeMultiplier, source, thumbSuccess, thumbError); setTimeout(() => { let success = (value: PixelMap) => { - this.saveCacheAndDisk(value, filetype, onComplete, source); + if(filetype != null) { + this.saveCacheAndDisk(value, filetype, onComplete, source); + } } this.mParseImageUtil.parseImage(source, success, onError) }, this.options.thumbDelayTime) } else { let success = (value: PixelMap) => { - this.saveCacheAndDisk(value, filetype, onComplete, source); + if(filetype != null) { + this.saveCacheAndDisk(value, filetype, onComplete, source); + } } this.mParseImageUtil.parseImage(source, success, onError) } diff --git a/imageknife/src/main/ets/components/imageknife/transform/BlurTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/BlurTransformation.ets index b309333..a8c3099 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/BlurTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/BlurTransformation.ets @@ -74,11 +74,13 @@ export class BlurTransformation implements BaseTransform { } else { fastBlur.blur(data, this._mRadius, true, func); } + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); + imageSource.release() func?.asyncTransform(e, null); - }) + }) }}) } } \ No newline at end of file diff --git a/imageknife/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets index a333210..a63feb8 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/BrightnessFilterTransformation.ets @@ -76,7 +76,7 @@ export class BrightnessFilterTransformation implements BaseTransform { } } let data = await imageSource.createPixelMap(options); - + imageSource.release() let bufferData = new ArrayBuffer(data.getPixelBytesNumber()); await data.readPixelsToBuffer(bufferData); diff --git a/imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets index 11d9946..f45a369 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/ContrastFilterTransformation.ets @@ -89,7 +89,7 @@ export class ContrastFilterTransformation implements BaseTransform { } let data = await imageSource.createPixelMap(options); - + imageSource.release() let bufferData = new ArrayBuffer(data.getPixelBytesNumber()); await data.readPixelsToBuffer(bufferData); diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets index 239810d..f84be78 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/CropCircleTransformation.ets @@ -75,12 +75,14 @@ export class CropCircleTransformation implements BaseTransform { imageSource.createPixelMap(options) .then((p:PixelMap) => { this.transformCircle(p, func); + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + CropCircleTransformation.TAG + " transform e:" + e); if (func!=undefined) { func?.asyncTransform(Constants.PROJECT_TAG + CropCircleTransformation.TAG + "e" + e, null); } + imageSource.release() }) } diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets index 183c47e..8972c84 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/CropCircleWithBorderTransformation.ets @@ -93,12 +93,14 @@ export class CropCircleWithBorderTransformation implements BaseTransform { this.transformPixelMap(pixelMap, outWith, outHeight, func); + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + ";CropCircleWithBorderTransformation e:" + e); if (func!=undefined) { func?.asyncTransform(Constants.PROJECT_TAG + ";CropCircleWithBorderTransformation e:" + e, null); } + imageSource.release() }) } diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets index 05b33aa..ca84913 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/CropSquareTransformation.ets @@ -73,11 +73,13 @@ export class CropSquareTransformation implements BaseTransform { if (func != undefined) { func?.asyncTransform("", data); } + imageSource.release() }) .catch((e:BusinessError) => { if (func != undefined) { func?.asyncTransform(Constants.PROJECT_TAG + ";CropSquareTransformation e:" + e, null); } + imageSource.release() }) }) .catch((error:BusinessError) => { diff --git a/imageknife/src/main/ets/components/imageknife/transform/CropTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/CropTransformation.ets index d98f56f..416af67 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/CropTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/CropTransformation.ets @@ -83,9 +83,11 @@ export class CropTransformation implements BaseTransform { imageSource.createPixelMap(options) .then((data:PixelMap) => { func?.asyncTransform("", data); + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); + imageSource.release() func?.asyncTransform(e, null); }) }}) diff --git a/imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets index fc23f74..fb4ca87 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/GrayscaleTransformation.ets @@ -68,7 +68,7 @@ export class GrayscaleTransformation implements BaseTransform { } } let data:PixelMap= await imageSource.createPixelMap(options); - + imageSource.release() let bufferData = new ArrayBuffer(data.getPixelBytesNumber()); let bufferNewData = new ArrayBuffer(data.getPixelBytesNumber()); await data.readPixelsToBuffer(bufferData); diff --git a/imageknife/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets index 7fcefc0..c8a3e8c 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/InvertFilterTransformation.ets @@ -77,7 +77,7 @@ export class InvertFilterTransformation implements BaseTransform { } let data:PixelMap = await imageSource.createPixelMap(options); - + imageSource.release() let bufferData = new ArrayBuffer(data.getPixelBytesNumber()); await data.readPixelsToBuffer(bufferData); diff --git a/imageknife/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets b/imageknife/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets index edc89a7..2ecefa9 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/KuwaharaFilterTransform.ets @@ -79,10 +79,12 @@ export class KuwaharaFilterTransform implements BaseTransform { imageSource.createPixelMap(options) .then((data) => { this.kuwahara(data, targetWidth, targetHeight, func); + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); func?.asyncTransform(e, null); + imageSource.release() }) }}) } diff --git a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets index 4c04a40..d02ff33 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/MaskTransformation.ets @@ -79,9 +79,11 @@ export class MaskTransformation implements BaseTransform { imageSource.createPixelMap(options) .then(data => { this.openInternal(data, targetWidth, targetHeight, func) + imageSource.release() }) .catch((e:BusinessError )=> { func?.asyncTransform(e, null); + imageSource.release() }) } diff --git a/imageknife/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets index 7c45c72..ff67eba 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/PixelationFilterTransformation.ets @@ -80,9 +80,11 @@ export class PixelationFilterTransformation implements BaseTransform { } else { pixelUtils.pixel(data, this._mPixel, func); } + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); + imageSource.release(); func?.asyncTransform(e, null); }) }}) diff --git a/imageknife/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets index 00f35a5..6286720 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/RotateImageTransformation.ets @@ -70,9 +70,11 @@ export class RotateImageTransformation implements BaseTransform { imageSource.createPixelMap(options) .then((data) => { func?.asyncTransform("", data); + imageSource.release() }) .catch((e:BusinessError) => { LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); + imageSource.release() func?.asyncTransform(e, null); }) }}) diff --git a/imageknife/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets index 097ab06..74bd119 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/RoundedCornersTransformation.ets @@ -113,8 +113,10 @@ export class RoundedCornersTransformation implements BaseTransform { if (func != undefined && this.mTransform_pixelMap != undefined) { func?.asyncTransform("", this.mTransform_pixelMap); } + imageSource.release() }) .catch((error:BusinessError) => { + imageSource.release() LogUtil.log(Constants.PROJECT_TAG + "RoundedCornersTransformation error:" + error); }); }) diff --git a/imageknife/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets index 72fbe75..87380d0 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/SepiaFilterTransformation.ets @@ -73,7 +73,7 @@ export class SepiaFilterTransformation implements BaseTransform { } } let data:PixelMap = await imageSource.createPixelMap(options); - + imageSource.release(); let bufferData = new ArrayBuffer(data.getPixelBytesNumber()); await data.readPixelsToBuffer(bufferData); diff --git a/imageknife/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets index 1b3d72d..25d6f6c 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/SketchFilterTransformation.ets @@ -66,9 +66,11 @@ export class SketchFilterTransformation implements BaseTransform { } else { CalculatePixelUtils.sketch(data, func); } + imageSource.release() }) .catch((e:BusinessError) => { func?.asyncTransform(e, null); + imageSource.release() }) }}) } diff --git a/imageknife/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets b/imageknife/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets index bc2b174..5681f1e 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/SwirlFilterTransformation.ets @@ -81,8 +81,10 @@ export class SwirlFilterTransformation implements BaseTransform { imageSource.createPixelMap(options) .then((data) => { this.swirl(data, this.radius, request, func); + imageSource.release(); }) .catch((e:BusinessError) => { + imageSource.release(); func?.asyncTransform(e, null); }) }}) diff --git a/imageknife/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets b/imageknife/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets index 7c7d83d..cb75d92 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/ToonFilterTransform.ets @@ -83,9 +83,11 @@ export class ToonFilterTransform implements BaseTransform { } imageSource.createPixelMap(options) .then((data) => { + imageSource.release() this.toon(data, targetWidth, targetHeight, func); }) .catch((e:BusinessError) => { + imageSource.release() LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); func?.asyncTransform(e, null); }) diff --git a/imageknife/src/main/ets/components/imageknife/transform/TransformUtils.ets b/imageknife/src/main/ets/components/imageknife/transform/TransformUtils.ets index 1cd859f..a0876ac 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/TransformUtils.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/TransformUtils.ets @@ -63,7 +63,9 @@ export class TransformUtils { editable: true, rotate: degreesToRotate } - return imageSource.createPixelMap(options); + let promise:Promise = imageSource.createPixelMap(options); + imageSource.release() + return promise; } static centerInside(buf: ArrayBuffer, outWidth: number, outHeihgt: number, @@ -74,7 +76,9 @@ export class TransformUtils { let pw = p.size.width; let ph = p.size.height; if (pw <= outWidth && ph <= outHeihgt) { - callback?.asyncTransform('', imageSource.createPixelMap()); + let promise:Promise = imageSource.createPixelMap() + imageSource.release() + callback?.asyncTransform('', promise); } else { TransformUtils.fitCenter(buf, outWidth, outHeihgt, callback); } @@ -112,7 +116,9 @@ export class TransformUtils { desiredSize: { width: targetWidth, height: targetHeight } } if (callback) { - callback.asyncTransform('', imageSource.createPixelMap(options)); + let promise:Promise = imageSource.createPixelMap(options); + imageSource.release(); + callback.asyncTransform('', promise); } }) .catch((e:BusinessError) => { diff --git a/imageknife/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets b/imageknife/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets index c49897d..d1937ce 100644 --- a/imageknife/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets +++ b/imageknife/src/main/ets/components/imageknife/transform/VignetteFilterTransform.ets @@ -88,8 +88,10 @@ export class VignetteFilterTransform implements BaseTransform { imageSource.createPixelMap(options) .then((data) => { this.vignette(data, targetWidth, targetHeight, func); + imageSource.release(); }) .catch((e:BusinessError) => { + imageSource.release() LogUtil.log(Constants.PROJECT_TAG + ";error:" + e); func?.asyncTransform(e, null); }) diff --git a/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets b/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets index 21e28c7..3dee67c 100644 --- a/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets +++ b/imageknife/src/main/ets/components/imageknife/utils/FileTypeUtil.ets @@ -12,143 +12,90 @@ * 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 = new Map(); - 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> = { + // 添加文件类型和对应的文件头部特征 + '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 = 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 = 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); + let hasMatched = false; + let matchedFileType = '' + Object.keys(this.fileSignatureMap).map((fileType)=>{ + if(!hasMatched) { + const bufferList = this.fileSignatureMap[fileType]; + for (let i = 0; i < bufferList.length; i++) { + let signature = bufferList[i]; + if (this.matchesSignature(fileData, signature)) { + hasMatched = true; + matchedFileType = fileType; + break + } + } + }else{ + // 由于map函数会输出所有的keys, 所以匹配之后不再需要执行任何逻辑 + } + }) + if(hasMatched){ + return matchedFileType; + } + 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/ParseImageUtil.ets b/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets index a4264f6..9e43f20 100644 --- a/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets +++ b/imageknife/src/main/ets/components/imageknife/utils/ParseImageUtil.ets @@ -48,6 +48,7 @@ export class ParseImageUtil implements IParseImage { } else { onCompleteFunction(pixelmap); } + imageSource.release() }) }) 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..cd427ec --- /dev/null +++ b/imageknife/src/main/ets/components/imageknife/utils/base/EasyLinkedHashMap.ets @@ -0,0 +1,134 @@ +/* + * 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 { + key: K; + value: V; + next: Node | null; + prev: Node | null; + + constructor(key: K, value: V) { + this.key = key; + this.value = value; + this.next = null; + this.prev = null; + } +} +// 链表的tail是最近访问,head是最晚访问,对顺序有要求需要访问tail +export class EasyLinkedHashMap { + private map: Map>; // 存储键值对的哈希映射 + private head: Node | null; // 链表头节点 + private tail: Node | null; // 链表尾节点 + + constructor() { + this.map = new Map>(); + 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) { + 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) { + 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; + } +} \ 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; + private release: () => void; + + constructor() { + this.mutex = Promise.resolve(); + this.release = () => {}; + } + + async lock(fn: () => Promise): Promise { + await this.mutex; + let result: T; + + try { + this.mutex = new Promise((resolve) => { + this.release = resolve; + }); + result = await fn(); + } finally { + this.release(); + } + + return result; + } +} \ No newline at end of file diff --git a/oh-package.json5 b/oh-package.json5 index ae1792c..1c72940 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,6 @@ "name": "imageknife", "description": "example description", "repository": {}, - "version": "2.1.1-rc.0", + "version": "2.1.1-rc.1", "dependencies": {} } From 8f679a2293717e48f0686003d850be2e312d034a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=8E=E6=9C=88=E6=B8=85=E9=A3=8E?= <2928139825@qq.com> Date: Tue, 14 Nov 2023 10:21:34 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=EF=BC=9A=20-=20gif=E8=A7=A3=E7=A0=81=E6=94=B9=E4=B8=BAimageSou?= =?UTF-8?q?rce=E8=A7=A3=E7=A0=81,=E4=B8=8D=E5=9C=A8=E5=AF=B9worker?= =?UTF-8?q?=E5=BC=BA=E4=BE=9D=E8=B5=96=20-=20=E4=B8=8B=E8=BD=BD=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9=E4=B8=BAhttp.requestInStream?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 明月清风 <2928139825@qq.com> --- CHANGELOG.md | 5 + imageknife/oh-package.json5 | 2 +- .../networkmanage/DownloadClient.ets | 3 +- .../imageknife/utils/gif/GIFParseImpl.ets | 170 ++++-------------- 4 files changed, 44 insertions(+), 136 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae32f59..b10d543 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.1.1-rc.2 + +- gif解码改为imageSource解码,不在对worker强依赖 +- 下载接口修改为http.requestInStream + ## 2.1.1-rc.1 - 新增自定义key参数配置 diff --git a/imageknife/oh-package.json5 b/imageknife/oh-package.json5 index 35048fb..3abed28 100644 --- a/imageknife/oh-package.json5 +++ b/imageknife/oh-package.json5 @@ -14,7 +14,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/ImageKnife", "type": "module", - "version": "2.1.1-rc.1", + "version": "2.1.1-rc.2", "dependencies": { "@ohos/disklrucache": "^2.0.2-rc.0", "@ohos/svg": "^2.1.1-rc.0", diff --git a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets b/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets index 114216e..089121a 100644 --- a/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets +++ b/imageknife/src/main/ets/components/imageknife/networkmanage/DownloadClient.ets @@ -44,7 +44,8 @@ export class DownloadClient implements IDataFetch { this.dataShareFileClient.loadData(request, onCompleteFunction, onErrorFunction) } else { // 网络下载 - this.networkDownloadClient.loadData(request, onCompleteFunction, onErrorFunction) + // this.networkDownloadClient.loadData(request, onCompleteFunction, onErrorFunction) + this.httpDownloadClient.loadData(request, onCompleteFunction, onErrorFunction) } } } diff --git a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets b/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets index 9cd5390..6f2e5d8 100644 --- a/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets +++ b/imageknife/src/main/ets/components/imageknife/utils/gif/GIFParseImpl.ets @@ -14,11 +14,7 @@ */ import { IParseGif } from './IParseGif' import { Dims, GIFFrame } from './GIFFrame' -import { LoadType } from '../../../../../../../GifWorker' -import { parseBufferToFrame } from './parse/GIFParse' -import { LogUtil } from '../../utils/LogUtil' import image from '@ohos.multimedia.image' -import { ImageKnifeGlobal } from '../../ImageKnifeGlobal' import { BusinessError } from '@ohos.base' import worker, { ErrorEvent, MessageEvents } from '@ohos.worker'; @@ -35,143 +31,49 @@ export interface gifBackData{ transparentIndex:number[] } export class GIFParseImpl implements IParseGif { + // parseGifs(imageinfo: ArrayBuffer, callback: (data?:GIFFrame[], err?:BusinessError|string) => void, worker?:worker.ThreadWorker,runMainThread?:boolean) { - let resolveWorker = worker; - LogUtil.log('parseGifs resolveWorker1 is null =' + (resolveWorker == null)) - if (!resolveWorker && ImageKnifeGlobal.getInstance().getImageKnife() != undefined) { - resolveWorker = ImageKnifeGlobal.getInstance().getImageKnife()?.getGifWorker(); + // 硬解码流程 + let imageSource = image.createImageSource(imageinfo); + let decodeOpts: image.DecodingOptions = { + sampleSize: 1, + editable: true, + rotate: 0 } - LogUtil.log('parseGifs resolveWorker2 is null =' + (resolveWorker == null)) - - if (!!resolveWorker && !runMainThread) { - LogUtil.log('parseGifs in worker thread!') - let copyBuffer = imageinfo.slice(0); - this.useWorkerParse(resolveWorker, copyBuffer, (data, err) => { - if (err) { - callback(undefined, err) - } else { - if (data != undefined) { - this.createPixelMapAll(data).then((pixelmaps) => { - if (pixelmaps.length == data.length) { - for (let i = 0;i < data.length; i++) { - let frame = data[i]; - frame['drawPixelMap'] = pixelmaps[i]; - frame['patch'] = undefined; - } - callback(data, undefined) + let data:GIFFrame[] = []; + imageSource.createPixelMapList(decodeOpts).then((pixelList: Array) => { + //sdk的api接口发生变更：从.getDelayTime() 变为.getDelayTimeList() + imageSource.getDelayTimeList().then(delayTimes => { + if (pixelList.length > 0) { + let pixelmap1 = pixelList[0]; + pixelmap1.getImageInfo().then(imageInfo => { + for (let i = 0; i < pixelList.length; i++) { + let frame = new GIFFrame(); + frame.drawPixelMap = pixelList[i]; + frame.dims = { width: imageInfo.size.width, height: imageInfo.size.height, top: 0, left: 0 } + if (i < delayTimes.length) { + frame.delay = delayTimes[i]; + } else { + frame.delay = delayTimes[delayTimes.length - 1] } - }).catch((err: BusinessError) => { - callback(undefined, err) - }) - }else{ - callback(undefined, 'GIF Parse Error callback data is undefined') - } + data.push(frame) + } + callback(data,undefined) + imageSource.release(); + }).catch((err: string) => { + imageSource.release(); + callback(undefined,err) + }) } + }).catch((err: string) => { + imageSource.release(); + callback(undefined,err) }) - } else { - LogUtil.log('parseGifs in main thread!') - let frames = parseBufferToFrame(imageinfo) - LogUtil.log('frames length =' + frames.length) - this.createPixelMapAll(frames).then((pixelmaps) => { - if (pixelmaps.length == frames.length) { - for (let i = 0;i < frames.length; i++) { - let frame = frames[i]; - frame['drawPixelMap'] = pixelmaps[i]; - frame['patch'] = undefined; - } - LogUtil.log('parseGifs in main thread! callback is done!') - callback(frames, undefined) - } - }).catch((err:BusinessError) => { - LogUtil.log('parseGifs in main thread! err =' + err) - callback(undefined, err) - }) - } - } - - private createPixelMapAll(frames:GIFFrame[]): Promise { - let promises:Promise[] = new Array(); - let filterCriteria = (item:GIFFrame) => { - if (!item['drawPixelMap']) { - return true; - } - return false; - } - frames.filter(filterCriteria, frames).flatMap((frame:GIFFrame) => { - if(frame.patch != undefined) { - promises.push(image.createPixelMap(frame.patch.buffer, { - 'size': { - 'height': frame.dims.height as number, - 'width': frame.dims.width as number - } - })) - } + }).catch((err: string) => { + imageSource.release(); + callback(undefined,err) }) - return Promise.all(promises) - } - - private useWorkerParse(worker:worker.ThreadWorker, buffer: ArrayBuffer, callback: (data?:GIFFrame[], err?:BusinessError|string) => void) { - - worker.onerror = (err:ErrorEvent)=>{ - callback(undefined, err.message) - } - - worker.onmessageerror = (event: MessageEvents) => { - callback(undefined, event.type) - } - - worker.onexit = ()=> { - LogUtil.log('gifWork worker.onexit!') - } - - worker.onmessage = (e: MessageEvents) => { - let data:Record = e.data; - switch (data.type as string) { - case LoadType.loadBufferByWorker: - let pages:gifBackData = (data.data as gifBackData); - if (this.gifDecodeCorrect(pages)) { - let images = this.recDecodedData(pages); - callback(images, undefined) - } else { - callback(undefined, 'GIF Worker Decoder Data Is Error!') - } - break; - default: - break - } - } - - let obj:senderData = { type: LoadType.loadBufferByWorker, data: buffer } - worker.postMessage(obj, [buffer]) } - private gifDecodeCorrect(frames:gifBackData) { - if ( - (frames.patch.length == frames.dims.length) && - (frames.patch.length == frames.delay.length) && - (frames.patch.length == frames.disposalType.length) && - (frames.patch.length == frames.patch.length) && - (frames.patch.length == frames.transparentIndex.length) - ) { - return true; - } - return false; - } - - // 子线程数据回传处理 - private recDecodedData(pages:gifBackData): GIFFrame[] { - let images:GIFFrame[] = new Array() - for (let i = 0; i < pages.patch.length; i++) { - let frame = new GIFFrame(); - frame['dims'] = pages.dims[i] - frame['delay'] = pages.delay[i] - frame['disposalType'] = pages.disposalType[i] - let uint8ClampedArray = new Uint8ClampedArray(pages.patch[i]) - frame['patch'] = uint8ClampedArray - frame['transparentIndex'] = pages.transparentIndex[i] - images.push(frame) - } - return images; - } } \ No newline at end of file From 980be617ba30f747dbbb47020f8af3b639ebcfa1 Mon Sep 17 00:00:00 2001 From: zhoulisheng <635547767@qq.com> Date: Wed, 15 Nov 2023 10:52:00 +0800 Subject: [PATCH 4/6] =?UTF-8?q?1.ImageKnife=E6=96=B0=E5=A2=9E=E6=9A=82?= =?UTF-8?q?=E5=81=9C=E5=8A=A0=E8=BD=BD=E5=85=A8=E5=B1=80=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=EF=BC=8C=E6=81=A2=E5=A4=8D=E5=8A=A0=E8=BD=BD=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=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> --- AppScope/app.json5 | 2 +- CHANGELOG.md | 5 + README.md | 12 ++- entry/oh-package.json5 | 2 +- .../ets/pages/imageknifeTestCaseIndex.ets | 5 + .../src/main/ets/pages/manyPhotoShowPage.ets | 30 ------ .../ets/pages/photosPausedResumedPage.ets | 93 +++++++++++++++++++ .../resources/base/profile/main_pages.json | 1 + imageknife/oh-package.json5 | 2 +- .../ets/components/imageknife/ImageKnife.ets | 92 +++++++++--------- .../components/imageknife/RequestOption.ets | 2 +- oh-package.json5 | 2 +- 12 files changed, 162 insertions(+), 86 deletions(-) create mode 100644 entry/src/main/ets/pages/photosPausedResumedPage.ets diff --git a/AppScope/app.json5 b/AppScope/app.json5 index e357c41..70b8318 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "com.openharmony.imageknife", "vendor": "example", "versionCode": 1000000, - "versionName": "2.1.1-rc.1", + "versionName": "2.1.1-rc.2", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index ae32f59..d041e2b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.1.1-rc.2 + +- 门面类ImageKnife新增pauseRequests接口,全局暂停请求 +- 门面类ImageKnife新增resumeRequests接口,全局恢复暂停 + ## 2.1.1-rc.1 - 新增自定义key参数配置 diff --git a/README.md b/README.md index 32cb3bc..1413482 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ohpm install @ohos/imageknife "author": "", "license": "", "dependencies": { - "@ohos/imageknife": "^2.1.1-rc.1" + "@ohos/imageknife": "^2.1.1-rc.2" } } ``` @@ -462,15 +462,17 @@ request.skipMemoryCache(true) | skipMemoryCache(skip: boolean) | skip: boolean | 配置是否跳过内存缓存 | | retrieveDataFromCache(flag: boolean) | flag: boolean | 配置仅从缓存中加载数据 | | signature | ObjectKey | 自定义key | - + 同时支持[图片变换相关](#图片变换相关)接口。 ### ImageKnife 启动器/门面类 -| 方法名 | 入参 | 接口描述 | -|---------------------------------|------------------------|-------------------| -| call(request: RequestOption) | request: RequestOption | 根据用户配置参数具体执行加载流程 | +| 方法名 | 入参 | 接口描述 | +| ------------------------------- | ---------------------- | ---------------------------------- | +| call(request: RequestOption) | request: RequestOption | 根据用户配置参数具体执行加载流程 | | preload(request: RequestOption) | request: RequestOption | 根据用户配置参数具体执行预加载流程 | +| pauseRequests() | | 全局暂停请求 | +| resumeRequests() | | 全局恢复暂停 | ### 缓存策略相关 diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index fcbc00a..1782274 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.1.1-rc.1", + "version": "2.1.1-rc.2", "dependencies": { "@ohos/imageknife": "file:../imageknife", "@ohos/disklrucache": "^2.0.2-rc.0" diff --git a/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets b/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets index 5683d4d..e5130b5 100644 --- a/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets +++ b/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets @@ -220,6 +220,11 @@ struct IndexFunctionDemo { console.log("pages/manyPhotoShowPage 页面跳转") router.pushUrl({ url: "pages/manyPhotoShowPage" }); }).margin({ top: 15 }) + Button("图片加载暂停和恢复") + .onClick(() => { + console.log("pages/manyPhotoShowPage 页面跳转") + router.pushUrl({ url: "pages/photosPausedResumedPage" }); + }).margin({ top: 15 }) Button("部分url测试") .onClick(() => { console.log("pages/tempUrlTestPage 页面跳转") diff --git a/entry/src/main/ets/pages/manyPhotoShowPage.ets b/entry/src/main/ets/pages/manyPhotoShowPage.ets index c5d9a37..570a80f 100644 --- a/entry/src/main/ets/pages/manyPhotoShowPage.ets +++ b/entry/src/main/ets/pages/manyPhotoShowPage.ets @@ -31,36 +31,6 @@ 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.resumeRequests() - // } - // }) - // - // Button('设置磁盘存储为50M') - // .margin({top:10,bottom:5}) - // .onClick(()=>{ - // if(ImageKnifeGlobal.getInstance().getImageKnife() != undefined) { - // let disk: DiskLruCache | undefined = (ImageKnifeGlobal.getInstance().getImageKnife())?.getDiskMemoryCache(); - // if(disk != undefined) { - // disk.setMaxSize(50 * 1024 * 1024) - // Prompt.showToast({ message: "设置成功" }) - // } - // } - // }) - List({ space: 20, scroller: this.elementScroller }) { LazyForEach(this.data, (item: Material, index) => { ListItem() { diff --git a/entry/src/main/ets/pages/photosPausedResumedPage.ets b/entry/src/main/ets/pages/photosPausedResumedPage.ets new file mode 100644 index 0000000..9379057 --- /dev/null +++ b/entry/src/main/ets/pages/photosPausedResumedPage.ets @@ -0,0 +1,93 @@ +/* + * 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 {ImageKnifeComponent, ScaleType} from '@ohos/imageknife' +import {ImageKnifeOption} from '@ohos/imageknife' +import {ImageKnifeGlobal} from '@ohos/imageknife' +import {RotateImageTransformation} from '@ohos/imageknife' +import {Material} from './model/Material' +import {TestDataSource} from './model/TestDataSource' +import {DiskLruCache} from '@ohos/disklrucache' +import ArkWorker from '@ohos.worker' +import Prompt from '@system.prompt' +@Entry +@Component +struct photosPausedResumedPage { + private data: TestDataSource = new TestDataSource(); + + private elementScroller: Scroller = new Scroller() + + 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.resumeRequests() + } + }) + + + List({ space: 20, scroller: this.elementScroller }) { + LazyForEach(this.data, (item: Material, index) => { + ListItem() { + Column() { + Stack({ alignContent: Alignment.BottomEnd }) { + // 滤镜图片 + ImageKnifeComponent({ imageKnifeOption: { + loadSrc: item.thumbnail, + mainScaleType: ScaleType.FIT_XY, + } }) + } + .width(56).height(56) + //滤镜标题 + Text(item.name) + .fontSize(10) + .maxLines(1) + .fontColor(Color.White) + .textAlign(TextAlign.Center) + .layoutWeight(1) + .width('100%') + .backgroundColor(Color.Orange) + } + .width(56) + .height(72) + .clip(true) + .borderRadius(4) + } + }, (item: Material) => item.material_id) + } + .listDirection(Axis.Horizontal) + .width('100%') + .height(72) + + } + } + + + +} + + diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json index 87811b4..ea629cd 100644 --- a/entry/src/main/resources/base/profile/main_pages.json +++ b/entry/src/main/resources/base/profile/main_pages.json @@ -26,6 +26,7 @@ "pages/imageknifeTestCaseIndex", "pages/dataShareUriLoadPage", "pages/manyPhotoShowPage", + "pages/photosPausedResumedPage", "pages/tempUrlTestPage", "pages/drawFactoryTestPage", "pages/testSingleFrameGifPage", diff --git a/imageknife/oh-package.json5 b/imageknife/oh-package.json5 index 35048fb..3abed28 100644 --- a/imageknife/oh-package.json5 +++ b/imageknife/oh-package.json5 @@ -14,7 +14,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/ImageKnife", "type": "module", - "version": "2.1.1-rc.1", + "version": "2.1.1-rc.2", "dependencies": { "@ohos/disklrucache": "^2.0.2-rc.0", "@ohos/svg": "^2.1.1-rc.0", diff --git a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets index 151d060..57c7e3b 100644 --- a/imageknife/src/main/ets/components/imageknife/ImageKnife.ets +++ b/imageknife/src/main/ets/components/imageknife/ImageKnife.ets @@ -211,52 +211,52 @@ export class ImageKnife { return this.parseSource(request); } - // // 暂停所有请求 - // async pauseRequests(): Promise { - // 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 resumeRequests(): Promise { - // 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()) - // }) - // } + // 暂停所有请求 + async pauseRequests(): Promise { + await this.mutex.lock(async () => { + this.isPaused = true; + + // 将未删除的所有request [run pend] 放入 [pause] + this.pausedMaps.clear() + LogUtil.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(); + LogUtil.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() + LogUtil.log('dodo pauseRequests start3 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + ' pendMaps Size=' + this.pendingMaps.size()) + }) + } + + // 恢复所有被暂停的请求 + async resumeRequests(): Promise { + await this.mutex.lock(async () => { + this.isPaused = false; + LogUtil.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() + LogUtil.log('dodo resumeRequest start1 pausedMaps size=' + this.pausedMaps.size() + ' runMaps Size=' + this.runningMaps.size() + ' pendMaps Size=' + this.pendingMaps.size()) + }) + } // 删除 请求 remove(uuid: string) { diff --git a/imageknife/src/main/ets/components/imageknife/RequestOption.ets b/imageknife/src/main/ets/components/imageknife/RequestOption.ets index cd25be0..d7e7c3f 100644 --- a/imageknife/src/main/ets/components/imageknife/RequestOption.ets +++ b/imageknife/src/main/ets/components/imageknife/RequestOption.ets @@ -16,7 +16,7 @@ import {ImageKnife} from './ImageKnife' import { DiskStrategy } from "../cache/diskstrategy/DiskStrategy" import { AsyncCallback } from "../imageknife/interface/AsyncCallback" import { AsyncSuccess } from "../imageknife/interface/AsyncSuccess" -import { IAllCacheInfoCallback } from "../imageknife/interface/IAllCacheInfoCallback" +import { IAllCacheInfoCallback } from "../imageknife/interface/IAllCacheInfoCallback" import { AUTOMATIC } from "../cache/diskstrategy/enum/AUTOMATIC" import { BaseTransform } from "../imageknife/transform/BaseTransform" import { RotateImageTransformation } from "../imageknife/transform/RotateImageTransformation" diff --git a/oh-package.json5 b/oh-package.json5 index 1c72940..1b2a78a 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,6 @@ "name": "imageknife", "description": "example description", "repository": {}, - "version": "2.1.1-rc.1", + "version": "2.1.1-rc.2", "dependencies": {} } From 793c564a52ac19aa2d1bd4cf0ac466c3c5b2185c Mon Sep 17 00:00:00 2001 From: zhoulisheng <635547767@qq.com> Date: Wed, 15 Nov 2023 10:59:55 +0800 Subject: [PATCH 5/6] =?UTF-8?q?1.=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B72.1.1-rc.3,=E6=9B=B4=E6=96=B0CHANGELOG.md?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhoulisheng <635547767@qq.com> --- AppScope/app.json5 | 2 +- CHANGELOG.md | 5 +++++ README.md | 2 +- entry/oh-package.json5 | 2 +- imageknife/oh-package.json5 | 2 +- oh-package.json5 | 2 +- 6 files changed, 10 insertions(+), 5 deletions(-) diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 70b8318..0e7a6d4 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -3,7 +3,7 @@ "bundleName": "com.openharmony.imageknife", "vendor": "example", "versionCode": 1000000, - "versionName": "2.1.1-rc.2", + "versionName": "2.1.1-rc.3", "icon": "$media:app_icon", "label": "$string:app_name", "distributedNotificationEnabled": true diff --git a/CHANGELOG.md b/CHANGELOG.md index b10d543..4112ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 2.1.1-rc.3 + +- 门面类ImageKnife新增pauseRequests接口,全局暂停请求 +- 门面类ImageKnife新增resumeRequests接口,全局恢复暂停 + ## 2.1.1-rc.2 - gif解码改为imageSource解码,不在对worker强依赖 diff --git a/README.md b/README.md index 1413482..27f278e 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ ohpm install @ohos/imageknife "author": "", "license": "", "dependencies": { - "@ohos/imageknife": "^2.1.1-rc.2" + "@ohos/imageknife": "^2.1.1-rc.3" } } ``` diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 1782274..ee278ce 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.1.1-rc.2", + "version": "2.1.1-rc.3", "dependencies": { "@ohos/imageknife": "file:../imageknife", "@ohos/disklrucache": "^2.0.2-rc.0" diff --git a/imageknife/oh-package.json5 b/imageknife/oh-package.json5 index 3abed28..25e8865 100644 --- a/imageknife/oh-package.json5 +++ b/imageknife/oh-package.json5 @@ -14,7 +14,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/ImageKnife", "type": "module", - "version": "2.1.1-rc.2", + "version": "2.1.1-rc.3", "dependencies": { "@ohos/disklrucache": "^2.0.2-rc.0", "@ohos/svg": "^2.1.1-rc.0", diff --git a/oh-package.json5 b/oh-package.json5 index 1b2a78a..0194b78 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,6 @@ "name": "imageknife", "description": "example description", "repository": {}, - "version": "2.1.1-rc.2", + "version": "2.1.1-rc.3", "dependencies": {} } From 9ec574174a23898f4f5aa98731fd34f61d145354 Mon Sep 17 00:00:00 2001 From: zenggaofeng Date: Wed, 15 Nov 2023 17:16:23 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E5=A4=9A=E5=BC=A0=E7=BD=91=E7=BB=9C=E5=9B=BE=E7=89=87=E5=92=8C?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=A4=9A=E5=BC=A0gif=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=9A=84=E4=BD=8D=E7=BD=AE=E6=98=AF=E5=90=A6=E7=A8=B3=E5=AE=9A?= =?UTF-8?q?-=E6=A0=B7=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zenggaofeng --- .../ets/pages/imageknifeTestCaseIndex.ets | 11 ++ .../ets/pages/testManyGifLoadWithPage.ets | 108 ++++++++++++++++++ .../pages/testManyNetImageLoadWithPage.ets | 108 ++++++++++++++++++ .../resources/base/profile/main_pages.json | 4 +- 4 files changed, 230 insertions(+), 1 deletion(-) create mode 100644 entry/src/main/ets/pages/testManyGifLoadWithPage.ets create mode 100644 entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets diff --git a/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets b/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets index 5683d4d..f895a0b 100644 --- a/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets +++ b/entry/src/main/ets/pages/imageknifeTestCaseIndex.ets @@ -248,6 +248,17 @@ struct IndexFunctionDemo { router.pushUrl({ url: "pages/testGifLoadWithWorkerPage" }); }).margin({ top: 5, left: 3 }) }.width('100%').height(60).backgroundColor(Color.Pink) + Text("测试图片加载稳定").fontSize(15) + Flex({ direction: FlexDirection.Row, alignItems: ItemAlign.Center, justifyContent: FlexAlign.Center }) { + Button("测试多张网络图片加载速度") + .onClick(() => { + router.pushUrl({ url: "pages/testManyNetImageLoadWithPage" }); + }).margin({ top: 5, left: 3 }) + Button("测试多张gif加载位置") + .onClick(() => { + router.pushUrl({ url: "pages/testManyGifLoadWithPage" }); + }).margin({ top: 5, left: 3 }) + }.width('100%').height(60).backgroundColor(Color.Pink) } } .width('100%') diff --git a/entry/src/main/ets/pages/testManyGifLoadWithPage.ets b/entry/src/main/ets/pages/testManyGifLoadWithPage.ets new file mode 100644 index 0000000..89ad8a1 --- /dev/null +++ b/entry/src/main/ets/pages/testManyGifLoadWithPage.ets @@ -0,0 +1,108 @@ +/* + * 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 { ImageKnife, ImageKnifeComponent, ImageKnifeGlobal, ImageKnifeOption } from "@ohos/imageknife" +import worker from '@ohos.worker'; + +let gifUrl = "https://gw.alicdn.com/tfs/TB1E3H5t8Bh1e4jSZFhXXcC9VXa-198-198.gif" + +let data: string[] = [ + 'https://media.giphy.com/media/hVgagDPf1IRFK/giphy.gif', + 'https://placehold.co/600x400/000000/FFFFFF/png', + 'https://s1.aigei.com/src/img/gif/92/922f58ca46c34b3e9947ddd4dc17ec32.gif?imageMogr2/auto-orient/thumbnail/!282x282r/gravity/Center/crop/282x282/quality/85/&e=1735488000&token=P7S2Xpzfz11vAkASLTkfHN7Fw-oOZBecqeJaxypL:YRYJJynbOC0Z_Nl7HunjuRr4-Vk=', + 'https://placehold.co/600x400/000000/orange/png', + 'https://s1.aigei.com/src/img/gif/6c/6c907924ef1546d3a593fae3e78b97f6.gif?imageMogr2/auto-orient/thumbnail/!282x282r/gravity/Center/crop/282x282/quality/85/&e=1735488000&token=P7S2Xpzfz11vAkASLTkfHN7Fw-oOZBecqeJaxypL:PozGIimx0mj5m69DQ0Z6qWn7mA0=', + 'https://placehold.co/600x400/000000/orange/png?text=Hello+World' +] + +@Entry +@Component +struct TestManyGifLoadWithPage { + private globalGifWorker?: worker.ThreadWorker = undefined + @State p1: PixelMap | undefined = undefined + @State p2: PixelMap | undefined = undefined + @State workerOption: ImageKnifeOption = { + loadSrc: $r('app.media.icon'), + placeholderSrc: $r('app.media.icon_loading'), + errorholderSrc: $r('app.media.icon_failed') + }; + + build() { + Column() { + Text('gif Demo').align(Alignment.Center).fontSize(25).margin(10).fontWeight(FontWeight.Bolder) + Row() { + Column() { + Button('use Origin Image').align(Alignment.Center).fontSize(10).margin(2) + Image(gifUrl).width('100%').height(100).backgroundColor(Color.Blue).objectFit(ImageFit.Contain) + }.width('50%').backgroundColor(Color.Orange) + + Column() { + Button('use ImageKnifeComponent').align(Alignment.Center).fontSize(10).margin(2) + ImageKnifeComponent({ imageKnifeOption: { loadSrc: gifUrl } }) + .width('100%') + .height(100) + .backgroundColor(Color.Orange) + }.width('50%').backgroundColor(Color.Blue) + } + + Row() { + Column() { + Button('use Worker').align(Alignment.Center).fontSize(10).margin(2) + .onClick(() => { + this.workerOption = { + loadSrc: gifUrl, + placeholderSrc: $r('app.media.icon_loading'), + errorholderSrc: $r('app.media.icon_failed') + } + }) + ImageKnifeComponent({ imageKnifeOption: this.workerOption }) + .width('100%') + .height(100) + .backgroundColor(Color.Blue) + }.width('50%').backgroundColor(Color.Orange) + + Column() { + Button('logs').align(Alignment.Center).fontSize(10).margin(2) + Text('logs').width('100%').height(100).backgroundColor(Color.Orange) + }.width('50%').backgroundColor(Color.Blue) + } + + Grid() { + ForEach(data, (url: string) => { + GridItem(){ + ImageKnifeComponent({imageKnifeOption:{ + loadSrc:url + }}).backgroundColor(0x38393D).width(150).height(100) + } + }) + }.rowsGap(2) + .columnsGap(2) + }.width('100%').height('100%').backgroundColor(0xF1F3F5) + } + aboutToAppear(){ + this.globalGifWorker = new worker.ThreadWorker('entry/ets/workers/GifLoadWorker.ts',{ + type:'classic', + name:'ImageKnifeParseGIF' + }) + let imageKnife:ImageKnife | undefined = ImageKnifeGlobal.getInstance().getImageKnife() + if(imageKnife != undefined){ + imageKnife?.setGifWorker(this.globalGifWorker) + } + } + aboutToDisappear(){ + if(this.globalGifWorker){ + this.globalGifWorker.terminate() + } + } +} \ No newline at end of file diff --git a/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets b/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets new file mode 100644 index 0000000..180e286 --- /dev/null +++ b/entry/src/main/ets/pages/testManyNetImageLoadWithPage.ets @@ -0,0 +1,108 @@ +/* + * 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 { ScaleType, ImageKnifeComponent } from "@ohos/imageknife" + +class CommonDataSource implements IDataSource { + private dataArray: T[] = [] + private listeners: DataChangeListener[] = [] + + constructor(element: []) { + this.dataArray = element + } + + public getData(index: number) { + return this.dataArray[index] + } + + public totalCount(): number { + return this.dataArray.length + } + + public addData(index: number, data: T[]): void { + this.dataArray = this.dataArray.concat(data) + this.notifyDataAdd(index) + } + + unregisterDataChangeListener(listener: DataChangeListener): void { + const pos = this.listeners.indexOf(listener); + if (pos >= 0) { + this.listeners.splice(pos, 1); + } + } + + registerDataChangeListener(listener: DataChangeListener): void { + if (this.listeners.indexOf(listener) < 0) { + this.listeners.push(listener) + } + } + + notifyDataAdd(index: number): void { + this.listeners.forEach((listener: DataChangeListener) => { + listener.onDataAdd(index) + }) + } +} + +@Entry +@Component +struct TestManyNetImageLoadWithPage { + @State hotCommendList:CommonDataSource = new CommonDataSource([]) + private data:Array = [ + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/2159934215_1248_702.jpeg', + 'http://s.yingshidq.com.cn/imags/poster/2022/08/02/165937334218556809.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/4350315060_640_360.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/3835072893_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/2821936016_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/1311714870_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/4421772097_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/09/05/5898334347_400_225.png', + 'http://s.yingshidq.com.cn/imags/poster/2022/12/06/167031399911862707.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/1405851829_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/3796501624_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/4202181519_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/11/1449894622_1248_702.jpeg', + 'http://s.yingshidq.com.cn/cover/longbms/2023/08/10/3756558151_1248_702.jpeg' + ] + aboutToAppear() { + this.hotCommendList.addData(this.hotCommendList.totalCount(),this.data) + } + + build() { + Scroll() { + Column() { + Grid() { + LazyForEach(this.hotCommendList, (item: string) => { + GridItem() { + ImageKnifeComponent({ + imageKnifeOption: { + loadSrc: item, + placeholderSrc: $r('app.media.icon_loading'), + mainScaleType: ScaleType.CENTER_CROP, + placeholderScaleType: ScaleType.CENTER_CROP + } + }).width('100%').height('100%') + }.width('45%').height(200) + }, (item: string) => JSON.stringify(item)) + } + .columnsTemplate('1fr 1fr') + .columnsGap(8) + .rowsGap(10) + .width('100%') + .hitTestBehavior(HitTestMode.None) + .maxCount(10) + }.margin({ top: 5 }) + } + } +} \ No newline at end of file diff --git a/entry/src/main/resources/base/profile/main_pages.json b/entry/src/main/resources/base/profile/main_pages.json index 87811b4..cd0199c 100644 --- a/entry/src/main/resources/base/profile/main_pages.json +++ b/entry/src/main/resources/base/profile/main_pages.json @@ -31,6 +31,8 @@ "pages/testSingleFrameGifPage", "pages/testGifLoadWithWorkerPage", "pages/OptionTestPage", - "pages/SignatureTestPage" + "pages/SignatureTestPage", + "pages/testManyNetImageLoadWithPage", + "pages/testManyGifLoadWithPage" ] } \ No newline at end of file