diff --git a/README.md b/README.md index 263d0f8708dd99d61746adba8d7d7496c95cf447..e8fbace301cb962627e7e78de56916190e819596 100644 --- a/README.md +++ b/README.md @@ -39,6 +39,7 @@ multicolumnslibrary │ │ └──dataType.ets // 侧边栏菜单数据类型 │ ├──utils │ │ ├──BreakpointSystem.ets // 断点 +│ │ ├──Logger.ets │ │ └──WindowUtils.ets // 窗口工具 │ ├──view │ │ ├──MailBoxView.ets // 邮箱 diff --git a/README_EN.md b/README_EN.md index aff6dbeb65969fcb694a7b5cb579f1ca180de18a..fbbdccefa87a603877c500cf7f2dc6c6ffef28ee 100644 --- a/README_EN.md +++ b/README_EN.md @@ -40,6 +40,7 @@ multicolumnslibrary │ │ └──dataType.ets // Sidebar menu data type │ ├──utils │ │ ├──BreakpointSystem.ets // BreakpointSystem util +│ │ ├──Logger.ets │ │ └──WindowUtils.ets // Window util │ ├──view │ │ ├──MailBoxView.ets // Mailbox diff --git a/multicolumnslibrary/Index.ets b/multicolumnslibrary/Index.ets index ea7a239841fbe5ea81be9bd76d2b7ce800203adb..07dc90e4ccec1de3ffdb6bb4957bf3fb86eec371 100644 --- a/multicolumnslibrary/Index.ets +++ b/multicolumnslibrary/Index.ets @@ -1,3 +1,5 @@ export { MultiColumnsView } from './src/main/ets/view/MultiColumnsView'; -export { MultiColumnController } from './src/main/ets/MultiColumnController'; \ No newline at end of file +export { MultiColumnController } from './src/main/ets/MultiColumnController'; + +export { default as Logger } from './src/main/ets/utils/Logger'; \ No newline at end of file diff --git a/multicolumnslibrary/src/main/ets/component/MailNavigation.ets b/multicolumnslibrary/src/main/ets/component/MailNavigation.ets index 484e8c11b2ebea48a0ed948feaf0ac1dd8d3f07f..3a09cccb28352042141d73d70cca3309539741a2 100644 --- a/multicolumnslibrary/src/main/ets/component/MailNavigation.ets +++ b/multicolumnslibrary/src/main/ets/component/MailNavigation.ets @@ -163,7 +163,7 @@ export struct MailNavigation { .margin({ right: $r('sys.float.padding_level16'), bottom: this.currentBreakPoint === BreakpointTypeEnum.SM ? $r('sys.float.padding_level32') : - $r('sys.float.padding_level24') + $r('sys.float.padding_level24') }) } } diff --git a/multicolumnslibrary/src/main/ets/utils/BreakpointSystem.ets b/multicolumnslibrary/src/main/ets/utils/BreakpointSystem.ets index 49904a9af421b6194e9af98c4b5ef992cdf818c1..dad73189967d21362c0567c5d20fbb5155a72cc8 100644 --- a/multicolumnslibrary/src/main/ets/utils/BreakpointSystem.ets +++ b/multicolumnslibrary/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 { Constants } from '../common/Constants'; +import Logger from './Logger'; const TAG: string = '[BreakpointSystem]'; @@ -114,7 +114,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/multicolumnslibrary/src/main/ets/utils/Logger.ets b/multicolumnslibrary/src/main/ets/utils/Logger.ets new file mode 100644 index 0000000000000000000000000000000000000000..79068b09bf36b5f9db6c05fdae4ffd63355ee6a8 --- /dev/null +++ b/multicolumnslibrary/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('[multiColumns]'); \ No newline at end of file diff --git a/multicolumnslibrary/src/main/ets/utils/WindowUtils.ets b/multicolumnslibrary/src/main/ets/utils/WindowUtils.ets index 515046cff216e5f56ddd4b1b20dca3f7f22e64f2..e83115042aabb4841a8d037ad88cc221ac2ce1be 100644 --- a/multicolumnslibrary/src/main/ets/utils/WindowUtils.ets +++ b/multicolumnslibrary/src/main/ets/utils/WindowUtils.ets @@ -15,9 +15,9 @@ import { window } from '@kit.ArkUI'; import type { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { Constants } from '../common/Constants'; import { BreakpointSystem } from './BreakpointSystem'; +import Logger from './Logger'; const TAG: string = '[WindowUtil]'; @@ -33,7 +33,7 @@ export class WindowUtil { WindowUtil.registerBreakPoint(WindowUtil.windowClass); } catch (err) { const error = err as BusinessError; - hilog.error(0x0000, TAG, `Initialize failed. Cause code: ${error.code}, message: ${error.message}`); + Logger.error(TAG, `Initialize failed. Cause code: ${error.code}, message: ${error.message}`); } } @@ -42,14 +42,14 @@ 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 (err) { const error = err as BusinessError; - hilog.error(0x0000, TAG, + Logger.error(TAG, `Failed to set the window layout to full-screen mode.Cause code: ${error.code}, message: ${error.message}.`); } } @@ -68,7 +68,7 @@ export class WindowUtil { }); } catch (err) { const error = err as BusinessError; - hilog.error(0x0000, TAG, + Logger.error(TAG, `Register avoidAreaChange or windowSizeChange failed. code: ${error.code}, message: ${error.message}`); } } diff --git a/multicolumnslibrary/src/main/ets/view/MailBoxView.ets b/multicolumnslibrary/src/main/ets/view/MailBoxView.ets index aa7fb587793333f9a4e0bd28031f271eaf49faf4..cf1e618ddd3ee59874218923e799faf31695ee97 100644 --- a/multicolumnslibrary/src/main/ets/view/MailBoxView.ets +++ b/multicolumnslibrary/src/main/ets/view/MailBoxView.ets @@ -73,7 +73,7 @@ export struct MailBoxView { .sideBarWidth(this.sideBarWidth) .minSideBarWidth(Constants.SIDE_BAR_WIDTH_MIN) .minContentWidth(this.currentBreakPoint === BreakpointTypeEnum.SM ? '100%' : - Constants.SIDE_BAR_WIDTH_CONTENT_MIN) + Constants.SIDE_BAR_WIDTH_CONTENT_MIN) .controlButton({ left: new BreakpointType({ sm: Constants.PADDING_16 + Constants.BACK_SIZE, diff --git a/multicolumnslibrary/src/main/ets/view/MultiColumnsView.ets b/multicolumnslibrary/src/main/ets/view/MultiColumnsView.ets index 614b1e3181886fe280cfcc11bf1122bc711a3fed..61e7a2c116f344796516105d37604a22273e0130 100644 --- a/multicolumnslibrary/src/main/ets/view/MultiColumnsView.ets +++ b/multicolumnslibrary/src/main/ets/view/MultiColumnsView.ets @@ -14,9 +14,9 @@ */ import { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { Constants, Route } from '../common/Constants'; import { BreakpointTypeEnum } from '../utils/BreakpointSystem'; +import Logger from '../utils/Logger'; @Component export struct MultiColumnsView { @@ -51,7 +51,7 @@ export struct MultiColumnsView { try { this.pathStack.pushPathByName(item.to, null); } catch (error) { - hilog.error(0x0000, 'testTag', `Push url fail. Cause: ${(error as BusinessError).message}`); + Logger.error('MultiColumnsView', `Push url fail. Cause: ${(error as BusinessError).message}.`); } }) }, (item: Route) => JSON.stringify(item)) diff --git a/multicolumnssample/src/main/ets/entryability/EntryAbility.ets b/multicolumnssample/src/main/ets/entryability/EntryAbility.ets index 2192752c368ca5351b8ab5547fcf2ab45e5bb3fe..097609458f1fac1aa49ce9d658a5a6fa0b92e3c4 100644 --- a/multicolumnssample/src/main/ets/entryability/EntryAbility.ets +++ b/multicolumnssample/src/main/ets/entryability/EntryAbility.ets @@ -16,32 +16,31 @@ import { ConfigurationConstant, UIAbility } from '@kit.AbilityKit'; import { window } from '@kit.ArkUI'; import { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; -import { MultiColumnController } from '@ohos_samples/multicolumnslibrary'; +import { Logger, MultiColumnController } from '@ohos_samples/multicolumnslibrary'; const TAG = '[EntryAbility]'; export default class EntryAbility extends UIAbility { onCreate(): void { - hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); + Logger.info(TAG, 'Ability onCreate'); try { this.context.getApplicationContext().setColorMode(ConfigurationConstant.ColorMode.COLOR_MODE_NOT_SET); } catch (error) { const err: BusinessError = error as BusinessError; - hilog.error(0x0000, TAG, '%{public}s', `Set colorMode failed: ${err.code}, ${err.message}`); + Logger.error(TAG, `Set colorMode failed: ${err.code}, ${err.message}`); } } onDestroy(): void { - hilog.info(0x0000, TAG, '%{public}s', 'Ability onDestroy'); + Logger.info(TAG, '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, 'Ability onWindowStageCreate'); windowStage.loadContent('pages/Index', (err: BusinessError) => { if (err.code) { - hilog.error(0x0000, TAG, `Failed to load the content. Cause: ${err.message}`); + Logger.error(TAG, `Failed to load the content. Cause: ${err.message}`); return; } MultiColumnController.initWindowConfig(windowStage); @@ -50,16 +49,16 @@ export default class EntryAbility extends UIAbility { onWindowStageDestroy(): void { // Main window is destroyed, release UI related resources - hilog.info(0x0000, TAG, '%{public}s', 'Ability onWindowStageDestroy'); + Logger.info(TAG, 'Ability onWindowStageDestroy'); } onForeground(): void { // Ability has brought to foreground - hilog.info(0x0000, TAG, '%{public}s', 'Ability onForeground'); + Logger.info(TAG, 'Ability onForeground'); } onBackground(): void { // Ability has back to background - hilog.info(0x0000, TAG, '%{public}s', 'Ability onBackground'); + Logger.info(TAG, 'Ability onBackground'); } }