From 2642fab9ea8b3d4a194cae62d0c7c22aa2848a20 Mon Sep 17 00:00:00 2001 From: LVB8189 Date: Thu, 11 Aug 2022 14:23:24 +0800 Subject: [PATCH 1/5] Signed-off-by: LVB8189 Changes to be committed: --- api/@ohos.screenLock.d.ts | 41 ++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 22 deletions(-) diff --git a/api/@ohos.screenLock.d.ts b/api/@ohos.screenLock.d.ts index f1be748d76..95baa2bec5 100644 --- a/api/@ohos.screenLock.d.ts +++ b/api/@ohos.screenLock.d.ts @@ -51,41 +51,38 @@ declare namespace screenLock { function unlockScreen():Promise; /** - * Receives {beginWakeUp|endWakeUp|beginScreenOn|endScreenOn|beginScreenOff|endScreenOff|unlockScreen|beginExitAnimation} called. - * This callback is invoked when {beginWakeUp|endWakeUp|beginScreenOn|endScreenOn|beginScreenOff|endScreenOff|unlockScreen|beginExitAnimation} - * is called by runtime - * + * Lock the screen. * @systemapi Hide this for inner system use. * @since 9 */ - function on(type: 'beginWakeUp' | 'endWakeUp' | 'beginScreenOn' | 'endScreenOn' | 'beginScreenOff' | 'endScreenOff' | 'unlockScreen' | 'beginExitAnimation', callback: Callback): void; - - /** - * Receives {beginSleep | endSleep | changeUser} called. This callback is invoked when {beginSleep | endSleep | changeUser} is called by runtime - * - * @systemapi Hide this for inner system use. - * @since 9 - */ - function on(type: 'beginSleep' | 'endSleep' | 'changeUser', callback: Callback): void; + function lockScreen(callback: AsyncCallback): void; + function lockScreen():Promise; /** - * Receives screenlockEnabled change. This callback is invoked when screenlockEnabled is called by runtime - * + * Lock the screen. * @systemapi Hide this for inner system use. * @since 9 */ - function on(type: 'screenlockEnabled', callback: Callback): void; + function lockScreen(callback: AsyncCallback): void; + function lockScreen():Promise; + + interface SystemEvent{ + /** + * event type of the system event. + */ + eventType:string; + /** + * event params of the system event. + */ + params:string; + } /** - * Remove the receives of {beginWakeUp | endWakeUp | beginScreenOn | endScreenOn | beginScreenOff | endScreenOff | unlockScreen - * | beginExitAnimation | screenlockEnabled | beginSleep | endSleep | changeUser}. - * + * Lock the screen. * @systemapi Hide this for inner system use. * @since 9 */ - function off(type: 'beginWakeUp' | 'endWakeUp' | 'beginScreenOn' | 'endScreenOn' | 'beginScreenOff' | 'endScreenOff' - | 'unlockScreen' | 'beginExitAnimation' | 'screenlockEnabled' | 'beginSleep' | 'endSleep' | 'changeUser', callback: Callback): void; - + function onSystemEvent(callback: Callback): void; /** * screenlockAPP send event to screenlockSA -- Gitee From 45dacb959e2d7e0e3797db10a830dbf0e2307d2d Mon Sep 17 00:00:00 2001 From: LVB8189 Date: Thu, 11 Aug 2022 15:12:56 +0800 Subject: [PATCH 2/5] Signed-off-by: LVB8189 Changes to be committed: --- api/@ohos.screenLock.d.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/api/@ohos.screenLock.d.ts b/api/@ohos.screenLock.d.ts index 95baa2bec5..d9c5bf054e 100644 --- a/api/@ohos.screenLock.d.ts +++ b/api/@ohos.screenLock.d.ts @@ -58,14 +58,6 @@ declare namespace screenLock { function lockScreen(callback: AsyncCallback): void; function lockScreen():Promise; - /** - * Lock the screen. - * @systemapi Hide this for inner system use. - * @since 9 - */ - function lockScreen(callback: AsyncCallback): void; - function lockScreen():Promise; - interface SystemEvent{ /** * event type of the system event. -- Gitee From eb06cda422d9809aeb51c900d53f4a7fa89fe573 Mon Sep 17 00:00:00 2001 From: LVB8189 Date: Wed, 17 Aug 2022 10:02:33 +0800 Subject: [PATCH 3/5] Signed-off-by: LVB8189 Changes to be committed: --- api/@ohos.screenLock.d.ts | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/api/@ohos.screenLock.d.ts b/api/@ohos.screenLock.d.ts index d9c5bf054e..fde988c59d 100644 --- a/api/@ohos.screenLock.d.ts +++ b/api/@ohos.screenLock.d.ts @@ -58,14 +58,13 @@ declare namespace screenLock { function lockScreen(callback: AsyncCallback): void; function lockScreen():Promise; + /** + * Definition of system events. + * @systemapi Hide this for inner system use. + * @since 9 + */ interface SystemEvent{ - /** - * event type of the system event. - */ eventType:string; - /** - * event params of the system event. - */ params:string; } -- Gitee From 961e2ea4613aa94ee948c5c12bfca8c462839b49 Mon Sep 17 00:00:00 2001 From: LVB8189 Date: Mon, 29 Aug 2022 14:28:17 +0000 Subject: [PATCH 4/5] update api/@ohos.screenLock.d.ts. Signed-off-by: LVB8189 Signed-off-by: LVB8189 --- api/@ohos.screenLock.d.ts | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/api/@ohos.screenLock.d.ts b/api/@ohos.screenLock.d.ts index fde988c59d..a9882ec250 100644 --- a/api/@ohos.screenLock.d.ts +++ b/api/@ohos.screenLock.d.ts @@ -59,21 +59,40 @@ declare namespace screenLock { function lockScreen():Promise; /** - * Definition of system events. + * Receives {beginWakeUp|endWakeUp|beginScreenOn|endScreenOn|beginScreenOff|endScreenOff|unlockScreen|beginExitAnimation} called. + * This callback is invoked when {beginWakeUp|endWakeUp|beginScreenOn|endScreenOn|beginScreenOff|endScreenOff|unlockScreen|beginExitAnimation} + * is called by runtime + * * @systemapi Hide this for inner system use. * @since 9 */ - interface SystemEvent{ - eventType:string; - params:string; - } + function on(type: 'beginWakeUp' | 'endWakeUp' | 'beginScreenOn' | 'endScreenOn' | 'beginScreenOff' | 'endScreenOff' | 'unlockScreen' | 'beginExitAnimation', callback: Callback): void; /** - * Lock the screen. + * Receives {beginSleep | endSleep | changeUser} called. This callback is invoked when {beginSleep | endSleep | changeUser} is called by runtime + * + * @systemapi Hide this for inner system use. + * @since 9 + */ + function on(type: 'beginSleep' | 'endSleep' | 'changeUser', callback: Callback): void; + + /** + * Receives screenlockEnabled change. This callback is invoked when screenlockEnabled is called by runtime + * + * @systemapi Hide this for inner system use. + * @since 9 + */ + function on(type: 'screenlockEnabled', callback: Callback): void; + + /** + * Remove the receives of {beginWakeUp | endWakeUp | beginScreenOn | endScreenOn | beginScreenOff | endScreenOff | unlockScreen + * | beginExitAnimation | screenlockEnabled | beginSleep | endSleep | changeUser}. + * * @systemapi Hide this for inner system use. * @since 9 */ - function onSystemEvent(callback: Callback): void; + function off(type: 'beginWakeUp' | 'endWakeUp' | 'beginScreenOn' | 'endScreenOn' | 'beginScreenOff' | 'endScreenOff' + | 'unlockScreen' | 'beginExitAnimation' | 'screenlockEnabled' | 'beginSleep' | 'endSleep' | 'changeUser', callback: Callback): void; /** * screenlockAPP send event to screenlockSA @@ -83,7 +102,6 @@ declare namespace screenLock { */ function sendScreenLockEvent(event: String, parameter: number, callback: AsyncCallback): void; function sendScreenLockEvent(event: String, parameter: number): Promise; - } export default screenLock; \ No newline at end of file -- Gitee From c3046e6bbb7236b978eac97fa30adad18c3d2b5a Mon Sep 17 00:00:00 2001 From: LVB8189 Date: Mon, 29 Aug 2022 14:31:40 +0000 Subject: [PATCH 5/5] update api/@ohos.screenLock.d.ts. Signed-off-by: LVB8189 Signed-off-by: LVB8189 --- api/@ohos.screenLock.d.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/api/@ohos.screenLock.d.ts b/api/@ohos.screenLock.d.ts index a9882ec250..8bf686a2f9 100644 --- a/api/@ohos.screenLock.d.ts +++ b/api/@ohos.screenLock.d.ts @@ -91,9 +91,10 @@ declare namespace screenLock { * @systemapi Hide this for inner system use. * @since 9 */ - function off(type: 'beginWakeUp' | 'endWakeUp' | 'beginScreenOn' | 'endScreenOn' | 'beginScreenOff' | 'endScreenOff' + function off(type: 'beginWakeUp' | 'endWakeUp' | 'beginScreenOn' | 'endScreenOn' | 'beginScreenOff' | 'endScreenOff' | 'unlockScreen' | 'beginExitAnimation' | 'screenlockEnabled' | 'beginSleep' | 'endSleep' | 'changeUser', callback: Callback): void; + /** * screenlockAPP send event to screenlockSA * @@ -102,6 +103,7 @@ declare namespace screenLock { */ function sendScreenLockEvent(event: String, parameter: number, callback: AsyncCallback): void; function sendScreenLockEvent(event: String, parameter: number): Promise; + } export default screenLock; \ No newline at end of file -- Gitee