From 6641189ebde1d1971c5cb800ea15cebb76d49072 Mon Sep 17 00:00:00 2001 From: 26thE <962961353@qq.com> Date: Sat, 29 Mar 2025 14:45:03 +0800 Subject: [PATCH 1/6] =?UTF-8?q?HMOS=E4=B8=96=E7=95=8C=E6=95=B4=E6=94=B9Sam?= =?UTF-8?q?ple=EF=BC=8C=E6=B5=81=E7=95=85=E5=88=B7=E6=96=87=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/entryability/EntryAbility.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 5ea101c..9d97afe 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -42,7 +42,7 @@ export default class EntryAbility extends UIAbility { AppStorage.setOrCreate('currentBreakpoint', this.curBp); } } catch (error) { - this.curBp == Constants.BREAK_POINT_SM; + this.curBp === Constants.BREAK_POINT_SM; hilog.error(0x0000, TAG, 'updateBreakpoint catch err:', JSON.stringify(error) ?? ''); } } -- Gitee From f04a0061bd4caa9160e835f1a44122d5b1669463 Mon Sep 17 00:00:00 2001 From: 26thE <962961353@qq.com> Date: Sat, 29 Mar 2025 14:46:52 +0800 Subject: [PATCH 2/6] =?UTF-8?q?HMOS=E4=B8=96=E7=95=8C=E6=95=B4=E6=94=B9Sam?= =?UTF-8?q?ple=EF=BC=8C=E6=B5=81=E7=95=85=E5=88=B7=E6=96=87=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/entryability/EntryAbility.ets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 9d97afe..4b1e7f7 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -42,7 +42,7 @@ export default class EntryAbility extends UIAbility { AppStorage.setOrCreate('currentBreakpoint', this.curBp); } } catch (error) { - this.curBp === Constants.BREAK_POINT_SM; + this.curBp = Constants.BREAK_POINT_SM; hilog.error(0x0000, TAG, 'updateBreakpoint catch err:', JSON.stringify(error) ?? ''); } } -- Gitee From bb5c95a3b003b1f51c8531ecbabfdf321248ae88 Mon Sep 17 00:00:00 2001 From: 26thE <962961353@qq.com> Date: Sat, 29 Mar 2025 16:56:17 +0800 Subject: [PATCH 3/6] =?UTF-8?q?HMOS=E4=B8=96=E7=95=8C=E6=95=B4=E6=94=B9Sam?= =?UTF-8?q?ple=EF=BC=8C=E6=B5=81=E7=95=85=E5=88=B7=E6=96=87=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/entryability/EntryAbility.ets | 1 - 1 file changed, 1 deletion(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 4b1e7f7..a8dc85c 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -42,7 +42,6 @@ export default class EntryAbility extends UIAbility { AppStorage.setOrCreate('currentBreakpoint', this.curBp); } } catch (error) { - this.curBp = Constants.BREAK_POINT_SM; hilog.error(0x0000, TAG, 'updateBreakpoint catch err:', JSON.stringify(error) ?? ''); } } -- Gitee From 059e4083dbbc7da5237146036d1238becd97bee7 Mon Sep 17 00:00:00 2001 From: 26thE <962961353@qq.com> Date: Sat, 29 Mar 2025 17:41:25 +0800 Subject: [PATCH 4/6] =?UTF-8?q?HMOS=E4=B8=96=E7=95=8C=E6=95=B4=E6=94=B9Sam?= =?UTF-8?q?ple=EF=BC=8C=E6=B5=81=E7=95=85=E5=88=B7=E6=96=87=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/ets/entryability/EntryAbility.ets | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index a8dc85c..32f77b2 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { AbilityConstant, Configuration, ConfigurationConstant, UIAbility, Want } from '@kit.AbilityKit'; +import { UIAbility } from '@kit.AbilityKit'; import { display, window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; import { resourceManager } from '@kit.LocalizationKit'; @@ -46,21 +46,6 @@ export default class EntryAbility extends UIAbility { } } - onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { - hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); - AppStorage.setOrCreate('systemColorMode', this.context.config.colorMode); - this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); - } - - onConfigurationUpdate(newConfig: Configuration): void { - let newColorMode: ConfigurationConstant.ColorMode = - newConfig.colorMode || ConfigurationConstant.ColorMode.COLOR_MODE_DARK; - let currentColorMode = AppStorage.get('systemColorMode'); - if (newColorMode !== currentColorMode) { - AppStorage.setOrCreate('systemColorMode', newColorMode); - } - } - onWindowStageCreate(windowStage: window.WindowStage): void { windowStage.getMainWindow().then((windowObj: window.Window) => { let type = window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR; -- Gitee From 19366ffc7d5e266c28dd912a7399c566e73ef29d Mon Sep 17 00:00:00 2001 From: 26thE <962961353@qq.com> Date: Sat, 29 Mar 2025 17:54:36 +0800 Subject: [PATCH 5/6] =?UTF-8?q?HMOS=E4=B8=96=E7=95=8C=E6=95=B4=E6=94=B9Sam?= =?UTF-8?q?ple=EF=BC=8C=E6=B5=81=E7=95=85=E5=88=B7=E6=96=87=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/entryability/EntryAbility.ets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 32f77b2..ad5848c 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -46,6 +46,11 @@ export default class EntryAbility extends UIAbility { } } + onCreate(): void { + hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); + AppStorage.setOrCreate('systemColorMode', this.context.config.colorMode); + } + onWindowStageCreate(windowStage: window.WindowStage): void { windowStage.getMainWindow().then((windowObj: window.Window) => { let type = window.AvoidAreaType.TYPE_NAVIGATION_INDICATOR; -- Gitee From 848a5bdf54e448e2cf1c27a1303c67dca67d4f73 Mon Sep 17 00:00:00 2001 From: 26thE <962961353@qq.com> Date: Sat, 29 Mar 2025 18:04:24 +0800 Subject: [PATCH 6/6] =?UTF-8?q?HMOS=E4=B8=96=E7=95=8C=E6=95=B4=E6=94=B9Sam?= =?UTF-8?q?ple=EF=BC=8C=E6=B5=81=E7=95=85=E5=88=B7=E6=96=87=E7=AB=A0?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/main/ets/entryability/EntryAbility.ets | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index ad5848c..52b6c8c 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -13,7 +13,7 @@ * limitations under the License. */ -import { UIAbility } from '@kit.AbilityKit'; +import { ConfigurationConstant, UIAbility } from '@kit.AbilityKit'; import { display, window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; import { resourceManager } from '@kit.LocalizationKit'; @@ -38,7 +38,6 @@ export default class EntryAbility extends UIAbility { newBp = Constants.BREAK_POINT_LG; } if (this.curBp !== newBp) { - this.curBp = newBp; AppStorage.setOrCreate('currentBreakpoint', this.curBp); } } catch (error) { @@ -48,7 +47,7 @@ export default class EntryAbility extends UIAbility { onCreate(): void { hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); - AppStorage.setOrCreate('systemColorMode', this.context.config.colorMode); + this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); } onWindowStageCreate(windowStage: window.WindowStage): void { -- Gitee