From 421655a507e86bdd7a15320c877b566ade719f80 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9FJNTIC\\gyb" <121287102@qq.com> Date: Thu, 18 Sep 2025 20:20:07 +0800 Subject: [PATCH] =?UTF-8?q?logger=E6=95=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- animationcollectionlibrary/Index.ets | 2 ++ .../view/PageListSlideToHistory.ets | 4 +-- .../votingComponent/pages/VotingComponent.ets | 4 +-- .../src/main/ets/utils/BreakpointSystem.ets | 4 +-- .../src/main/ets/{common => utils}/Logger.ets | 26 ++++++------------- .../src/main/ets/utils/WindowUtil.ets | 12 ++++----- .../main/ets/entryability/EntryAbility.ets | 19 +++++++------- 7 files changed, 31 insertions(+), 40 deletions(-) rename animationcollectionlibrary/src/main/ets/{common => utils}/Logger.ets (60%) diff --git a/animationcollectionlibrary/Index.ets b/animationcollectionlibrary/Index.ets index 171955d..323278b 100644 --- a/animationcollectionlibrary/Index.ets +++ b/animationcollectionlibrary/Index.ets @@ -1,3 +1,5 @@ export { AnimationCollectionComponent } from './src/main/ets/component/AnimationCollectionComponent'; export { AnimationcollectionController } from './src/main/ets/AnimationcollectionController'; + +export { default as Logger } from './src/main/ets/utils/Logger'; \ No newline at end of file diff --git a/animationcollectionlibrary/src/main/ets/feature/pageListSlideToHistory/view/PageListSlideToHistory.ets b/animationcollectionlibrary/src/main/ets/feature/pageListSlideToHistory/view/PageListSlideToHistory.ets index 9843894..a07e09f 100644 --- a/animationcollectionlibrary/src/main/ets/feature/pageListSlideToHistory/view/PageListSlideToHistory.ets +++ b/animationcollectionlibrary/src/main/ets/feature/pageListSlideToHistory/view/PageListSlideToHistory.ets @@ -15,10 +15,10 @@ import { util } from '@kit.ArkTS'; import { BasicDataSource, FriendMoment } from '../model/BasicDataSource'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { OneMoment } from './OneMoment'; import { Constants } from '../common/Constants'; import CommonConstants from '../../../common/CommonConstants'; +import { Logger } from '../../../../../../Index'; @Component export struct PageListSlideToHistory { @@ -219,7 +219,7 @@ async function getFriendMomentFromRawfile(context: Context): Promise { momentData.pushData(item); }); } catch (err) { - hilog.error(0x0000, 'PageListSlideToHistory', '%{public}s', 'getFriendMomentFromRawfile error: ' + err.code); + Logger.error('PageListSlideToHistory', '%{public}s', 'getFriendMomentFromRawfile error: ' + err.code); } } diff --git a/animationcollectionlibrary/src/main/ets/feature/votingComponent/pages/VotingComponent.ets b/animationcollectionlibrary/src/main/ets/feature/votingComponent/pages/VotingComponent.ets index a3f44a8..72677af 100644 --- a/animationcollectionlibrary/src/main/ets/feature/votingComponent/pages/VotingComponent.ets +++ b/animationcollectionlibrary/src/main/ets/feature/votingComponent/pages/VotingComponent.ets @@ -14,8 +14,8 @@ */ import Constants from '../constants/Constants'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import CommonConstants from '../../../common/CommonConstants'; +import { Logger } from '../../../../../../Index'; @Component export struct VotingComponent { @@ -240,7 +240,7 @@ export struct VotingComponent { try { return this.getUIContext().getHostContext()!.resourceManager.getStringSync(resource.id); } catch (err) { - hilog.error(0x0000, 'VotingComponent', '%{public}s', 'getStringSync error: ' + err.code); + Logger.error('VotingComponent', '%{public}s', 'getStringSync error: ' + err.code); } return ''; } diff --git a/animationcollectionlibrary/src/main/ets/utils/BreakpointSystem.ets b/animationcollectionlibrary/src/main/ets/utils/BreakpointSystem.ets index b4c4f72..dcdf8a3 100644 --- a/animationcollectionlibrary/src/main/ets/utils/BreakpointSystem.ets +++ b/animationcollectionlibrary/src/main/ets/utils/BreakpointSystem.ets @@ -15,7 +15,7 @@ import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; +import { Logger } from '../../../../Index'; import Constants from '../common/CommonConstants'; const TAG: string = '[BreakpointSystem]'; @@ -113,7 +113,7 @@ export class BreakpointSystem { this.updateCurrentBreakpoint(widthBp); } catch (error) { const err: BusinessError = error as BusinessError; - hilog.error(0x0000, TAG, `UpdateBreakpoint fail, error code: ${err.code}, message: ${err.message}`); + Logger.error(TAG, `UpdateBreakpoint fail, error code: ${err.code}, message: ${err.message}`); } } } \ No newline at end of file diff --git a/animationcollectionlibrary/src/main/ets/common/Logger.ets b/animationcollectionlibrary/src/main/ets/utils/Logger.ets similarity index 60% rename from animationcollectionlibrary/src/main/ets/common/Logger.ets rename to animationcollectionlibrary/src/main/ets/utils/Logger.ets index 7325b7e..80ea73e 100644 --- a/animationcollectionlibrary/src/main/ets/common/Logger.ets +++ b/animationcollectionlibrary/src/main/ets/utils/Logger.ets @@ -1,6 +1,6 @@ /* * Copyright (c) 2024 Huawei Device Co., Ltd. - * Licensed under the Apache License, Version 2.0 (the "License"); + * 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 * @@ -15,41 +15,31 @@ import { hilog } from '@kit.PerformanceAnalysisKit'; -const LOGGER_PREFIX: string = 'Healthy_life'; - class Logger { private domain: number; private prefix: string; - // format Indicates the log format string. private format: string = '%{public}s, %{public}s'; - /** - * constructor. - * - * @param prefix Identifies the log tag. - * @param domain Indicates the service domain, which is a hexadecimal integer ranging from 0x0 to 0xFFFFF - * @param args Indicates the log parameters. - */ - constructor(prefix: string = '', domain: number = 0xFF00) { + public constructor(prefix: string) { this.prefix = prefix; - this.domain = domain; + this.domain = 0x0000; } - debug(...args: string[]): void { + public debug(...args: Object[]): void { hilog.debug(this.domain, this.prefix, this.format, args); } - info(...args: string[]): void { + public info(...args: Object[]): void { hilog.info(this.domain, this.prefix, this.format, args); } - warn(...args: string[]): void { + public warn(...args: Object[]): void { hilog.warn(this.domain, this.prefix, this.format, args); } - error(...args: string[]): void { + public error(...args: Object[]): void { hilog.error(this.domain, this.prefix, this.format, args); } } -export default new Logger(LOGGER_PREFIX, 0xFF02); \ No newline at end of file +export default new Logger('[AnimationCollection]'); \ No newline at end of file diff --git a/animationcollectionlibrary/src/main/ets/utils/WindowUtil.ets b/animationcollectionlibrary/src/main/ets/utils/WindowUtil.ets index 5daef0a..4a588b2 100644 --- a/animationcollectionlibrary/src/main/ets/utils/WindowUtil.ets +++ b/animationcollectionlibrary/src/main/ets/utils/WindowUtil.ets @@ -15,10 +15,10 @@ import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { common, ConfigurationConstant } from '@kit.AbilityKit'; import Constants from '../common/CommonConstants'; import { BreakpointSystem } from './BreakpointSystem'; +import Logger from './Logger'; const TAG: string = '[WindowUtil]'; @@ -35,7 +35,7 @@ export class WindowUtil { WindowUtil.registerBreakPoint(windowStage); WindowUtil.requestFullScreen(windowStage); } catch (err) { - hilog.error(0x0000, TAG, `WindowUtil initialize failed. Cause: ${err.code} ${err.message}`); + Logger .error(TAG, `WindowUtil initialize failed. Cause: ${err.code} ${err.message}`); } } @@ -49,13 +49,13 @@ export class WindowUtil { try { const promise: Promise = windowClass.setWindowLayoutFullScreen(true); promise.then(() => { - hilog.info(0x0000, TAG, 'Succeeded in setting the window layout to full-screen mode.'); + Logger .info(TAG, 'Succeeded in setting the window layout to full-screen mode.'); }).catch((err: BusinessError) => { - hilog.error(0x0000, TAG, + Logger .error(TAG, `Failed to set the window layout to full-screen mode. Cause: ${err.code}, ${err.message}`); }); } catch { - hilog.error(0x0000, TAG, 'Failed to set the window layout to full-screen mode.'); + Logger .error(TAG, 'Failed to set the window layout to full-screen mode.'); } }); } @@ -63,7 +63,7 @@ export class WindowUtil { public static registerBreakPoint(windowStage: window.WindowStage) { windowStage.getMainWindow((err: BusinessError, data: window.Window) => { if (err.code) { - hilog.error(0x0000, TAG, `Failed to get main window: ${err.message}`); + Logger .error(TAG, `Failed to get main window: ${err.message}`); return; } BreakpointSystem.getInstance().updateWidthBp(data); diff --git a/animationcollectionsample/src/main/ets/entryability/EntryAbility.ets b/animationcollectionsample/src/main/ets/entryability/EntryAbility.ets index f725e09..3fd04f3 100644 --- a/animationcollectionsample/src/main/ets/entryability/EntryAbility.ets +++ b/animationcollectionsample/src/main/ets/entryability/EntryAbility.ets @@ -14,48 +14,47 @@ */ import { UIAbility } from '@kit.AbilityKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { window } from '@kit.ArkUI'; -import { AnimationcollectionController } from '@ohos_samples/animationcollectionlibrary'; +import { AnimationcollectionController, Logger } from '@ohos_samples/animationcollectionlibrary'; const TAG: string = 'EntryAbility'; export default class EntryAbility extends UIAbility { onCreate(): void { - hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); + Logger.info( TAG, '%{public}s', 'Ability onCreate'); AnimationcollectionController.updatedColorMode(this.context); } onDestroy(): void { - hilog.info(0x0000, TAG, '%{public}s', 'Ability onDestroy'); + Logger.info( TAG, '%{public}s', 'Ability onDestroy'); } onWindowStageCreate(windowStage: window.WindowStage): void { // Main window is created, set main page for this ability - hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageCreate'); + Logger.info( TAG, '%{public}s', 'Ability onWindowStageCreate'); windowStage.loadContent('pages/Index', (err) => { if (err.code) { - hilog.error(0x0000, TAG, '%{public}s', 'Failed to load the content. Cause: ' + err.message); + Logger.error( TAG, '%{public}s', 'Failed to load the content. Cause: ' + err.message); return; } AnimationcollectionController.initWindowConfig(windowStage); - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in loading the content.'); + Logger.info( TAG, '%{public}s', 'Succeeded in loading the content.'); }); } onWindowStageDestroy(): void { // Main window is destroyed, release UI related resources - hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageDestroy'); + Logger.info( TAG, '%{public}s', 'Ability onWindowStageDestroy'); } onForeground(): void { // Ability has brought to foreground - hilog.info(0x0000, TAG, '%{public}s', 'Ability onForeground'); + Logger.info( TAG, '%{public}s', 'Ability onForeground'); } onBackground(): void { // Ability has back to background - hilog.info(0x0000, TAG, '%{public}s', 'Ability onBackground'); + Logger.info( TAG, '%{public}s', 'Ability onBackground'); } } \ No newline at end of file -- Gitee