diff --git a/build-profile.json5 b/build-profile.json5 index e3d955d2fd331a31fe29412d2579232660c1e8c5..eb683c96661d7ea0a42a82d75c8857a46ffa9e9e 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -5,7 +5,7 @@ { "name": "default", "signingConfig": "default", - "compatibleSdkVersion": '5.0.0(12)', + "compatibleSdkVersion": '5.0.4(16)', "runtimeOS": "HarmonyOS" } ] diff --git a/entry/src/main/ets/graphics3d/ContainerPage.ets b/entry/src/main/ets/graphics3d/ContainerPage.ets index ad83443c3013440089f25f5eac8196fdc08f05d0..d6c5374dcdaf05739c2c888772890b49f09c3606 100644 --- a/entry/src/main/ets/graphics3d/ContainerPage.ets +++ b/entry/src/main/ets/graphics3d/ContainerPage.ets @@ -160,7 +160,7 @@ struct ContainerPage { Button($r('app.string.back')) .onClick(() => { - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/graphics3d/NodeBase.ets b/entry/src/main/ets/graphics3d/NodeBase.ets index da4aa11f479df9518e011bab077d8fbe2933f663..54eb27fab72c6b5bd9904242e7f7b07441925655 100644 --- a/entry/src/main/ets/graphics3d/NodeBase.ets +++ b/entry/src/main/ets/graphics3d/NodeBase.ets @@ -242,7 +242,7 @@ struct NodeBase { if (this.scene) { this.scene.destroy(); } - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/graphics3d/NodeCamera.ets b/entry/src/main/ets/graphics3d/NodeCamera.ets index 8e040653278fad6fcbcd234c5d0b9ae675c11728..a18d2f86b9a68150d6e6b49832258bded6224621 100644 --- a/entry/src/main/ets/graphics3d/NodeCamera.ets +++ b/entry/src/main/ets/graphics3d/NodeCamera.ets @@ -265,7 +265,7 @@ struct NodeCamera { Button($r('app.string.back')) .onClick(() => { - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/graphics3d/NodeLight.ets b/entry/src/main/ets/graphics3d/NodeLight.ets index 09bde06a005fdcf1dc6c921d245a581857bb2823..d8bc355d330f0a098978a75534750d683be3708e 100644 --- a/entry/src/main/ets/graphics3d/NodeLight.ets +++ b/entry/src/main/ets/graphics3d/NodeLight.ets @@ -197,7 +197,7 @@ struct NodeLight { Button($r('app.string.back')) .onClick(() => { - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/graphics3d/SceneAnimation.ets b/entry/src/main/ets/graphics3d/SceneAnimation.ets index 8d5eea3d82bad40edcf16871c29009d2a736b3d3..8e48d98604047c392eabae8d035d36ea55d7f531 100644 --- a/entry/src/main/ets/graphics3d/SceneAnimation.ets +++ b/entry/src/main/ets/graphics3d/SceneAnimation.ets @@ -46,7 +46,7 @@ struct SceneAnimation { } init(): void { - this.backAnimator = Animator.create(Constants.ANIMATION_OPTION); + this.backAnimator = this.getUIContext().createAnimator(Constants.ANIMATION_OPTION); this.backAnimator.onFrame = () => { if (this.scene?.animations[0]) { this.animationEnabled = this.scene.animations[0].enabled; @@ -194,7 +194,7 @@ struct SceneAnimation { Button($r('app.string.back')) .onClick(() => { - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/graphics3d/SceneEnvironment.ets b/entry/src/main/ets/graphics3d/SceneEnvironment.ets index 3b0917718c02018120f0c776117b0196a4485804..1cb3c62ed5c9e9e97844efcd0263cefc31fd9e5b 100644 --- a/entry/src/main/ets/graphics3d/SceneEnvironment.ets +++ b/entry/src/main/ets/graphics3d/SceneEnvironment.ets @@ -199,7 +199,7 @@ struct sceneEnvironment { Button($r('app.string.back')) .onClick(() => { - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/graphics3d/SceneShader.ets b/entry/src/main/ets/graphics3d/SceneShader.ets index 3d72e8abc741832ffec93e8a2ec22f4991d30455..dadac8201ff14b6c595b822cb58a14b311e507b7 100644 --- a/entry/src/main/ets/graphics3d/SceneShader.ets +++ b/entry/src/main/ets/graphics3d/SceneShader.ets @@ -84,7 +84,7 @@ struct sceneShader { } init(): void { - this.backAnimator = Animator.create(Constants.ANIMATION_OPTION); + this.backAnimator = this.getUIContext().createAnimator(Constants.ANIMATION_OPTION); this.backAnimator.onFrame = () => { this.step++; if (this.material && this.material.colorShader) { @@ -222,7 +222,7 @@ struct sceneShader { Button($r('app.string.back')) .onClick(() => { this.backAnimator?.cancel(); - router.back(); + this.getUIContext().getRouter().back(); }) .width(Constants.FULL_PERCENT) } diff --git a/entry/src/main/ets/pages/Index.ets b/entry/src/main/ets/pages/Index.ets index ce7861a843d66b8c096b01422da0d686005600b8..42ef3b1d2d7e6bef2c2502083f087e561ebe9e56 100644 --- a/entry/src/main/ets/pages/Index.ets +++ b/entry/src/main/ets/pages/Index.ets @@ -23,7 +23,7 @@ const TAG: string = '[Index]'; @Component struct Index { onJumpClick(target_url: string): void { - router.pushUrl({ url: target_url }, router.RouterMode.Single, (err) => { + this.getUIContext().getRouter().pushUrl({ url: target_url }, router.RouterMode.Single, (err) => { if (err) { Logger.error(TAG, `Invoke pushUrl failed, code is ${err.code}, message is ${err.message}`); return;