diff --git a/entry/src/main/ets/common/utils/Logger.ets b/entry/src/main/ets/common/utils/Logger.ets deleted file mode 100644 index 53812d95f6340743f4e24918128ce5d782a4e332..0000000000000000000000000000000000000000 --- a/entry/src/main/ets/common/utils/Logger.ets +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { hilog } from '@kit.PerformanceAnalysisKit'; - -class Logger { - private domain: number; - private prefix: string; - private format: string = '%{public}s, %{public}s'; - - /** - * Constructor. - * - * @param Prefix Identifies the log tag. - * @param domain Domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF. - */ - constructor(prefix: string) { - this.prefix = prefix; - this.domain = 0xFF00; - } - - debug(...args: string[]): void { - hilog.debug(this.domain, this.prefix, this.format, args); - } - - info(...args: string[]): void { - hilog.info(this.domain, this.prefix, this.format, args); - } - - warn(...args: string[]): void { - hilog.warn(this.domain, this.prefix, this.format, args); - } - - error(...args: string[]): void { - hilog.error(this.domain, this.prefix, this.format, args); - } -} - -export default new Logger('CardInfoRefresh'); \ No newline at end of file diff --git a/entry/src/main/ets/common/utils/PreferencesUtil.ets b/entry/src/main/ets/common/utils/PreferencesUtil.ets index 02cd12820fadee1411e9b2d692c966bf3a6852b5..605285fd98c77fb60571563d79aee1c2e9c48677 100644 --- a/entry/src/main/ets/common/utils/PreferencesUtil.ets +++ b/entry/src/main/ets/common/utils/PreferencesUtil.ets @@ -16,8 +16,8 @@ import { preferences } from '@kit.ArkData'; import { CardListItemData } from '../CommonData'; import { CommonConstants } from '../CommonConstants'; -import Logger from './Logger'; import { BusinessError } from '@kit.BasicServicesKit'; +import { hilog } from '@kit.PerformanceAnalysisKit'; const TAG: string = 'PreferencesUtil'; const MY_STORE: string = 'myStore'; @@ -38,7 +38,7 @@ export class PreferencesUtil { return preferences.getPreferencesSync(context, { name: MY_STORE }); } catch (error) { let err = error as BusinessError; - Logger.error(TAG, `getPreferences failed, error code=${err.code}, message=${err.message}`); + hilog.error(0x0000, TAG, `getPreferences failed, error code=${err.code}, message=${err.message}`); return undefined; } } @@ -46,7 +46,7 @@ export class PreferencesUtil { preferencesFlush(preferences: preferences.Preferences) { preferences.flush((err) => { if (err) { - Logger.error(TAG, `Failed to flush. Code:${err.code}, message:${err.message}`); + hilog.error(0x0000, TAG, `Failed to flush. Code:${err.code}, message:${err.message}`); } }) } @@ -57,26 +57,26 @@ export class PreferencesUtil { this.preferencesFlush(preferences); } catch (error) { let err = error as BusinessError; - Logger.error(TAG, `preferencesPut failed, error code=${err.code}, message=${err.message}`); + hilog.error(0x0000, TAG, `preferencesPut failed, error code=${err.code}, message=${err.message}`); } } removePreferencesFromCache(context: Context): void { preferences.removePreferencesFromCache(context, MY_STORE).catch((err: BusinessError) => { - Logger.error(TAG, `removePreferencesFromCache failed, error code=${err.code}, message=${err.message}`); + hilog.error(0x0000, TAG, `removePreferencesFromCache failed, error code=${err.code}, message=${err.message}`); }); } getFormIds(preferences: preferences.Preferences): Array { if (preferences === null) { - Logger.error(TAG, `preferences is null`); + hilog.error(0x0000, TAG, `preferences is null`); return []; } try { return preferences.getSync('formIdList', ['']) as Array; } catch (error) { let err = error as BusinessError; - Logger.error(TAG, `getSync failed, error code=${err.code}, message=${err.message}`); + hilog.error(0x0000, TAG, `getSync failed, error code=${err.code}, message=${err.message}`); return []; } } @@ -94,7 +94,7 @@ export class PreferencesUtil { } this.preferencesFlush(preferences); } catch (error) { - Logger.error(TAG, `Failed to check the key 'formIds'. Code:${error.code}, message:${error.message}`); + hilog.error(0x0000, TAG, `Failed to check the key 'formIds'. Code:${error.code}, message:${error.message}`); } } @@ -109,7 +109,7 @@ export class PreferencesUtil { } } catch (error) { let err = error as BusinessError; - Logger.error(TAG, `getFormInitData failed, error code=${err.code}, message=${err.message}`); + hilog.error(0x0000, TAG, `getFormInitData failed, error code=${err.code}, message=${err.message}`); } return initData; } @@ -118,7 +118,7 @@ export class PreferencesUtil { try { let preferences = this.getPreferences(context); if (!preferences) { - Logger.error(TAG, `preferences is null`); + hilog.error(0x0000, TAG, `preferences is null`); return; } if (preferences.hasSync('formIdList')) { @@ -134,7 +134,7 @@ export class PreferencesUtil { this.preferencesFlush(preferences); } } catch (error) { - Logger.error(TAG, `Failed to get preferences. Code:${error.code}, message:${error.message}`); + hilog.error(0x0000, TAG, `Failed to get preferences. Code:${error.code}, message:${error.message}`); } } } \ No newline at end of file diff --git a/entry/src/main/ets/entryformability/EntryFormAbility.ets b/entry/src/main/ets/entryformability/EntryFormAbility.ets index c0859efe4045bdc4cc2c0c290505b0cae773c199..02bd12574227664ef85550ea4a41543dd52e4366 100644 --- a/entry/src/main/ets/entryformability/EntryFormAbility.ets +++ b/entry/src/main/ets/entryformability/EntryFormAbility.ets @@ -44,7 +44,7 @@ export default class EntryFormAbility extends FormExtensionAbility { hilog.error(0x0000, TAG, `FormAbility onAddForm want or want.parameters is undefined`); return formBindingData.createFormBindingData(''); } - while(0) { + while (0) { let formName: string = want.parameters[formInfo.FormParam.NAME_KEY] as string; let formId: string = want.parameters[formInfo.FormParam.IDENTITY_KEY] as string; // [StartExclude system_date_time] diff --git a/entry/src/main/ets/widget/pages/WidgetCard.ets b/entry/src/main/ets/widget/pages/WidgetCard.ets index 44e4a822320e52feaf342f6b2c263153dc348d44..5d957628e28e51807cb48de143666b0f602c7dae 100644 --- a/entry/src/main/ets/widget/pages/WidgetCard.ets +++ b/entry/src/main/ets/widget/pages/WidgetCard.ets @@ -15,7 +15,7 @@ import { CardListComponent } from '../view/CardListComponent'; import { CardListParameter } from '../viewmodel/CardListParameter'; -import { CardListItemData } from '../../common/CommonData' +import { CardListItemData } from '../../common/CommonData'; // [Start widget_card] let storageLocal = new LocalStorage();