From 944320b255605456fbd3bcd23ad9284905d68c09 Mon Sep 17 00:00:00 2001 From: YangPeng Date: Wed, 25 May 2022 15:00:17 +0800 Subject: [PATCH] change some log Signed-off-by: yangpeng85 --- .../src/main/ets/com/ohos/model/accountsModel.ts | 11 +++++------ .../src/main/ets/com/ohos/model/screenLockModel.ts | 4 +--- .../src/main/ets/com/ohos/model/screenlockStyle.ts | 2 +- .../main/ets/com/ohos/view/component/batterySoc.ets | 2 +- .../main/ets/com/ohos/view/component/customPSD.ets | 4 ++-- .../main/ets/com/ohos/view/component/digitalPSD.ets | 4 ++-- .../src/main/ets/com/ohos/view/component/lockIcon.ets | 2 +- .../src/main/ets/com/ohos/view/component/mixedPSD.ets | 4 ++-- .../main/ets/com/ohos/view/component/numkeyBoard.ets | 4 ++-- .../main/ets/com/ohos/view/component/statusBar.ets | 2 +- .../src/main/ets/com/ohos/vm/baseViewModel.ts | 3 +-- .../src/main/ets/com/ohos/vm/batterySocViewModel.ets | 2 +- .../src/main/ets/com/ohos/vm/customPSDViewModel.ts | 2 +- .../src/main/ets/com/ohos/vm/digitalPSDViewModel.ts | 2 +- .../src/main/ets/com/ohos/vm/lockIconViewModel.ts | 2 +- .../src/main/ets/com/ohos/vm/mixedPSDViewModel.ts | 2 +- .../src/main/ets/com/ohos/view/component/shortcut.ets | 6 +++--- .../src/main/ets/default/pages/signalIcon.ets | 4 ++-- .../src/main/ets/default/signalModel.ts | 8 ++++---- .../main/ets/com/ohos/view/component/wallpaper.ets | 2 +- .../src/main/ets/com/ohos/vm/wallpaperViewModel.ts | 2 +- .../src/main/ets/default/pages/wifiIcon.ets | 4 ++-- .../wificomponent/src/main/ets/default/wifiModel.ts | 6 ++---- product/pc/src/main/ets/Application/AbilityStage.ts | 2 +- .../main/ets/ServiceExtAbility/ServiceExtAbility.ts | 8 ++++---- product/pc/src/main/ets/pages/customPassword.ets | 4 ++-- product/pc/src/main/ets/pages/customscreenlock.ets | 4 ++-- product/pc/src/main/ets/pages/digitalPassword.ets | 4 ++-- product/pc/src/main/ets/pages/index.ets | 8 ++++---- product/pc/src/main/ets/pages/journalscreenlock.ets | 4 ++-- product/pc/src/main/ets/pages/mixedPassword.ets | 4 ++-- product/pc/src/main/ets/pages/slidescreenlock.ets | 2 +- product/pc/src/main/ets/vm/indexViewModel.ts | 2 +- .../pc/src/main/ets/vm/slideScreenLockViewModel.ts | 2 +- product/phone/src/main/ets/AbilityStage.ts | 2 +- .../main/ets/ServiceExtAbility/ServiceExtAbility.ts | 6 +++--- product/phone/src/main/ets/pages/customPassword.ets | 4 ++-- product/phone/src/main/ets/pages/customscreenlock.ets | 4 ++-- product/phone/src/main/ets/pages/digitalPassword.ets | 4 ++-- product/phone/src/main/ets/pages/index.ets | 8 ++++---- .../phone/src/main/ets/pages/journalscreenlock.ets | 4 ++-- product/phone/src/main/ets/pages/mixedPassword.ets | 4 ++-- product/phone/src/main/ets/pages/slidescreenlock.ets | 2 +- product/phone/src/main/ets/vm/indexViewModel.ts | 6 +++--- .../phone/src/main/ets/vm/slideScreenLockViewModel.ts | 2 +- 45 files changed, 84 insertions(+), 90 deletions(-) diff --git a/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts b/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts index 3005621..0d837fb 100644 --- a/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/model/accountsModel.ts @@ -109,7 +109,7 @@ export default class AccountsModel { } private addAllUsers() { - Log.showInfo(TAG, "start getAllUsers") + Log.showDebug(TAG, "start getAllUsers") osAccount.getAccountManager().queryAllCreatedOsAccounts().then((list) => { Log.showDebug(TAG, "start sort") let accountList = []; @@ -151,9 +151,8 @@ export default class AccountsModel { onUserSwitch(userId: number) { Log.showDebug(TAG, "onUserSwitch:" + userId) osAccount.getAccountManager().activateOsAccount(userId).then(() => { - Log.showInfo(TAG, "activateOsAccount") + Log.showInfo(TAG, "activateOsAccount : " + userId); }) - Log.showDebug(TAG, "onUserSwitch:" + userId + "finish") } authUser(challenge, authType: AuthType, authLevel: number, callback) { @@ -204,17 +203,17 @@ export default class AccountsModel { inputData.onSetData(passType, uint8PW); } }) - Log.showInfo(TAG, `registerInputer result:${result} `); + Log.showInfo(TAG, `registerInputer result:${result}`); return result; } unregisterInputer() { - Log.showInfo(TAG, `unregisterInputer`); + Log.showDebug(TAG, `unregisterInputer`); this.pinAuthManager.unregisterInputer(); } modelFinish() { - Log.showInfo(TAG, "start modelFinish") + Log.showDebug(TAG, "start modelFinish") } isActivateAccount(callback: Callback) { diff --git a/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts b/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts index dc59cc1..441e23a 100644 --- a/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts @@ -40,12 +40,10 @@ export default class ScreenLockModel { default: Log.showError(TAG, `eventListener:typeName ${typeName}`) } - - Log.showDebug(TAG, `eventListener:typeName ${typeName} finish`); } eventCancelListener(typeName: string) { - Log.showInfo(TAG, `eventCancleListener:typeName ${typeName}`); + Log.showDebug(TAG, `eventCancleListener:typeName ${typeName}`); // As off has some problem and there is no case to cancel, do nothing } diff --git a/features/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts b/features/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts index 7632c4b..874810d 100644 --- a/features/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts +++ b/features/screenlock/src/main/ets/com/ohos/model/screenlockStyle.ts @@ -31,7 +31,7 @@ class ScreenlockStyle { private screenMode: LockStyleMode = LockStyleMode.SlideScreenLock setMode(mode: LockStyleMode): number { - Log.showInfo(TAG, `setMode:${mode}`); + Log.showDebug(TAG, `setMode:${mode}`); return this.screenMode = mode } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/batterySoc.ets b/features/screenlock/src/main/ets/com/ohos/view/component/batterySoc.ets index 0541967..6bfaec8 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/batterySoc.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/batterySoc.ets @@ -25,7 +25,7 @@ export default struct BatterySoc { @State batterySocText: string | Resource = '' aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.onBatterySocChanged(''); } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets b/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets index dbe172c..104f9e3 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/customPSD.ets @@ -26,14 +26,14 @@ export default struct CustomPSD { @StorageLink('passwordArr') passwordArr: any[] = this.mViewModel.passwordArr aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.checkFreezingTime(() => { Log.showInfo(TAG, `onClick callback is called`) }); } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) this.mViewModel.clearPassword() } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets b/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets index 30c5f50..3ad9389 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/digitalPSD.ets @@ -26,14 +26,14 @@ export default struct DigitalPSD { @StorageLink('passwdMaskArr') passwdMaskArr: any[] = this.mViewModel.passwdMaskArr aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.checkFreezingTime(() => { Log.showInfo(TAG, `onClick callback is called`) }); } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) this.mViewModel.clearPassword() } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets b/features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets index 23804f7..6981027 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/lockIcon.ets @@ -26,7 +26,7 @@ export default struct LockIcon { @State mViewModel: ViewModel = new ViewModel() aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.ViewModelInit() } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets b/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets index 0274c0e..82bd579 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/mixedPSD.ets @@ -24,14 +24,14 @@ export default struct MixedPSD { @State mViewModel: ViewModel = new ViewModel() aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.checkFreezingTime(() => { Log.showInfo(TAG, `onClick callback is called`) }); } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) this.mViewModel.clearPassword() } diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets b/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets index 30d58e6..d94dbd1 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/numkeyBoard.ets @@ -26,11 +26,11 @@ export default struct NumkeyBoard { @StorageLink('numKeyboard') numKeyboard: any[] = Constants.NUMKEY_BOARD; aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets b/features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets index d50791b..b310ab3 100644 --- a/features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets +++ b/features/screenlock/src/main/ets/com/ohos/view/component/statusBar.ets @@ -42,7 +42,7 @@ export default struct statusBar { } aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) } } \ No newline at end of file diff --git a/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts index 721af28..46842f7 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts @@ -34,7 +34,7 @@ export default class BaseViewModel { } ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); + Log.showDebug(TAG, 'ViewModelInit'); this.prompt = $r('app.string.input'); } @@ -80,7 +80,6 @@ export default class BaseViewModel { this.updateStorage(callback) //notify the base service that the unlock is fail service.notifyScreenResult(UnlockResult.Fail); - Log.showDebug(TAG, `changePrompt end`) } getFreezingTimeNm(freezingMillisecond: number): string { diff --git a/features/screenlock/src/main/ets/com/ohos/vm/batterySocViewModel.ets b/features/screenlock/src/main/ets/com/ohos/vm/batterySocViewModel.ets index c844e00..8c8ca34 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/batterySocViewModel.ets +++ b/features/screenlock/src/main/ets/com/ohos/vm/batterySocViewModel.ets @@ -22,7 +22,7 @@ export default class BatterySocViewModel { mbatterySocStr= AppStorage.SetAndLink('batterySoc', 0); ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); + Log.showDebug(TAG, 'ViewModelInit'); let batteryValue: number = this.mbatterySocStr.get(); if (batteryValue < 100) { this.batterySocStr = "" diff --git a/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts index 9c6a0e8..a6a30d4 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/customPSDViewModel.ts @@ -29,7 +29,7 @@ export default class CustomPSDViewModel extends BaseViewModel { } ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); + Log.showDebug(TAG, 'ViewModelInit'); super.ViewModelInit(); } diff --git a/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts index 175c3cc..fe885c1 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/digitalPSDViewModel.ts @@ -32,7 +32,7 @@ export default class DigitalPSDViewModel extends BaseViewModel { } ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); + Log.showDebug(TAG, 'ViewModelInit'); this.passwdMaskArr = new Array(PW_LEN).fill($r('app.media.ic_hollow_dot')); super.ViewModelInit(); } diff --git a/features/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts index 26a798f..4ac29aa 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/lockIconViewModel.ts @@ -24,7 +24,7 @@ export default class LockIconViewModel { iconPath: any= {} ViewModelInit(): void{ - Log.showInfo(TAG, `ViewModelInit`); + Log.showDebug(TAG, `ViewModelInit`); this.iconPath = $r('app.media.ic_public_lock_filled'); this.cutMessage = $r('app.string.lock_prompt') } diff --git a/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts b/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts index 43e17b6..a959530 100644 --- a/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts +++ b/features/screenlock/src/main/ets/com/ohos/vm/mixedPSDViewModel.ts @@ -27,7 +27,7 @@ export default class MixedPSDViewModel extends BaseViewModel { } ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); + Log.showDebug(TAG, 'ViewModelInit'); super.ViewModelInit(); } diff --git a/features/shortcutcomponent/src/main/ets/com/ohos/view/component/shortcut.ets b/features/shortcutcomponent/src/main/ets/com/ohos/view/component/shortcut.ets index 4b8d7e0..933da1e 100644 --- a/features/shortcutcomponent/src/main/ets/com/ohos/view/component/shortcut.ets +++ b/features/shortcutcomponent/src/main/ets/com/ohos/view/component/shortcut.ets @@ -29,7 +29,7 @@ export default struct Shortcut { private rebootLabel: Resource = $r("app.string.reboot") aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) } build() { @@ -60,11 +60,11 @@ struct ShortcutComponent { private mClickEvent: Function aboutToAppear() { - Log.showDebug(this.mTag, `aboutToAppear Start`) + Log.showInfo(this.mTag, `aboutToAppear Start`) } aboutToDisappear() { - Log.showDebug(this.mTag, `aboutToDisAppear`) + Log.showInfo(this.mTag, `aboutToDisAppear`) } build() { diff --git a/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets b/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets index 4acf94a..8ba8f51 100644 --- a/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets +++ b/features/signalcomponent/src/main/ets/default/pages/signalIcon.ets @@ -36,7 +36,7 @@ struct SignalIcon { @State style: any = StyleConfiguration.getSignalComponentStyle() aboutToAppear() { - Log.showDebug(TAG, 'aboutToAppear'); + Log.signalIcon(TAG, 'aboutToAppear'); this.mStatusBarGroupComponentData = StatusBarVM.getStatusBarGroupComponentData(this.mGroupId) if (!this.signalObserved) { mSignalModel.initSignalModel(); @@ -45,7 +45,7 @@ struct SignalIcon { } aboutToDisappear() { - Log.showDebug(TAG, 'aboutToDisappear'); + Log.signalIcon(TAG, 'aboutToDisappear'); } build() { diff --git a/features/signalcomponent/src/main/ets/default/signalModel.ts b/features/signalcomponent/src/main/ets/default/signalModel.ts index 8740c25..b7440ce 100644 --- a/features/signalcomponent/src/main/ets/default/signalModel.ts +++ b/features/signalcomponent/src/main/ets/default/signalModel.ts @@ -37,7 +37,7 @@ var mStateLink; export class SignalModel { initSignalModel() { - Log.showInfo(TAG, 'initSignalModel'); + Log.showDebug(TAG, 'initSignalModel'); mLevelLink = AppStorage.SetAndLink("cellularLevel", Constants.CELLULAR_NO_SIM_CARD); mTypeLink = AppStorage.SetAndLink("cellularType", Constants.NETWORK_TYPE_UNKNOWN); mStateLink = AppStorage.SetAndLink("networkState", Constants.NET_NULL); @@ -45,7 +45,7 @@ export class SignalModel { } uninitSignalModel() { - Log.showInfo(TAG, 'uninitSignalModel'); + Log.showDebug(TAG, 'uninitSignalModel'); this.unInitObserver(); } @@ -120,7 +120,7 @@ export class SignalModel { * init the observer of the cellular and signal */ initObserver() { - Log.showInfo(TAG, 'initObserver'); + Log.showDebug(TAG, 'initObserver'); isInitObserver = true; Observer.on('signalInfoChange', (signalInfoChange) => { Log.showInfo(TAG, 'signalInfoChange'); @@ -140,7 +140,7 @@ export class SignalModel { * Uninit the observer of the cellular and signal */ unInitObserver() { - Log.showInfo(TAG, 'unInitObserver'); + Log.showDebug(TAG, 'unInitObserver'); Observer.off('signalInfoChange'); Observer.off('networkStateChange'); Observer.off('simStateChange'); diff --git a/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets b/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets index 12717d8..e6806c3 100644 --- a/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets +++ b/features/wallpapercomponent/src/main/ets/com/ohos/view/component/wallpaper.ets @@ -24,7 +24,7 @@ export default struct Wallpaper { @State mViewModel: ViewModel = new ViewModel() aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.ViewModelInit() } diff --git a/features/wallpapercomponent/src/main/ets/com/ohos/vm/wallpaperViewModel.ts b/features/wallpapercomponent/src/main/ets/com/ohos/vm/wallpaperViewModel.ts index 094e8dc..b02590e 100644 --- a/features/wallpapercomponent/src/main/ets/com/ohos/vm/wallpaperViewModel.ts +++ b/features/wallpapercomponent/src/main/ets/com/ohos/vm/wallpaperViewModel.ts @@ -22,7 +22,7 @@ export default class WallpaperViewModel { screenlockWallpaper: string = '' ViewModelInit(): void{ - Log.showInfo(TAG, 'ViewModelInit'); + Log.showDebug(TAG, 'ViewModelInit'); this.getScreenLockWallpaper() } diff --git a/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets b/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets index 4b3728d..6b6712e 100644 --- a/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets +++ b/features/wificomponent/src/main/ets/default/pages/wifiIcon.ets @@ -34,13 +34,13 @@ export default struct WifiIcon { @State style: any = StyleConfiguration.getStartsBarWifiComponentStyle() aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mStatusBarGroupComponentData = StatusBarVM.getStatusBarGroupComponentData(this.mGroupId) mWifiModel.initWifiModel() } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/features/wificomponent/src/main/ets/default/wifiModel.ts b/features/wificomponent/src/main/ets/default/wifiModel.ts index 7be7604..ef772ee 100644 --- a/features/wificomponent/src/main/ets/default/wifiModel.ts +++ b/features/wificomponent/src/main/ets/default/wifiModel.ts @@ -32,7 +32,7 @@ export class WifiModel { if (this.mIsStart) { return; } - Log.showInfo(TAG, `initWifiModel`) + Log.showDebug(TAG, `initWifiModel`) this.mIsStart = true; mWifiInfo = AppStorage.SetAndLink("wifiInfo", Constants.DEFAULT_WIFI_INFO); @@ -118,7 +118,7 @@ export class WifiModel { } getLinkedInfo() { - Log.showInfo(TAG, `getLinkedInfo`) + Log.showDebug(TAG, `getLinkedInfo`) wifi.getLinkedInfo((err, data) => { if (wifi.isConnected()) { mWifiStatus.set(true); @@ -140,13 +140,11 @@ export class WifiModel { } enableWifi() { - Log.showInfo(TAG, 'enableWifi'); let result = wifi.enableWifi(); Log.showInfo(TAG, `enableWifi, result: ${result}`); } disableWifi() { - Log.showInfo(TAG, 'disableWifi'); let result = wifi.disableWifi(); Log.showInfo(TAG, `disableWifi, result: ${result}`); } diff --git a/product/pc/src/main/ets/Application/AbilityStage.ts b/product/pc/src/main/ets/Application/AbilityStage.ts index e1e71b2..7df13e6 100644 --- a/product/pc/src/main/ets/Application/AbilityStage.ts +++ b/product/pc/src/main/ets/Application/AbilityStage.ts @@ -20,6 +20,6 @@ const TAG = "ScreenLock-MainAbilityStage" export default class MainAbilityStage extends AbilityStage { onCreate() { - Log.showDebug(TAG, "onCreate") + Log.showInfo(TAG, "onCreate") } } \ No newline at end of file diff --git a/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 395a30f..a1bf0ec 100644 --- a/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/pc/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -26,7 +26,7 @@ const TAG = "ScreenLock-ServiceExtAbility" class ServiceExtAbility extends ServiceExtension { onCreate(want) { - Log.showDebug(TAG, 'onCreate, want:' + want.abilityName); + Log.showInfo(TAG, 'onCreate, want:' + want.abilityName); AbilityManager.setContext(AbilityManager.ABILITY_NAME_SCREEN_LOCK, this.context) sTimeManager.init(this.context) this.statusBarWindow() @@ -34,7 +34,7 @@ class ServiceExtAbility extends ServiceExtension { } private createWindow(name: string) { - Log.showInfo(TAG, `createWindow name:${name}`) + Log.showDebug(TAG, `createWindow name:${name}`) windowManager.create(this.context, name, 2110).then((win) => { Log.showInfo(TAG, "before begin " + name + " window show!") win.loadContent("pages/index").then(() => { @@ -48,7 +48,7 @@ class ServiceExtAbility extends ServiceExtension { } private async statusBarWindow() { - Log.showInfo(TAG, `statusBarWindow`); + Log.showDebug(TAG, `statusBarWindow`); let dis = await display.getDefaultDisplay(); while (dis === null) { await new Promise((resolve)=>{setTimeout(resolve, 1000)}); @@ -79,7 +79,7 @@ class ServiceExtAbility extends ServiceExtension { } onDestroy() { - Log.showDebug(TAG, 'api8New onDestroy'); + Log.showInfo(TAG, 'api8New onDestroy'); sTimeManager.release() } } diff --git a/product/pc/src/main/ets/pages/customPassword.ets b/product/pc/src/main/ets/pages/customPassword.ets index b351783..961b8f9 100644 --- a/product/pc/src/main/ets/pages/customPassword.ets +++ b/product/pc/src/main/ets/pages/customPassword.ets @@ -29,7 +29,7 @@ export default struct CustomPassword { @State mHeightPx: number = 44 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) setAppBgColor('#00000000') CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') @@ -38,7 +38,7 @@ export default struct CustomPassword { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/product/pc/src/main/ets/pages/customscreenlock.ets b/product/pc/src/main/ets/pages/customscreenlock.ets index 45af5e5..514cb35 100644 --- a/product/pc/src/main/ets/pages/customscreenlock.ets +++ b/product/pc/src/main/ets/pages/customscreenlock.ets @@ -25,11 +25,11 @@ export default struct CustomScreenlock { } aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`) } onDisappear() { - Log.showDebug(TAG, `onDisappear Start`) + Log.showInfo(TAG, `onDisappear Start`) } } \ No newline at end of file diff --git a/product/pc/src/main/ets/pages/digitalPassword.ets b/product/pc/src/main/ets/pages/digitalPassword.ets index 8760fa4..97751fc 100644 --- a/product/pc/src/main/ets/pages/digitalPassword.ets +++ b/product/pc/src/main/ets/pages/digitalPassword.ets @@ -29,7 +29,7 @@ export default struct DigitalPassword { @State mHeightPx: number = 44 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) setAppBgColor('#00000000') CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') @@ -38,7 +38,7 @@ export default struct DigitalPassword { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/product/pc/src/main/ets/pages/index.ets b/product/pc/src/main/ets/pages/index.ets index 0cf9d8d..88f12ab 100644 --- a/product/pc/src/main/ets/pages/index.ets +++ b/product/pc/src/main/ets/pages/index.ets @@ -35,7 +35,7 @@ struct Index { @State mHeightPx: number = 0 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) try { setAppBgColor('#00000000') } catch (error) { @@ -51,19 +51,19 @@ struct Index { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisAppear`) + Log.showInfo(TAG, `aboutToDisAppear`) this.pageStatus = Constants.STATUS_ABOUT_TO_DISAPPEAR this.mViewModel.ViewModelDestroy() } onPageShow() { - Log.showDebug(TAG, `onPageShow`) + Log.showInfo(TAG, `onPageShow`) this.pageStatus = Constants.STATUS_ON_PAGE_SHOW this.mViewModel.onPageShow(); } onPageHide() { - Log.showDebugTAG, `onPageHide`) + Log.showInfo(TAG, `onPageHide`) this.pageStatus = Constants.STATUS_ON_PAGE_HIDE } diff --git a/product/pc/src/main/ets/pages/journalscreenlock.ets b/product/pc/src/main/ets/pages/journalscreenlock.ets index 371db3a..e435965 100644 --- a/product/pc/src/main/ets/pages/journalscreenlock.ets +++ b/product/pc/src/main/ets/pages/journalscreenlock.ets @@ -25,11 +25,11 @@ export default struct JournalScreenlock { } aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`) } onDisappear() { - Log.showDebug(TAG, `onDisappear Start`) + Log.showInfo(TAG, `onDisappear Start`) } } \ No newline at end of file diff --git a/product/pc/src/main/ets/pages/mixedPassword.ets b/product/pc/src/main/ets/pages/mixedPassword.ets index 972c27c..555eb02 100644 --- a/product/pc/src/main/ets/pages/mixedPassword.ets +++ b/product/pc/src/main/ets/pages/mixedPassword.ets @@ -29,7 +29,7 @@ export default struct MixedPassword { @State mHeightPx: number = 44 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) setAppBgColor('#00000000') CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') @@ -38,7 +38,7 @@ export default struct MixedPassword { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/product/pc/src/main/ets/pages/slidescreenlock.ets b/product/pc/src/main/ets/pages/slidescreenlock.ets index 9563af3..086df03 100644 --- a/product/pc/src/main/ets/pages/slidescreenlock.ets +++ b/product/pc/src/main/ets/pages/slidescreenlock.ets @@ -36,7 +36,7 @@ export default struct SlideScreenlock { private mHeightPx : number = 44 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.ViewModelInit() } diff --git a/product/pc/src/main/ets/vm/indexViewModel.ts b/product/pc/src/main/ets/vm/indexViewModel.ts index 2610896..9bc4ac2 100644 --- a/product/pc/src/main/ets/vm/indexViewModel.ts +++ b/product/pc/src/main/ets/vm/indexViewModel.ts @@ -38,7 +38,7 @@ export default class IndexViewModel { } onPageShow() { - Log.showDebug(TAG, `onPageShow`) + Log.showInfo(TAG, `onPageShow`) ScreenLockService.notifyDrawDone(); } diff --git a/product/pc/src/main/ets/vm/slideScreenLockViewModel.ts b/product/pc/src/main/ets/vm/slideScreenLockViewModel.ts index 9786ea2..57a2ebf 100644 --- a/product/pc/src/main/ets/vm/slideScreenLockViewModel.ts +++ b/product/pc/src/main/ets/vm/slideScreenLockViewModel.ts @@ -38,7 +38,7 @@ export default class SlideScreenLockViewModel { toggleShow: boolean = false ViewModelInit(): void{ - Log.showInfo(TAG, `ViewModelInit`); + Log.showDebug(TAG, `ViewModelInit`); ScreenLockService.setUnlockAnimation((callback: Callback) => { this.elementAlpha = 0 this.elementScale = 0.85 diff --git a/product/phone/src/main/ets/AbilityStage.ts b/product/phone/src/main/ets/AbilityStage.ts index a7a7f4e..f9b1f6e 100644 --- a/product/phone/src/main/ets/AbilityStage.ts +++ b/product/phone/src/main/ets/AbilityStage.ts @@ -20,6 +20,6 @@ const TAG = "ScreenLock-MainAbilityStage" export default class MainAbilityStage extends AbilityStage { onCreate() { - Log.showDebug(TAG, "onCreate") + Log.showInfo(TAG, "onCreate") } } \ No newline at end of file diff --git a/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts b/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts index 31b41a8..5bec2b2 100644 --- a/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts +++ b/product/phone/src/main/ets/ServiceExtAbility/ServiceExtAbility.ts @@ -25,7 +25,7 @@ const TAG = "ScreenLock-ServiceExtAbility" class ServiceExtAbility extends ServiceExtension { onCreate(want) { - Log.showDebug(TAG, 'onCreate, want:' + want.abilityName); + Log.showInfo(TAG, 'onCreate, want:' + want.abilityName); AbilityManager.setContext(AbilityManager.ABILITY_NAME_SCREEN_LOCK, this.context) sTimeManager.init(this.context) this.statusBarWindow() @@ -33,7 +33,7 @@ class ServiceExtAbility extends ServiceExtension { } private createWindow(name: string) { - Log.showInfo(TAG, `createWindow name:${name}`) + Log.showDebug(TAG, `createWindow name:${name}`) windowManager.create(this.context, name, 2110).then((win) => { win.loadContent("pages/index").then(() => { Log.showInfo(TAG, name + " window loadContent in then! ") @@ -74,7 +74,7 @@ class ServiceExtAbility extends ServiceExtension { } onDestroy() { - Log.showDebug(TAG, 'api8New onDestroy'); + Log.showInfo(TAG, 'api8New onDestroy'); sTimeManager.release() } diff --git a/product/phone/src/main/ets/pages/customPassword.ets b/product/phone/src/main/ets/pages/customPassword.ets index 13e9b4f..2c95d62 100644 --- a/product/phone/src/main/ets/pages/customPassword.ets +++ b/product/phone/src/main/ets/pages/customPassword.ets @@ -29,7 +29,7 @@ export default struct CustomPassword { @State mHeightPx: number = 48 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) setAppBgColor('#00000000') CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') @@ -39,7 +39,7 @@ export default struct CustomPassword { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/product/phone/src/main/ets/pages/customscreenlock.ets b/product/phone/src/main/ets/pages/customscreenlock.ets index 45af5e5..514cb35 100644 --- a/product/phone/src/main/ets/pages/customscreenlock.ets +++ b/product/phone/src/main/ets/pages/customscreenlock.ets @@ -25,11 +25,11 @@ export default struct CustomScreenlock { } aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`) } onDisappear() { - Log.showDebug(TAG, `onDisappear Start`) + Log.showInfo(TAG, `onDisappear Start`) } } \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/digitalPassword.ets b/product/phone/src/main/ets/pages/digitalPassword.ets index f9d7ed1..75d98b2 100644 --- a/product/phone/src/main/ets/pages/digitalPassword.ets +++ b/product/phone/src/main/ets/pages/digitalPassword.ets @@ -29,7 +29,7 @@ export default struct DigitalPassword { @State mHeightPx: number = 48 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) setAppBgColor('#00000000') CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') @@ -39,7 +39,7 @@ export default struct DigitalPassword { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/product/phone/src/main/ets/pages/index.ets b/product/phone/src/main/ets/pages/index.ets index f676d6c..95776b4 100644 --- a/product/phone/src/main/ets/pages/index.ets +++ b/product/phone/src/main/ets/pages/index.ets @@ -35,7 +35,7 @@ struct Index { @State mHeightPx: number = 48 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.ViewModelInit() this.pageStatus = Constants.STATUS_ABOUT_TO_APPEAR try { @@ -52,19 +52,19 @@ struct Index { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisAppear`) + Log.showInfo(TAG, `aboutToDisAppear`) this.pageStatus = Constants.STATUS_ABOUT_TO_DISAPPEAR this.mViewModel.ViewModelDestroy() } onPageShow() { - Log.showDebug(TAG, `onPageShow`) + Log.showInfo(TAG, `onPageShow`) this.pageStatus = Constants.STATUS_ON_PAGE_SHOW this.mViewModel.onPageShow(); } onPageHide() { - Log.showDebug(TAG, `onPageHide`) + Log.showInfo(TAG, `onPageHide`) this.pageStatus = Constants.STATUS_ON_PAGE_HIDE } diff --git a/product/phone/src/main/ets/pages/journalscreenlock.ets b/product/phone/src/main/ets/pages/journalscreenlock.ets index 371db3a..e435965 100644 --- a/product/phone/src/main/ets/pages/journalscreenlock.ets +++ b/product/phone/src/main/ets/pages/journalscreenlock.ets @@ -25,11 +25,11 @@ export default struct JournalScreenlock { } aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear Start`) + Log.showInfo(TAG, `aboutToAppear Start`) } onDisappear() { - Log.showDebug(TAG, `onDisappear Start`) + Log.showInfo(TAG, `onDisappear Start`) } } \ No newline at end of file diff --git a/product/phone/src/main/ets/pages/mixedPassword.ets b/product/phone/src/main/ets/pages/mixedPassword.ets index 36d2ed1..898931a 100644 --- a/product/phone/src/main/ets/pages/mixedPassword.ets +++ b/product/phone/src/main/ets/pages/mixedPassword.ets @@ -29,7 +29,7 @@ export default struct MixedPassword { @State mHeightPx: number = 48 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) setAppBgColor('#00000000') CommonStyleManager.setAbilityPageName(TAG) let configInfo = AbilityManager.getAbilityData(AbilityManager.ABILITY_NAME_STATUS_BAR, 'rect') @@ -39,7 +39,7 @@ export default struct MixedPassword { } aboutToDisappear() { - Log.showDebug(TAG, `aboutToDisappear`) + Log.showInfo(TAG, `aboutToDisappear`) } build() { diff --git a/product/phone/src/main/ets/pages/slidescreenlock.ets b/product/phone/src/main/ets/pages/slidescreenlock.ets index cd64cb0..bcd1456 100644 --- a/product/phone/src/main/ets/pages/slidescreenlock.ets +++ b/product/phone/src/main/ets/pages/slidescreenlock.ets @@ -33,7 +33,7 @@ export default struct SlideScreenlock { @StorageLink('deviceStatus') @Watch('onDeviceStatusChange') deviceStatus: string = "" private mHeightPx : number = 48 aboutToAppear() { - Log.showDebug(TAG, `aboutToAppear`) + Log.showInfo(TAG, `aboutToAppear`) this.mViewModel.ViewModelInit() } diff --git a/product/phone/src/main/ets/vm/indexViewModel.ts b/product/phone/src/main/ets/vm/indexViewModel.ts index 7dacd63..1c80d1c 100644 --- a/product/phone/src/main/ets/vm/indexViewModel.ts +++ b/product/phone/src/main/ets/vm/indexViewModel.ts @@ -25,7 +25,7 @@ export default class IndexViewModel { ViewModelInit(): void{ this.serviceInit(); this.mode = this.getMode(); - Log.showInfo(TAG, `ViewModelInit this.mode=${this.mode}`); + Log.showDebug(TAG, `ViewModelInit this.mode=${this.mode}`); } serviceInit() { @@ -37,12 +37,12 @@ export default class IndexViewModel { } onPageShow() { - Log.showDebug(TAG, `onPageShow`) + Log.showInfo(TAG, `onPageShow`) ScreenLockService.notifyDrawDone(); } ViewModelDestroy() { - Log.showInfo(TAG, 'ViewModelDestroy'); + Log.showDebug(TAG, 'ViewModelDestroy'); ScreenLockService.destroy() } } \ No newline at end of file diff --git a/product/phone/src/main/ets/vm/slideScreenLockViewModel.ts b/product/phone/src/main/ets/vm/slideScreenLockViewModel.ts index 87d1cc9..de8af03 100644 --- a/product/phone/src/main/ets/vm/slideScreenLockViewModel.ts +++ b/product/phone/src/main/ets/vm/slideScreenLockViewModel.ts @@ -38,7 +38,7 @@ export default class SlideScreenLockViewModel { toggleShow: boolean = false ViewModelInit(): void{ - Log.showInfo(TAG, `ViewModelInit`); + Log.showDebug(TAG, `ViewModelInit`); ScreenLockService.setUnlockAnimation((callback: Callback) => { this.elementAlpha = 0 this.elementScale = 0.85