openharmony/applications_screenlock
1
0
Fork 0
mirror of https://gitee.com/openharmony/applications_screenlock synced 2024-11-27 00:21:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!59 add screenlock event

Browse Source 
Merge pull request !59 from yangpeng85/master
This commit is contained in:
openharmony_ci 2022-08-29 13:44:34 +00:00 committed by Gitee
commit 2c20556ee1
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 34 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
features/screenlock/src/main/ets/com/ohos/model/screenLockModel.ts
View File

@ -47,7 +47,13 @@ export default class ScreenLockModel {
data:${JSON.stringify(data)}`);
callback();
})
break;
break;
case "lockScreen":
ScreenLockMar.on(typeName, () => {
Log.showInfo(TAG, `eventListener:callback`);
callback();
})
break;
default:
Log.showError(TAG, `eventListener:typeName ${typeName}`)
}

30
features/screenlock/src/main/ets/com/ohos/model/screenLockService.ts
View File

@ -39,6 +39,7 @@ const EVENT_END_SCREEN_ON: string = 'endScreenOn'
const EVENT_BEGIN_SCREENOFF: string = 'beginScreenOff'
const EVENT_END_SCREENOFF: string = 'endScreenOff'
const EVENT_UNLOCK_SCREEN: string = 'unlockScreen'
const EVENT_LOCK_SCREEN: string = 'lockScreen'
const EVENT_BEGIN_EXITANIMATION: string = 'beginExitAnimation'
const EVENT_BEGIN_SLEEP: string = 'beginSleep'
const EVENT_END_SLEEP: string = 'endSleep'
@ -46,6 +47,7 @@ const EVENT_CHANGE_USER: string = 'changeUser'
const EVENT_SCREENLOCK_ENABLE: string = 'screenlockEnabled'
const EVENT_SYSTEM_READY: string = 'systemReady'
const LOCK_SCREEN_RESULT: string = 'lockScreenResult'
const UNLOCK_SCREEN_RESULT: string = 'unlockScreenResult'
const SCREENLOCK_DRAW_DONE: string = 'screenDrawDone'
@ -69,6 +71,12 @@ export enum UnlockResult {
Cancel = 2
}
export enum LockResult {
Success = 0,
Fail = 1,
Cancel = 2
}
let mRouterPath: string = ""
let mWillRecognizeFace: boolean = false
@ -144,6 +152,12 @@ export class ScreenLockService {
this.unlockScreen();
});
//lock request was received
this.screenLockModel.eventListener(EVENT_LOCK_SCREEN, () => {
Log.showInfo(TAG, `EVENT_LOCK_SCREEN event`);
this.lockScreen();
});
Log.showDebug(TAG, 'registered events end');
}
@ -165,6 +179,7 @@ export class ScreenLockService {
if (this.currentLockStatus == ScreenLockStatus.Locking) {
Log.showInfo(TAG, `had locked, no need to publish lock_screen`);
} else {
this.notifyLockScreenResult(LockResult.Success)
this.publishByUser("common.event.LOCK_SCREEN", this.accountModel.getCurrentUserId());
this.currentLockStatus = ScreenLockStatus.Locking;
}
@ -249,15 +264,22 @@ export class ScreenLockService {
this.screenLockModel.hiddenScreenLockWindow(() => {
Log.showInfo(TAG, `hiddenScreenLockWindow finish`);
//notify the base service that the unlock is completed
this.notifyScreenResult(UnlockResult.Success);
this.notifyUnlockScreenResult(UnlockResult.Success);
this.publishByUser("common.event.UNLOCK_SCREEN", this.accountModel.getCurrentUserId());
});
}
notifyScreenResult(result: UnlockResult) {
Log.showInfo(TAG, `notifyScreenResult`);
notifyUnlockScreenResult(result: UnlockResult) {
Log.showInfo(TAG, `notifyUnlockScreenResult`);
this.screenLockModel.sendScreenLockEvent(UNLOCK_SCREEN_RESULT, result, (error, data) => {
Log.showInfo(TAG, `notifyScreenResult: error:${JSON.stringify(error)} data:${JSON.stringify(data)}`);
Log.showInfo(TAG, `notifyUnlockScreenResult: error:${JSON.stringify(error)} data:${JSON.stringify(data)}`);
});
}
notifyLockScreenResult(result: LockResult) {
Log.showInfo(TAG, `notifyLockScreenResult`);
this.screenLockModel.sendScreenLockEvent(LOCK_SCREEN_RESULT, result, (error, data) => {
Log.showInfo(TAG, `notifyLockScreenResult: error:${JSON.stringify(error)} data:${JSON.stringify(data)}`);
});
}

2
features/screenlock/src/main/ets/com/ohos/vm/baseViewModel.ts
View File

@ -79,7 +79,7 @@ export default class BaseViewModel {
this.prompt = promptText;
this.updateStorage(callback)
//notify the base service that the unlock is fail
service.notifyScreenResult(UnlockResult.Fail);
service.notifyUnlockScreenResult(UnlockResult.Fail);
}
getFreezingTimeNm(freezingMillisecond: number): string {