From 4cfd7a260c1751094dbead4e4b5d2c4c6c42c860 Mon Sep 17 00:00:00 2001 From: zenggaofeng Date: Mon, 25 Dec 2023 15:39:39 +0800 Subject: [PATCH] =?UTF-8?q?HSP=E5=85=BC=E5=AE=B9=E6=80=A7=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zenggaofeng --- CHANGELOG.md | 4 ++++ entry/oh-package.json5 | 2 +- library/index.ets | 2 +- library/oh-package.json5 | 2 +- .../imageknife/compress/provider/RecourseProvider.ets | 3 ++- .../components/imageknife/resourcemanage/ParseResClient.ets | 2 +- .../imageknife/resourcemanage/ParseResClientBase64.ets | 2 +- .../components/imageknife/transform/MaskTransformation.ets | 4 +++- oh-package.json5 | 2 +- 9 files changed, 15 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b96b2c9..d736d9f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.1.2-rc.2 +- HSP兼容性优化 +- 暴露DetachFromLayout接口 + ## 2.1.2-rc.1 - 修复断网状态下错误展位图不显示 - 适配IDE4.1（4.1.3.322和SDK API11（ 4.1.0.36） diff --git a/entry/oh-package.json5 b/entry/oh-package.json5 index 703135a..fd56ae6 100644 --- a/entry/oh-package.json5 +++ b/entry/oh-package.json5 @@ -4,7 +4,7 @@ "name": "entry", "description": "example description", "repository": {}, - "version": "2.1.2-rc.1", + "version": "2.1.2-rc.2", "dependencies": { "@ohos/libraryimageknife": "file:../sharedlibrary", "@ohos/disklrucache": "^2.0.2-rc.0", diff --git a/library/index.ets b/library/index.ets index 1c69cec..3e714af 100644 --- a/library/index.ets +++ b/library/index.ets @@ -96,7 +96,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 {RequestOption,Size,DetachFromLayout} 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' export {ImageKnifeOption,CropCircleWithBorder,Crop,GifOptions,TransformOptions} from './src/main/ets/components/imageknife/ImageKnifeOption' diff --git a/library/oh-package.json5 b/library/oh-package.json5 index 113b68a..3303124 100644 --- a/library/oh-package.json5 +++ b/library/oh-package.json5 @@ -14,7 +14,7 @@ "main": "index.ets", "repository": "https://gitee.com/openharmony-tpc/ImageKnife", "type": "module", - "version": "2.1.2-rc.1", + "version": "2.1.2-rc.2", "dependencies": { "pako": "^2.1.0", "@ohos/disklrucache": "^2.0.2-rc.0", diff --git a/library/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets b/library/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets index 1329175..4bc0b0c 100644 --- a/library/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets +++ b/library/src/main/ets/components/imageknife/compress/provider/RecourseProvider.ets @@ -19,6 +19,7 @@ import { FileTypeUtil } from '../../../imageknife/utils/FileTypeUtil' import { ImageKnifeGlobal } from '../../ImageKnifeGlobal'; import resourceManager from '@ohos.resourceManager'; import { BusinessError } from '@ohos.base' +import common from '@ohos.app.ability.common'; export class RecourseProvider extends CompressAdapter { private static CHARS: string = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/'; @@ -46,7 +47,7 @@ export class RecourseProvider extends CompressAdapter { throw Error("compress resource is empty"); } ((ImageKnifeGlobal.getInstance() - .getHapContext() as Record).resourceManager as resourceManager.ResourceManager) + .getHapContext() as common.UIAbilityContext).createModuleContext(this._mResourceData.moduleName).resourceManager as resourceManager.ResourceManager) .getMediaContent(this._mResourceData.id) .then(data => { let buffer = this.uint8ArrayToBuffer(data); diff --git a/library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets b/library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets index 6faadc2..297f101 100644 --- a/library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets +++ b/library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets @@ -24,7 +24,7 @@ export class ParseResClient implements IResourceFetch { let resId = res.id; let resType = res.type; if (resType == ResourceTypeEts.MEDIA) { - (context.resourceManager as resourceManager.ResourceManager) + (context.createModuleContext(res.moduleName).resourceManager as resourceManager.ResourceManager) .getMediaContent(resId) .then(data => { let arrayBuffer = this.typedArrayToBuffer(data); diff --git a/library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets b/library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets index 983a982..857efe2 100644 --- a/library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets +++ b/library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets @@ -26,7 +26,7 @@ export class ParseResClientBase64 implements IResourceFetch { let resId = res.id; let resType = res.type; if (resType == ResourceTypeEts.MEDIA) { - (context.resourceManager as resourceManager.ResourceManager) + (context.createModuleContext(res.moduleName).resourceManager as resourceManager.ResourceManager) .getMediaContentBase64(resId) .then(data => { let matchReg = ';base64,'; diff --git a/library/src/main/ets/components/imageknife/transform/MaskTransformation.ets b/library/src/main/ets/components/imageknife/transform/MaskTransformation.ets index e55fe35..ceddd0a 100644 --- a/library/src/main/ets/components/imageknife/transform/MaskTransformation.ets +++ b/library/src/main/ets/components/imageknife/transform/MaskTransformation.ets @@ -95,7 +95,8 @@ export class MaskTransformation implements BaseTransform { } let context = (request.getModuleContext() as common.UIAbilityContext) if(context != undefined){ - let resourceManager = context.resourceManager as resourceManager.ResourceManager + if(this._mResourceData != undefined){ + let resourceManager = context.createModuleContext(this._mResourceData.moduleName).resourceManager as resourceManager.ResourceManager if(resourceManager != undefined && this._mResourceData != undefined) resourceManager.getMediaContent(this._mResourceData?.id) .then(array => { @@ -116,6 +117,7 @@ export class MaskTransformation implements BaseTransform { .catch((err:BusinessError) => { func?.asyncTransform("MaskTransformation openInternal error" + err, null); }) + } } } } \ No newline at end of file diff --git a/oh-package.json5 b/oh-package.json5 index 8e230a6..8852432 100644 --- a/oh-package.json5 +++ b/oh-package.json5 @@ -6,6 +6,6 @@ "name": "imageknife", "description": "example description", "repository": {}, - "version": "2.1.2-rc.1", + "version": "2.1.2-rc.2", "dependencies": {} }