From 875ca4fa8edd4a265a85aaa31b6a79452bf510c0 Mon Sep 17 00:00:00 2001 From: "DESKTOP-9FJNTIC\\gyb" <121287102@qq.com> Date: Thu, 18 Sep 2025 21:15:15 +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 --- multipleimagelibrary/Index.ets | 2 + .../ets/component/MultipleImageComponent.ets | 6 +-- .../src/main/ets/utils/BreakpointSystem.ets | 4 +- .../src/main/ets/utils/Logger.ets | 45 +++++++++++++++++++ .../src/main/ets/utils/WindowUtil.ets | 12 ++--- .../main/ets/entryability/EntryAbility.ets | 19 ++++---- 6 files changed, 67 insertions(+), 21 deletions(-) create mode 100644 multipleimagelibrary/src/main/ets/utils/Logger.ets diff --git a/multipleimagelibrary/Index.ets b/multipleimagelibrary/Index.ets index dd7373d..0cd4ede 100644 --- a/multipleimagelibrary/Index.ets +++ b/multipleimagelibrary/Index.ets @@ -1,3 +1,5 @@ export { MultipleImageComponent } from './src/main/ets/component/MultipleImageComponent'; export { MultipleImageController } from './src/main/ets/MultipleImageController'; + +export { default as Logger } from './src/main/ets/utils/Logger'; diff --git a/multipleimagelibrary/src/main/ets/component/MultipleImageComponent.ets b/multipleimagelibrary/src/main/ets/component/MultipleImageComponent.ets index 339c439..f33e804 100644 --- a/multipleimagelibrary/src/main/ets/component/MultipleImageComponent.ets +++ b/multipleimagelibrary/src/main/ets/component/MultipleImageComponent.ets @@ -15,9 +15,9 @@ import { common } from '@kit.AbilityKit'; import { display } from '@kit.ArkUI'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { CommonConstants } from '../constants/CommonConstants'; import { BreakpointType, BreakpointTypeEnum } from '../utils/BreakpointSystem'; +import Logger from '../utils/Logger'; import { DataSource, PhotoData } from '../viewmodel/DataSource'; const TAG: string = '[Index]' @@ -58,7 +58,7 @@ export struct MultipleImageComponent { this.progressData = list; this.data = new DataSource(list); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to set window. code: ${error.code}, message: ${error.message}`); } } @@ -67,7 +67,7 @@ export struct MultipleImageComponent { try { display?.off('change'); } catch (error) { - hilog.error(0x0000, TAG, `Failed to unregister the callback for display changes. Cause: ${error.message}`); + Logger.error(TAG, `Failed to unregister the callback for display changes. Cause: ${error.message}`); } } diff --git a/multipleimagelibrary/src/main/ets/utils/BreakpointSystem.ets b/multipleimagelibrary/src/main/ets/utils/BreakpointSystem.ets index 795d2f8..a02ee47 100644 --- a/multipleimagelibrary/src/main/ets/utils/BreakpointSystem.ets +++ b/multipleimagelibrary/src/main/ets/utils/BreakpointSystem.ets @@ -15,8 +15,8 @@ import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { CommonConstants } from '../constants/CommonConstants'; +import Logger from './Logger'; const TAG: string = '[BreakpointSystem]'; @@ -106,7 +106,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/multipleimagelibrary/src/main/ets/utils/Logger.ets b/multipleimagelibrary/src/main/ets/utils/Logger.ets new file mode 100644 index 0000000..74b07d4 --- /dev/null +++ b/multipleimagelibrary/src/main/ets/utils/Logger.ets @@ -0,0 +1,45 @@ +/* + * 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'; + + public constructor(prefix: string) { + this.prefix = prefix; + this.domain = 0x0000; + } + + public debug(...args: Object[]): void { + hilog.debug(this.domain, this.prefix, this.format, args); + } + + public info(...args: Object[]): void { + hilog.info(this.domain, this.prefix, this.format, args); + } + + public warn(...args: Object[]): void { + hilog.warn(this.domain, this.prefix, this.format, args); + } + + public error(...args: Object[]): void { + hilog.error(this.domain, this.prefix, this.format, args); + } +} + +export default new Logger('[ContinuePublish]'); \ No newline at end of file diff --git a/multipleimagelibrary/src/main/ets/utils/WindowUtil.ets b/multipleimagelibrary/src/main/ets/utils/WindowUtil.ets index e263095..1110666 100644 --- a/multipleimagelibrary/src/main/ets/utils/WindowUtil.ets +++ b/multipleimagelibrary/src/main/ets/utils/WindowUtil.ets @@ -15,9 +15,9 @@ import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { CommonConstants } from '../constants/CommonConstants'; import { BreakpointSystem } from './BreakpointSystem'; +import Logger from './Logger'; const TAG: string = '[WindowUtil]'; @@ -34,7 +34,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}`); } } @@ -50,13 +50,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.'); } }); } @@ -64,7 +64,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/multipleimagesample/src/main/ets/entryability/EntryAbility.ets b/multipleimagesample/src/main/ets/entryability/EntryAbility.ets index 133dd4c..36190e0 100644 --- a/multipleimagesample/src/main/ets/entryability/EntryAbility.ets +++ b/multipleimagesample/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 { BusinessError } from '@kit.BasicServicesKit'; -import { MultipleImageController } from '@ohos_sample/multipleimagelibrary'; +import { Logger, MultipleImageController } from '@ohos_sample/multipleimagelibrary'; 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'); } 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', (error: BusinessError) => { if (error.code) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to load the content. code: ${error.code}, message: ${error.message}`); return; } MultipleImageController.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