diff --git a/liveviewlockscreenlibrary/Index.ets b/liveviewlockscreenlibrary/Index.ets index 3b29927499e08bb61a88791482d30279eb9d7d8a..a39d41e24bf96e7911ec96579569e27d4382faef 100644 --- a/liveviewlockscreenlibrary/Index.ets +++ b/liveviewlockscreenlibrary/Index.ets @@ -2,4 +2,6 @@ export { IndexComponent } from './src/main/ets/component/IndexComponent'; export { LockScreenComponent } from './src/main/ets/component/LockScreenComponent'; -export { LiveViewLockScreenController } from './src/main/ets/LiveViewLockScreenController'; \ No newline at end of file +export { LiveViewLockScreenController } from './src/main/ets/LiveViewLockScreenController'; + +export { default as Logger } from './src/main/ets/utils/Logger'; \ No newline at end of file diff --git a/liveviewlockscreenlibrary/src/main/ets/component/IndexComponent.ets b/liveviewlockscreenlibrary/src/main/ets/component/IndexComponent.ets index 8b216d06fdf58caa02c056a9be348c60f5e67642..1380b0c03c1ea611beabd43ee21b4c472779908c 100644 --- a/liveviewlockscreenlibrary/src/main/ets/component/IndexComponent.ets +++ b/liveviewlockscreenlibrary/src/main/ets/component/IndexComponent.ets @@ -13,8 +13,8 @@ * limitations under the License. */ -import { hilog } from '@kit.PerformanceAnalysisKit'; import { LiveView } from '../utils/LiveView'; +import Logger from '../utils/Logger'; import { TrafficView } from '../view/TrafficView'; const TAG = '[LiveViewLockScreenPage]'; @@ -57,7 +57,7 @@ struct TipDialog { .fontColor($r('app.color.tip_text')) .textAlign(TextAlign.Center) .onClick(() => { - hilog.info(0x0000, TAG, 'Button-clicking callback'); + Logger.info(TAG, 'Button-clicking callback'); this.onConfirm(); }) } diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/BreakpointSystem.ets b/liveviewlockscreenlibrary/src/main/ets/utils/BreakpointSystem.ets index a97859690a26027d9baf74cd6a48218e2c5e57eb..248731daed05e39b8273a758246baa2b25fea0a8 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/BreakpointSystem.ets +++ b/liveviewlockscreenlibrary/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]'; @@ -136,7 +136,7 @@ export class BreakpointSystem { } this.updateCurrentHeightBreakpoint(heightBp) } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `UpdateBreakpoint fail. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } } diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/BundleNameUtil.ets b/liveviewlockscreenlibrary/src/main/ets/utils/BundleNameUtil.ets index ca7a838e8da77fe06e63aece9c716d3cf6936166..d0225138daad66ffc782fe3d575d7e6de4edcf20 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/BundleNameUtil.ets +++ b/liveviewlockscreenlibrary/src/main/ets/utils/BundleNameUtil.ets @@ -15,8 +15,8 @@ import { bundleManager } from '@kit.AbilityKit'; import { BusinessError } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { Constants } from '../common/Constants'; +import Logger from './Logger'; const TAG: string = '[BundleNameUtil]'; @@ -24,16 +24,16 @@ export class BundleNameUtil { public static saveBundleName(): void { try { bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT).then((data) => { - hilog.info(0x0000, TAG, '%{public}s', 'getBundleInfoForSelf successfully.'); + Logger.info(TAG, 'getBundleInfoForSelf successfully.'); AppStorage.setOrCreate(Constants.KEY_PREFIX + 'BundleName', data.name); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `getBundleInfoForSelf failed. code is ${error.code} message is ${error.message}`); }); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `getBundleInfoForSelf failed. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } - hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); + Logger.info(TAG, 'Ability onCreate'); } } \ No newline at end of file diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/LiveView.ets b/liveviewlockscreenlibrary/src/main/ets/utils/LiveView.ets index 30eb2cec249ceaa0a91340c508ab74e9d789ffee..4b9765214edfe3412b89f032e8276daeee5a4af1 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/LiveView.ets +++ b/liveviewlockscreenlibrary/src/main/ets/utils/LiveView.ets @@ -16,11 +16,11 @@ import { appManager, WantAgent, wantAgent } from '@kit.AbilityKit'; import { backgroundTaskManager } from '@kit.BackgroundTasksKit'; import { BusinessError, commonEventManager } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { Constants } from '../common/Constants'; import { RouteData } from '../model/RouteDataModel'; import { LiveViewUtil } from './LiveViewUtil'; import { getRouteData } from '../viewmodel/RouteDataViewModel'; +import Logger from './Logger'; const TAG: string = '[LiveView]'; @@ -55,7 +55,7 @@ export class LiveView { this.updateInterval = setInterval(() => { // Monitor application state changes appManager.getRunningProcessInformation().then((data: Array) => { - hilog.info(0x0000, TAG, '%{public}s', 'Success to getRunningProcessInformation'); + Logger.info(TAG, 'Success to getRunningProcessInformation'); // Handle background state if (data[0].state === appManager.ProcessState.STATE_BACKGROUND) { let routeData: RouteData = getRouteData(); @@ -71,15 +71,15 @@ export class LiveView { // Publish system event for lock screen updates commonEventManager.publish('live_view_lock_screen', options, (error: BusinessError) => { if (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to publish commonEvent. code is ${error.code} message is ${error.message}`); } else { - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in publishing commonEvent.') + Logger.info(TAG, 'Succeeded in publishing commonEvent.') } }); } }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to getRunningProcessInformation. code is ${error.code} message is ${error.message}`); }); }, 2000) @@ -92,7 +92,7 @@ export class LiveView { if (this.updateInterval !== undefined) { clearInterval(this.updateInterval); this.updateInterval = undefined; - hilog.info(0x0000, TAG, '%{public}s', 'Timer has been cleared'); + Logger.info(TAG, 'Timer has been cleared'); } // Shutdown live view components @@ -102,14 +102,14 @@ export class LiveView { try { if (canIUse('SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask')) { backgroundTaskManager.stopBackgroundRunning(this.context).then(() => { - hilog.info(0x0000, TAG, '%{public}s', 'Operation stopBackgroundRunning succeeded'); + Logger.info(TAG, 'Operation stopBackgroundRunning succeeded'); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Operation stopBackgroundRunning failed. code is ${error.code} message is ${error.message}`); }); } } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Operation stopBackgroundRunning failed. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } } @@ -133,25 +133,25 @@ export class LiveView { // Acquire WantAgent for background operations wantAgent.getWantAgent(wantAgentInfo).then((wantAgentObj: WantAgent) => { try { - hilog.info(0x0000, TAG, '%{public}s', 'Operation startBackgroundRunning begin.'); + Logger.info(TAG, 'Operation startBackgroundRunning begin.'); // Required background resource types const list: string[] = ['location']; // Request background running permission if (canIUse('SystemCapability.ResourceSchedule.BackgroundTaskManager.ContinuousTask')) { backgroundTaskManager.startBackgroundRunning(this.context, list, wantAgentObj).then(() => { - hilog.info(0x0000, TAG, '%{public}s', 'Operation startBackgroundRunning succeeded.'); + Logger.info(TAG, 'Operation startBackgroundRunning succeeded.'); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to Operation startBackgroundRunning. code is ${error.code} message is ${error.message}`); }); } } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to Operation startBackgroundRunning. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } }); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, '%{public}s', `Failed to Operation getWantAgent. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } } diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewExtAbilityUtil.ets b/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewExtAbilityUtil.ets index d50510569358a8521b0110457b8878fef15af205..54805c794e933e5d5ab66b582083e1da10807070 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewExtAbilityUtil.ets +++ b/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewExtAbilityUtil.ets @@ -17,10 +17,10 @@ import { bundleManager, UIExtensionContentSession } from '@kit.AbilityKit'; import { display, window } from '@kit.ArkUI'; import { BusinessError, commonEventManager } from '@kit.BasicServicesKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { Constants } from '../common/Constants'; import { LaneData } from '../model/RouteDataModel'; import { BreakpointTypeEnum } from './BreakpointSystem'; +import Logger from './Logger'; const TAG: string = '[LiveViewExtAbilityUtil]'; @@ -50,7 +50,7 @@ export class LiveViewExtAbilityUtil { LiveViewExtAbilityUtil.updateBreakPoint(windowSize); }); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Session update break point failed. code: ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } LiveViewExtAbilityUtil.getInstance().createSubscriber(); @@ -73,25 +73,23 @@ export class LiveViewExtAbilityUtil { commonEventManager.createSubscriber(subscribeInfo, (error: BusinessError, data: commonEventManager.CommonEventSubscriber) => { if (error) { - hilog.error(0x0000, TAG, '%{public}s', - `Failed to create subscriber. code is ${error.code} message is ${error.message}.`); + Logger.error(TAG, `Failed to create subscriber. code is ${error.code} message is ${error.message}.`); return; } this.subscriber = data; - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in creating subscriber.'); + Logger.info(TAG, 'Succeeded in creating subscriber.'); // Event handling logic. commonEventManager.subscribe(this.subscriber, async (error: BusinessError, data: commonEventManager.CommonEventData) => { if (error) { - hilog.error(0x0000, TAG, '%{public}s', - `Failed to subscribe commonEvent. code is ${error.code} message is ${error.message}.`); + Logger.error(TAG, `Failed to subscribe commonEvent. code is ${error.code} message is ${error.message}.`); return; } - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in subscribe commonEvent success.'); + Logger.info(TAG, 'Succeeded in subscribe commonEvent success.'); if (data.parameters) { let laneData = data.parameters['laneData'] as LaneData; AppStorage.setOrCreate(Constants.KEY_PREFIX + 'LaneData', laneData); - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in receive commonEvent.'); + Logger.info(TAG, 'Succeeded in receive commonEvent.'); } }); }) @@ -113,9 +111,9 @@ export class LiveViewExtAbilityUtil { currentHeightBreakpoint = BreakpointTypeEnum.MD; } AppStorage.setOrCreate(Constants.KEY_PREFIX + 'CurrentHeightBreakpoint', currentHeightBreakpoint); - hilog.info(0x0000, TAG, '%{public}s', 'updateBreakpoint'); + Logger.info(TAG, 'updateBreakpoint'); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `updateBreakpoint catch. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`) ; } @@ -126,16 +124,16 @@ export class LiveViewExtAbilityUtil { try { bundleManager.getBundleInfoForSelf(bundleManager.BundleFlag.GET_BUNDLE_INFO_DEFAULT).then((data) => { bundleName = data.name; - hilog.info(0x0000, TAG, '%{public}s', 'getBundleInfoForSelf successfully.'); + Logger.info(TAG, 'getBundleInfoForSelf successfully.'); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `getBundleInfoForSelf failed. code is ${error.code} message is ${error.message}`); }); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `getBundleInfoForSelf failed. code is ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } - hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); + Logger.info(TAG, 'Ability onCreate'); return bundleName; } } \ No newline at end of file diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets b/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets index b97373ab8741e6c8ce60bff7ae08ac985ef2fe5a..47e00d9cbb9407f988b0728ab95d0d7cbe4be957 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets +++ b/liveviewlockscreenlibrary/src/main/ets/utils/LiveViewUtil.ets @@ -16,9 +16,9 @@ import { Want, wantAgent } from '@kit.AbilityKit'; import { BusinessError } from '@kit.BasicServicesKit'; import { liveViewManager } from '@kit.LiveViewKit'; -import { hilog } from '@kit.PerformanceAnalysisKit'; import { Constants } from '../common/Constants'; import { RouteData } from '../model/RouteDataModel'; +import Logger from './Logger'; const TAG: string = '[LiveViewUtil]'; @@ -34,7 +34,7 @@ export class LiveViewUtil { public async startLiveView(params: RouteData): Promise { // Verify that the live view switch is turned on if (!await LiveViewUtil.isLiveViewEnabled()) { - hilog.error(0x0000, TAG, '%{public}s', 'Live view is disabled.'); + Logger.error(TAG, 'Live view is disabled.'); return; } this.defaultLiveView = await this.createPrimaryLiveView(); @@ -43,7 +43,7 @@ export class LiveViewUtil { try { await liveViewManager.startLiveView(this.defaultLiveView); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to start live view. Cause code: ${(error as BusinessError).code}, message: ${(error as BusinessError).message}`); } } @@ -52,17 +52,17 @@ export class LiveViewUtil { try { // live view is disabled or default view is not init if (!await LiveViewUtil.isLiveViewEnabled() || !this.defaultLiveView) { - hilog.error(0x0000, TAG, '%{public}s', 'updateLiveView, live view is disabled.'); + Logger.error(TAG, 'updateLiveView, live view is disabled.'); return false; } this.updateLiveViewInfo(params); const result = await liveViewManager.updateLiveView(this.defaultLiveView); if (result) { - hilog.info(0x0000, TAG, '%{public}s', 'updateLiveView.'); + Logger.info(TAG, 'updateLiveView.'); } return true; } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to update live view. Cause code: ${(error as BusinessError).code}, message: ${(error as BusinessError).message}`); return false; } @@ -76,25 +76,23 @@ export class LiveViewUtil { await liveViewManager.stopLiveView(this.defaultLiveView).then(() => { this.sequence = 0; this.defaultLiveView = undefined; - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in stopping liveView, result: %{public}'); + Logger.info(TAG, 'Succeeded in stopping liveView, result: %{public}'); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', - `Failed to stop liveView. Cause code: ${error.code}, message: ${error.message}`); + Logger.error(TAG, `Failed to stop liveView. Cause code: ${error.code}, message: ${error.message}`); }); } private static async isLiveViewEnabled(): Promise { try { liveViewManager.isLiveViewEnabled().then((isEnabled: boolean) => { - hilog.info(0x0000, TAG, '%{public}s', - 'Succeeded in checking whether liveView is enabled.'); + Logger.info(TAG, 'Succeeded in checking whether liveView is enabled.'); return isEnabled; }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to check whether liveView is enabled. Cause code: ${error.code}, message: ${error.message}`); }); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to check whether liveView is enabled. Cause code: ${error.code}, message: ${error.message}`); } return true; @@ -179,7 +177,7 @@ export class LiveViewUtil { try { return await wantAgent.getWantAgent(wantAgentInfo); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to build WantAgent. code: ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); return undefined; } @@ -190,7 +188,7 @@ export class LiveViewUtil { try { stringSyn = this.context.resourceManager.getStringSync(resId); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Get string failed. code: ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } return stringSyn; diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/Logger.ets b/liveviewlockscreenlibrary/src/main/ets/utils/Logger.ets new file mode 100644 index 0000000000000000000000000000000000000000..b6f93a466a96b433943e863cc712a2d8476cc29e --- /dev/null +++ b/liveviewlockscreenlibrary/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('[LiveViewLockScreen]'); \ No newline at end of file diff --git a/liveviewlockscreenlibrary/src/main/ets/utils/WindowUtil.ets b/liveviewlockscreenlibrary/src/main/ets/utils/WindowUtil.ets index 8d01e9033da8e0b927ff9b7bd5ceedb25fb4a605..1ff1926c0fd2f09bf204b75da56f9ac35ad6a4b9 100644 --- a/liveviewlockscreenlibrary/src/main/ets/utils/WindowUtil.ets +++ b/liveviewlockscreenlibrary/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 { Constants } from '../common/Constants'; import { BreakpointSystem } from './BreakpointSystem'; +import Logger from './Logger'; const TAG: string = '[WindowUtil]'; @@ -32,7 +32,7 @@ export class WindowUtil { WindowUtil.registerBreakPoint(WindowUtil.windowClass); WindowUtil.requestFullScreen(WindowUtil.windowClass); } 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,7 +49,7 @@ export class WindowUtil { }); } catch (e) { const error = e as BusinessError; - hilog.error(0x0000, TAG, + Logger.error(TAG, `Get windowAvoidArea or Register windowSizeChange failed. code: ${error.code}, message: ${error.message}`); } } @@ -62,7 +62,7 @@ export class WindowUtil { WindowUtil.windowClass?.getUIContext().px2vp(area.bottomRect.height)); } } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Get windowAvoidArea or Register windowSizeChange failed. code: ${(error as BusinessError).code} message is ${(error as BusinessError).message}`); } } @@ -72,21 +72,20 @@ export class WindowUtil { windowClass.setWindowSystemBarProperties({ statusBarContentColor: '#ffffff', }).then(() => { - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in setting the system bar properties.'); + Logger.info(TAG, 'Succeeded in setting the system bar properties.'); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to set the window layout to full-screen mode. Cause code: ${error.code}, message: ${error.message}`); }); windowClass.setWindowLayoutFullScreen(true).then(() => { - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in setting the window layout to full-screen mode'); + Logger.info(TAG, 'Succeeded in setting the window layout to full-screen mode'); }).catch((error: BusinessError) => { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to set the window layout to full-screen mode. Cause code: ${error.code}, message: ${error.message}`); }); } catch (error) { - hilog.error(0x0000, TAG, '%{public}s', - `onWindowStageCreate failed. Cause code: ${error.code}, message: ${error.message}`); + Logger.error(TAG, `onWindowStageCreate failed. Cause code: ${error.code}, message: ${error.message}`); } } } \ No newline at end of file diff --git a/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets b/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets index 5b354c26ceead263fb665662a09feeaf84500d7e..8bcfb3b6b7e8940a1e9a7a51f56fa63797dec622 100644 --- a/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets +++ b/liveviewlockscreensample/src/main/ets/entryability/EntryAbility.ets @@ -15,47 +15,46 @@ import { UIAbility } from '@kit.AbilityKit'; import { window } from '@kit.ArkUI'; -import { hilog } from '@kit.PerformanceAnalysisKit'; -import { LiveViewLockScreenController } from '@ohos_samples/liveviewlockscreenlibrary'; +import { LiveViewLockScreenController, Logger } from '@ohos_samples/liveviewlockscreenlibrary'; const TAG: string = '[EntryAbility]'; export default class EntryAbility extends UIAbility { onCreate(): void { LiveViewLockScreenController.saveBundleName(); - hilog.info(0x0000, TAG, '%{public}s', 'Ability onCreate'); + Logger.info(TAG, 'Ability onCreate'); } 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', (error) => { if (error.code) { - hilog.error(0x0000, TAG, '%{public}s', + Logger.error(TAG, `Failed to load the content. Cause code: ${error.code}, message: ${error.message}`); return; } LiveViewLockScreenController.initWindowConfig(windowStage); - hilog.info(0x0000, TAG, '%{public}s', 'Succeeded in loading the content.'); + Logger.info(TAG, '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, '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'); } } \ No newline at end of file