稳定性问题master分支整改

Merge pull request  from 张文波/new_master
This commit is contained in:
openharmony_ci 2024-01-11 13:49:59 +00:00 committed by Gitee
commit 5eafbb0dec
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 6 additions and 6 deletions
common/src/main/ets/default
features/airplanecomponent/src/main/ets/default/viewmodel

@ -79,13 +79,13 @@ class TimeManager {
private async initTimeFormat(context: any): Promise<void> {
Log.showDebug(TAG, "initTimeFormat");
if (context == undefined || context == null) {
log.showInfo(TAG, `initTimeFormat: ${context}`);
Log.showInfo(TAG, `initTimeFormat: ${context}`);
return;
}
try {
settings.getValueSync(context, TIME_FORMAT_KEY, "24");
} catch (err) {
log.showError(TAG, `initTimeFormat: ${context},${JSON.stringify(err)}`)
Log.showError(TAG, `initTimeFormat: ${context},${JSON.stringify(err)}`)
}
this.mSettingsHelper = await dataShare.createDataShareHelper(context, Constants.getUriSync(Constants.KEY_TIME_FORMAT));
@ -95,7 +95,7 @@ class TimeManager {
return;
}
if (context == undefined || context == null) {
log.showInfo(TAG, `handleTimeFormatChange: ${context}`);
Log.showInfo(TAG, `handleTimeFormatChange: ${context}`);
return;
}
try {
@ -103,7 +103,7 @@ class TimeManager {
Log.showDebug(TAG, `timeFormat change: ${timeString}`);
this.mUse24hFormat = timeString == "24";
} catch (err) {
log.showError(TAG, `handleTimeFormatChange: ${context},${JSON.stringify(err)}`)
Log.showError(TAG, `handleTimeFormatChange: ${context},${JSON.stringify(err)}`)
}
this.notifyTimeChange();
};

@ -39,14 +39,14 @@ class AirplaneVM implements AirplaneServiceListener {
constructor() {
this.context = AbilityManager.getContext(AbilityManager.getContextName(AbilityManager.ABILITY_NAME_CONTROL_PANEL));
if (this.context == undefined || this.context == null) {
log.showInfo(TAG, `constructor: ${context}`);
Log.showInfo(TAG, `constructor: ${context}`);
return;
}
try {
this.mAirplaneStatus =
settings.getValueSync(this.context, Constants.KEY_AIRPLANE_MODE_STATUS, AIRPLANE_MODE_STATUS.OFF) === AIRPLANE_MODE_STATUS.ON
} catch (err) {
log.showError(TAG, `AirplaneVM: ${context}, ${JSON.stringify(err)}`);
Log.showError(TAG, `AirplaneVM: ${context}, ${JSON.stringify(err)}`);
}
AppStorage.SetOrCreate('Airplane_Status', this.mAirplaneStatus);
}