diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index ce9a713b10ff45e340b08281b613ff73f4f8e385..bf4e047dcb290ecae7308181e69d508766abe2cb 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -58,7 +58,6 @@ export default class EntryAbility extends UIAbility { } hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); - AppStorage.setOrCreate('uiContext', windowStage.getMainWindowSync().getUIContext()); }); } diff --git a/entry/src/main/ets/pages/HomePage.ets b/entry/src/main/ets/pages/HomePage.ets index 39ae08069842f13c3419077aaeeabb50550b6d60..9dec4b398ee8dd66cc95fd1a66166ff3483e597e 100644 --- a/entry/src/main/ets/pages/HomePage.ets +++ b/entry/src/main/ets/pages/HomePage.ets @@ -159,7 +159,7 @@ struct HomePage { } pixelInit() { - getPixelMap(this) + getPixelMap(this.getUIContext()) .then((pixelMap?: image.PixelMap) => { if (pixelMap) { this.isPixelMapChange = !this.isPixelMapChange; @@ -192,7 +192,7 @@ struct HomePage { SaveButton(this.saveButtonOptions) .onClick(() => { - AlertDialog.show({ + this.getUIContext().showAlertDialog({ title: $r('app.string.save_image'), message: $r('app.string.confirm_save'), alignment: DialogAlignment.Center, @@ -200,7 +200,7 @@ struct HomePage { value: $r('app.string.save'), action: () => { if (this.pixelMap) { - encode(this, this.pixelMap); + encode(this.getUIContext(), this.pixelMap); } } }, diff --git a/entry/src/main/ets/utils/DecodeUtil.ets b/entry/src/main/ets/utils/DecodeUtil.ets index 13c18e746f544ba9de22884bc5821b6aae7b1033..d9ad2cde3e7c0913be4793736610a6775423a51c 100644 --- a/entry/src/main/ets/utils/DecodeUtil.ets +++ b/entry/src/main/ets/utils/DecodeUtil.ets @@ -19,15 +19,14 @@ import Logger from './LoggerUtil'; import { CommonConstants } from '../common/constant/CommonConstants'; const TAG: string = 'imageEdit_Decode'; -const uiContext: UIContext | undefined = AppStorage.get('uiContext'); /** * Async get resource fd. * * @return file fd. */ -async function getResourceFd(component: Object) { - const context = uiContext!.getHostContext()!; +async function getResourceFd(component: UIContext) { + const context = component.getHostContext()!; const resourceMgr = context.resourceManager; let imageBuffer = await resourceMgr.getMediaContent($r("app.media.ic_low")) let filePath = context.cacheDir + '/' + CommonConstants.RAW_FILE_NAME; @@ -41,7 +40,7 @@ async function getResourceFd(component: Object) { * * @return pixelMa. */ -export default async function getPixelMap(component: Object) { +export default async function getPixelMap(component: UIContext) { const fd = await getResourceFd(component); const imageSourceApi = image.createImageSource(fd); if (!imageSourceApi) { diff --git a/entry/src/main/ets/utils/EncodeUtil.ets b/entry/src/main/ets/utils/EncodeUtil.ets index 2dd12713b375d3abd6351f49ad107c431e0bf41e..d9fd69f930cc6c8c2d44358c9c98f9ea33d1af31 100644 --- a/entry/src/main/ets/utils/EncodeUtil.ets +++ b/entry/src/main/ets/utils/EncodeUtil.ets @@ -20,15 +20,12 @@ import Logger from './LoggerUtil'; import { CommonConstants } from '../common/constant/CommonConstants'; const TAG: string = 'imageEdit_Encode'; -const uiContext: UIContext | undefined = AppStorage.get('uiContext'); -const context = uiContext!.getHostContext()!; -let phAccessHelper = photoAccessHelper.getPhotoAccessHelper(context); /** * Pack the image. * * @param pixelMap. */ -export async function encode(component: Object, pixelMap: PixelMap) { +export async function encode(component: UIContext, pixelMap: PixelMap) { const newPixelMap = pixelMap; // Packing image. const imagePackerApi = image.createImagePacker(); @@ -41,6 +38,7 @@ export async function encode(component: Object, pixelMap: PixelMap) { // Create image asset. let photoType: photoAccessHelper.PhotoType = photoAccessHelper.PhotoType.IMAGE; let extension: string = 'jpg'; + const phAccessHelper = photoAccessHelper.getPhotoAccessHelper(component.getHostContext()); phAccessHelper.createAsset(photoType, extension, (err, uri) => { if (uri != undefined) { let file = fileIo.openSync(uri, fileIo.OpenMode.READ_WRITE);