diff --git a/common/utils/src/main/ets/default/baseUtil/ConfigData.ts b/common/utils/src/main/ets/default/baseUtil/ConfigData.ts index 140ad54a..42500875 100644 --- a/common/utils/src/main/ets/default/baseUtil/ConfigData.ts +++ b/common/utils/src/main/ets/default/baseUtil/ConfigData.ts @@ -73,7 +73,6 @@ export class ConfigData { TIME_FORMAT_24 = "24"; TIME_FORMAT_12 = "12"; - TIME_FORMAT_URI = "dataability:///com.ohos.settingsdata.DataAbility"; TIME_FORMAT_KEY = settings.date.TIME_FORMAT; SETTINGSDATA_DEVICE_NAME = settings.general.DEVICE_NAME; SETTINGSDATA_BRIGHTNESS = settings.display.SCREEN_BRIGHTNESS_STATUS; diff --git a/product/phone/src/main/ets/model/dateAndTimeImpl/DateAndTimeModel.ts b/product/phone/src/main/ets/model/dateAndTimeImpl/DateAndTimeModel.ts index b80a69f4..3ea232eb 100644 --- a/product/phone/src/main/ets/model/dateAndTimeImpl/DateAndTimeModel.ts +++ b/product/phone/src/main/ets/model/dateAndTimeImpl/DateAndTimeModel.ts @@ -29,12 +29,11 @@ import i18n from '@ohos.i18n'; export class DateAndTimeModel extends BaseModel { private timeFormat = ''; private dataShareHelper; - private readonly uriShare: string = 'datashare:///com.ohos.settingsdata.DataAbility'; private readonly listenUri = 'datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true&key=' + ConfigData.TIME_FORMAT_KEY; constructor() { super(); - data_dataShare.createDataShareHelper(globalThis.settingsAbilityContext, this.uriShare) + data_dataShare.createDataShareHelper(globalThis.settingsAbilityContext, this.listenUri) .then((dataHelper) => { this.dataShareHelper = dataHelper; LogUtil.info("createDataShareHelper success"); diff --git a/product/phone/src/main/ets/model/displayAndBrightnessImpl/brightness/BrightnessSettingModel.ts b/product/phone/src/main/ets/model/displayAndBrightnessImpl/brightness/BrightnessSettingModel.ts index 9ca87b1f..cfc80a21 100644 --- a/product/phone/src/main/ets/model/displayAndBrightnessImpl/brightness/BrightnessSettingModel.ts +++ b/product/phone/src/main/ets/model/displayAndBrightnessImpl/brightness/BrightnessSettingModel.ts @@ -34,12 +34,11 @@ export class BrightnessSettingModel extends BaseModel{ private brightness:number = 5; private defaultBrightnessStr = this.getDefaultBrightness().toString(); private TAG = `${ConfigData.TAG} BrightnessSettingModel `; - private readonly uriShare: string = 'datashare:///com.ohos.settingsdata.DataAbility'; private readonly listenUri = 'datashare:///com.ohos.settingsdata/entry/settingsdata/SETTINGSDATA?Proxy=true&key=' + ConfigData.SETTINGSDATA_BRIGHTNESS; constructor() { super(); - data_dataShare.createDataShareHelper(globalThis.settingsAbilityContext, this.uriShare) + data_dataShare.createDataShareHelper(globalThis.settingsAbilityContext, this.listenUri) .then((dataHelper) => { this.dataShareHelper = dataHelper; LogUtil.info("createDataShareHelper success"); @@ -118,6 +117,7 @@ export class BrightnessSettingModel extends BaseModel{ this.brightness = brightness; mBrightnessValue.set(brightness); Brightness.setValue(brightness); + this.setSettingsData(brightness); return; }