diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index 5c45da1fd29d41d0b6a462d1240af21932220a9f..534da741c9d476836732533f8f6e6f8a19419f27 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -57,7 +57,7 @@ struct Index { }; aboutToAppear(): void { - this.windowUtil!.getFoldCreaseRegion(); + this.windowUtil!.getFoldCreaseRegion(this.getUIContext()); display.on('foldStatusChange', this.onFoldStatusChange); abilityAccessCtrl.createAtManager().requestPermissionsFromUser(this.context, this.permissions).then(() => { setTimeout(async () => { diff --git a/entry/src/main/ets/utils/CameraUtil.ets b/entry/src/main/ets/utils/CameraUtil.ets index 63a040884b0926d0a870de9bda67a751c744847a..64f9aba60657232dc52df6414ed72067c00f5528 100644 --- a/entry/src/main/ets/utils/CameraUtil.ets +++ b/entry/src/main/ets/utils/CameraUtil.ets @@ -20,7 +20,6 @@ import { BusinessError, deviceInfo } from "@kit.BasicServicesKit"; import { photoAccessHelper } from "@kit.MediaLibraryKit"; import { colorSpaceManager } from "@kit.ArkGraphics2D"; import { sensor } from "@kit.SensorServiceKit"; -import { display } from "@kit.ArkUI"; export class CameraUtil { previewOutput?: camera.PreviewOutput; diff --git a/entry/src/main/ets/utils/WindowUtil.ets b/entry/src/main/ets/utils/WindowUtil.ets index 5999289c2cd748055f48c9b4878d4696a84de171..09b5488cc75bdae38bbd8de1b7461ff567077f7b 100644 --- a/entry/src/main/ets/utils/WindowUtil.ets +++ b/entry/src/main/ets/utils/WindowUtil.ets @@ -21,6 +21,7 @@ export class WindowUtil { windowStage?: window.WindowStage; mainWindow?: window.Window; + static getInstance(): WindowUtil | undefined { if (!AppStorage.get('windowUtil')) { AppStorage.setOrCreate('windowUtil', new WindowUtil()); @@ -56,12 +57,12 @@ export class WindowUtil { this.mainWindow!.off('windowSizeChange'); } - getFoldCreaseRegion(): void { + getFoldCreaseRegion(context: UIContext): void { if (display.isFoldable()) { let foldRegion: display.FoldCreaseRegion = display.getCurrentFoldCreaseRegion(); let rect: display.Rect = foldRegion.creaseRects[0]; // Height of the avoidance area in the upper half screen and height of the avoidance area. - let creaseRegion: number[] = [px2vp(rect.top), px2vp(rect.height), px2vp(rect.width)]; + let creaseRegion: number[] = [context.px2vp(rect.top), context.px2vp(rect.height), context.px2vp(rect.width)]; AppStorage.setOrCreate('creaseRegion', creaseRegion); } }