chendeben 1 rok temu
rodzic
commit
cdab7c03c2

+ 2 - 2
entry/src/main/ets/MyAbilityStage.ets

@@ -7,7 +7,7 @@ export default class MyAbilityStage extends AbilityStage {
     try {
       // 保存当前颜色模式到 AppStorage
       AppStorage.setOrCreate('currentColorMode', this.context.config.colorMode);
-      hilog.info(0x0000, 'Heanup', '当前 colorMode'+this.context.config.colorMode);
+      hilog.info(0x0000, 'Heanup', '当前 colorMode'+this.context.config.colorMode);
       // 确保 themeMode 有初始值(0: 跟随系统)
       if (AppStorage.get('themeMode') === undefined) {
         AppStorage.setOrCreate('themeMode', 0);
@@ -23,7 +23,7 @@ export default class MyAbilityStage extends AbilityStage {
       const themeMode = AppStorage.get<number>('themeMode') ?? 0;
       if (themeMode === 0) {
         AppStorage.setOrCreate('currentColorMode', newConfig.colorMode);
-        hilog.info(0x0000, 'Heanup', 'the newConfig.colorMode is %{public}s', JSON.stringify(newConfig.colorMode) ?? '');
+        hilog.info(0x0000, 'Heanup', '新colorMode = %{public}s', JSON.stringify(newConfig.colorMode) ?? '');
       } else {
         hilog.info(0x0000, 'Heanup', 'themeMode != 0, skip updating colorMode');
       }

+ 4 - 17
entry/src/main/ets/pages/SettingPage.ets

@@ -147,32 +147,19 @@ export struct SettingPage {
     this.isCustomizeBg  = PreferencesUtil.getBooleanSync(SettingPage.IS_CUSTOMIZE_BG, false)
     this.customizeBgPath  = PreferencesUtil.getStringSync(SettingPage.IS_CUSTOMIZE_BG_PATH, '')
 
-    // 从持久化存储中读取深色模式设置
-    const savedDarkMode = PreferencesUtil.getBooleanSync(SettingPage.IS_DARK_MODE, false);
-    this.isDarkMode = savedDarkMode;
-    this.currentMode = savedDarkMode ? ConfigurationConstant.ColorMode.COLOR_MODE_DARK : ConfigurationConstant.ColorMode.COLOR_MODE_LIGHT;
-    // 优先从 AppStorage 读取 themeMode
-    const appStorageThemeMode = AppStorage.get<number>('themeMode');
-    if (appStorageThemeMode !== undefined) {
-      this.themeMode = appStorageThemeMode;
-    } else {
-      this.themeMode = PreferencesUtil.getNumberSync(SettingPage.THEME_MODE, 0)
-    }
+    // 只用 themeMode 控制主题
+    this.themeMode = PreferencesUtil.getNumberSync(SettingPage.THEME_MODE, 0)
     this.applyThemeMode(this.themeMode)
-    AppStorage.setOrCreate('currentColorMode', this.currentMode);
-    AppStorage.setOrCreate('isDarkMode', this.isDarkMode);
-    AppStorage.setOrCreate('themeMode', this.themeMode);
+    AppStorage.setOrCreate('themeMode', this.themeMode)
   }
 
   // 监听颜色模式变化
   onColorModeChange(): void {
     this.isDarkMode = this.currentMode === ConfigurationConstant.ColorMode.COLOR_MODE_DARK;
     AppStorage.setOrCreate('isDarkMode', this.isDarkMode);
-    // 保存深色模式设置到持久化存储
-    PreferencesUtil.putSync(SettingPage.IS_DARK_MODE, this.isDarkMode);
+    // 不再持久化 IS_DARK_MODE
   }
 
-
   // 组件生命周期
   aboutToDisappear() {
     // 无需处理apiDialogController