diff --git a/README.en.md b/README.en.md index a11ef29898d8dccac121070e80b5a066894dba2b..ccdb41e6a3d44feef255d7cf4d385eee3afab4a7 100644 --- a/README.en.md +++ b/README.en.md @@ -32,5 +32,5 @@ N/A 1. The sample is only supported on Huawei phones with standard systems. 2. HarmonyOS: HarmonyOS 5.0.5 Release or later. -3. DevEco Studio: DevEco Studio 5.0.5 Release or later. -4. HarmonyOS SDK: HarmonyOS 5.0.5 Release SDK or later. +3. DevEco Studio: DevEco Studio 6.0.0 Release or later. +4. HarmonyOS SDK: HarmonyOS 6.0.0 Release SDK or later. diff --git a/README.md b/README.md index cfa5547b0c5aa8b9c08baf9f9a4e7ef08dad2372..7ebdf25a54eb3dce458a11ed6015085a28c23337 100644 --- a/README.md +++ b/README.md @@ -32,5 +32,5 @@ 1. 本示例仅支持标准系统上运行,支持设备:华为手机。 2. HarmonyOS系统:HarmonyOS 5.0.5 Release及以上。 -3. DevEco Studio版本:DevEco Studio 5.0.5 Release及以上。 -4. HarmonyOS SDK版本:HarmonyOS 5.0.5 Release SDK及以上。 +3. DevEco Studio版本:DevEco Studio 6.0.0 Release及以上。 +4. HarmonyOS SDK版本:HarmonyOS 6.0.0 Release SDK及以上。 diff --git a/build-profile.json5 b/build-profile.json5 index 218d9c610f75e63401c65f00bda6b409b616de00..4dcb272d653aa2817f3dd34639de58d5236d81f9 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -7,7 +7,7 @@ "name": "default", "signingConfig": "default", "compatibleSdkVersion": "5.0.5(17)", - "targetSdkVersion": "5.0.5(17)", + "targetSdkVersion": "6.0.0(20)", "runtimeOS": "HarmonyOS" } ] diff --git a/entry/src/main/ets/common/database/PreferencesUtil.ets b/entry/src/main/ets/common/database/PreferencesUtil.ets index 6d7cb585ba16b8bedd3400d0bf1765409cfbc3df..91300da08e43bcd57628b87cc121cbb66b82e25b 100644 --- a/entry/src/main/ets/common/database/PreferencesUtil.ets +++ b/entry/src/main/ets/common/database/PreferencesUtil.ets @@ -27,31 +27,31 @@ const KEY_APP_FONT_SIZE = 'appFontSize'; */ export class PreferencesUtil { createFontPreferences(context: Context) { - preferences.getPreferences(context, PREFERENCES_NAME).then((pref: preferences.Preferences) => { + try { + let pref = preferences.getPreferencesSync(context, { name: PREFERENCES_NAME }); GlobalContext.getContext().setObject('getFontPreferences', pref); - }).catch((error: BusinessError) => { - Logger.error(TAG, `getPreferences err, code: ${error.code}, mesage: ${error.message}`); - }) + } catch (err) { + let error = err as BusinessError; + Logger.error(TAG, `getPreferencesSync err, code: ${error.code}, mesage: ${error.message}`); + } } saveDefaultFontSize(fontSize: number) { try { - let getFontPreferences: Function = GlobalContext.getContext().getObject('getFontPreferences') as Function; - getFontPreferences().then((preferences: preferences.Preferences) => { - preferences.has(KEY_APP_FONT_SIZE).then(async (isExist: boolean) => { - Logger.info(TAG, 'preferences has changeFontSize is ' + isExist); - if (!isExist) { - await preferences.put(KEY_APP_FONT_SIZE, fontSize); - preferences.flush().catch((error: BusinessError) => { - Logger.error(TAG, `flush err, code: ${error.code}, mesage: ${error.message}`); - }); - } - }).catch((err: Error) => { - Logger.error(TAG, 'Has the value failed with err: ' + err); - }); + let fontPreferences: preferences.Preferences = + GlobalContext.getContext().getObject('getFontPreferences') as preferences.Preferences; + fontPreferences.has(KEY_APP_FONT_SIZE).then(async (isExist: boolean) => { + Logger.info(TAG, 'preferences has changeFontSize is ' + isExist); + if (!isExist) { + await fontPreferences.put(KEY_APP_FONT_SIZE, fontSize); + fontPreferences.flush().catch((error: BusinessError) => { + Logger.error(TAG, `flush err, code: ${error.code}, mesage: ${error.message}`); + }); + } }).catch((err: Error) => { - Logger.error(TAG, 'Get the preferences failed, err: ' + err); + Logger.error(TAG, 'Has the value failed with err: ' + err); }); + } catch (err) { let error = err as BusinessError; Logger.error(TAG, `saveDefaultFontSize err, code: ${error.code}, mesage: ${error.message}`); @@ -59,15 +59,12 @@ export class PreferencesUtil { } saveChangeFontSize(fontSize: number) { - let getFontPreferences: Function = GlobalContext.getContext().getObject('getFontPreferences') as Function; + let fontPreferences: preferences.Preferences = + GlobalContext.getContext().getObject('getFontPreferences') as preferences.Preferences; try { - getFontPreferences().then(async (preferences: preferences.Preferences) => { - await preferences.put(KEY_APP_FONT_SIZE, fontSize); - preferences.flush().catch((error: BusinessError) => { - Logger.error(TAG, `getFontPreferences err, code: ${error.code}, mesage: ${error.message}`); - }); - }).catch((err: Error) => { - Logger.error(TAG, 'put the preferences failed, err: ' + err); + fontPreferences.putSync(KEY_APP_FONT_SIZE, fontSize); + fontPreferences.flush().catch((error: BusinessError) => { + Logger.error(TAG, `getFontPreferences err, code: ${error.code}, mesage: ${error.message}`); }); } catch (err) { let error = err as BusinessError; @@ -77,16 +74,21 @@ export class PreferencesUtil { async getChangeFontSize() { let fontSize: number = 16; - let getFontPreferences: Function = GlobalContext.getContext().getObject('getFontPreferences') as Function; - // const preferences: dataPreferences.Preferences = await getFontPreferences(); - fontSize = await (await getFontPreferences()).get(KEY_APP_FONT_SIZE, fontSize); + let fontPreferences: preferences.Preferences = + GlobalContext.getContext().getObject('getFontPreferences') as preferences.Preferences; + try { + fontSize = fontPreferences.getSync(KEY_APP_FONT_SIZE, fontSize) as number; + } catch (err) { + let error = err as BusinessError; + Logger.error(TAG, `fontPreferences getSync, code: ${error.code}, mesage: ${error.message}`); + } return fontSize; } async deleteChangeFontSize() { - let getFontPreferences: Function = GlobalContext.getContext().getObject('getFontPreferences') as Function; - const preferences: preferences.Preferences = await getFontPreferences(); - let deleteValue = preferences.delete(KEY_APP_FONT_SIZE).catch((error: BusinessError) => { + let fontPreferences: preferences.Preferences = + GlobalContext.getContext().getObject('getFontPreferences') as preferences.Preferences; + let deleteValue = fontPreferences.delete(KEY_APP_FONT_SIZE).catch((error: BusinessError) => { Logger.error(TAG, `delete err, code: ${error.code}, mesage: ${error.message}`); }); deleteValue.then(() => { diff --git a/entry/src/main/ets/entryability/EntryAbility.ets b/entry/src/main/ets/entryability/EntryAbility.ets index 241058339cea9d0277f3e05455f2b0b03d5421ac..d11737b5e8e21c9b929665a7395da6a10a4f251b 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ets +++ b/entry/src/main/ets/entryability/EntryAbility.ets @@ -29,10 +29,8 @@ const TAG = '[entryAbility]'; export default class EntryAbility extends UIAbility { onCreate(want: Want, launchParam: AbilityConstant.LaunchParam): void { Logger.info(TAG, 'onCreate'); - GlobalContext.getContext().setObject('abilityWant', want); - PreferencesUtil.createFontPreferences(this.context); - // 设置字体默认大小 + // Set default font size PreferencesUtil.saveDefaultFontSize(CommonConstants.SET_SIZE_NORMAL); }