openharmony/applications_settings
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_settings synced 2024-11-23 14:30:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/openharmony/applications_settings

Browse Source
This commit is contained in:
fangzheng24 2022-11-14 15:05:12 +08:00
commit 98f8437de5
4 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
common/utils/src/main/ets/default/baseUtil/ConfigData.ts
View File

@ -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;

8
napi/settings/napi_settings.cpp
View File

@ -559,8 +559,8 @@ napi_value napi_get_value(napi_env env, napi_callback_info info)
HILOG_INFO("argv[0] is a context, Stage Model: %{public}d", stageMode);
return napi_get_value_ext(env, info, stageMode);
}
NAPI_ASSERT(env, valueType == napi_object, "Wrong argument[0], type. Object expected");
NAPI_ASSERT(env, valueType == napi_object, "Wrong argument[0] type. Object expected.");
NAPI_CALL(env, napi_typeof(env, args[PARAM1], &valueType));
NAPI_ASSERT(env, valueType == napi_string, "Wrong argument[1], type. String expected");
@ -1080,8 +1080,8 @@ napi_value napi_set_value(napi_env env, napi_callback_info info)
HILOG_INFO("argv[0] is a context, Stage Model: %{public}d", stageMode);
return napi_set_value_ext(env, info, stageMode);
}
NAPI_ASSERT(env, valueType == napi_object, "Wrong argument[0], type. Object expected");
NAPI_ASSERT(env, valueType == napi_object, "Wrong argument[0] type. Object expected.");
NAPI_CALL(env, napi_typeof(env, args[PARAM1], &valueType));
NAPI_ASSERT(env, valueType == napi_string, "Wrong argument[1], type. String expected");
NAPI_CALL(env, napi_typeof(env, args[PARAM2], &valueType));

3
product/phone/src/main/ets/model/dateAndTimeImpl/DateAndTimeModel.ts
View File

@ -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");

4
product/phone/src/main/ets/model/displayAndBrightnessImpl/brightness/BrightnessSettingModel.ts
View File

@ -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;
}