HSP兼容性优化

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

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）

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",

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'

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",

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<string, Object>).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);

library/src/main/ets/components/imageknife/resourcemanage/ParseResClient.ets

@@ -24,7 +24,7 @@ export class ParseResClient implements IResourceFetch<ArrayBuffer> {
     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);

library/src/main/ets/components/imageknife/resourcemanage/ParseResClientBase64.ets

@@ -26,7 +26,7 @@ export class ParseResClientBase64 implements IResourceFetch<ArrayBuffer> {
     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,';

library/src/main/ets/components/imageknife/transform/MaskTransformation.ets

@@ -95,7 +95,8 @@ export class MaskTransformation implements BaseTransform<PixelMap> {
     }
     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<PixelMap> {
         .catch((err:BusinessError) => {
           func?.asyncTransform("MaskTransformation openInternal error" + err, null);
         })
+     }
     }
   }
 }

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": {}
 }