From 3f17a415e1acad10bb35fcfc42b2dbb35b3e63aa Mon Sep 17 00:00:00 2001 From: igorlegalov Date: Thu, 17 Jul 2025 19:45:09 +0300 Subject: [PATCH] Remove NullishType alias Issue: https://gitee.com/open_harmony/dashboard?issue_id=ICH95I Testing: all pre-merge tests passed Signed-off-by: igorlegalov --- uitest/ets/ani/ets/@ohos.UiTest.ets | 336 ++++++++++++++-------------- 1 file changed, 168 insertions(+), 168 deletions(-) diff --git a/uitest/ets/ani/ets/@ohos.UiTest.ets b/uitest/ets/ani/ets/@ohos.UiTest.ets index 31c17cbd..2e3f8f02 100644 --- a/uitest/ets/ani/ets/@ohos.UiTest.ets +++ b/uitest/ets/ani/ets/@ohos.UiTest.ets @@ -43,7 +43,7 @@ export function loadAndSetUpUiTest(): boolean { let result = UiTest.ScheduleEstablishConnection("default"); hilog.info(domain, 'uitestTag', "Uitest.ScheduleEstablishConnection(): "+result ) hilog.info(domain, 'uitestTag', 'UiTestKit_exporter: Begin executing shell command to start server-daemon'); - delegator.executeShellCommand(`uitest start-daemon default`, executeTime).then((value: NullishType) => { + delegator.executeShellCommand(`uitest start-daemon default`, executeTime).then((value: Any) => { hilog.info(domain, 'uitestTag', `UiTestKit_exporter: Start server-daemon finished!!!!`); }).catch((error:Error) :void=> { hilog.error(domain, 'uitestTag', "UiTestKit_exporter: Start server-daemon failed:"+error) @@ -70,14 +70,14 @@ enum MatchPattern { REG_EXP = 4, REG_EXP_ICASE = 5, } - + enum WindowMode { FULLSCREEN = 0, PRIMARY = 1, SECONDARY = 2, FLOATING = 3, } - + enum ResizeDirection { LEFT = 0, RIGHT = 1, @@ -88,53 +88,53 @@ enum ResizeDirection { RIGHT_UP = 6, RIGHT_DOWN = 7, } - + enum DisplayRotation { ROTATION_0 = 0, ROTATION_90 = 1, ROTATION_180 = 2, ROTATION_270 = 3, } - + enum UiDirection { LEFT = 0, RIGHT = 1, UP = 2, DOWN = 3, } - + enum MouseButton { MOUSE_BUTTON_LEFT = 0, MOUSE_BUTTON_RIGHT = 1, MOUSE_BUTTON_MIDDLE = 2, } - + interface Point { x: int; y: int; displayId?: int; } - + class PointInner implements Point { x: int = 0; y: int = 0; displayId?: int; } - + interface Rect { left: int; top: int; right: int; bottom: int; } - + class RectInner implements Rect { left: int = 0; top: int = 0; right: int = 0; bottom: int = 0; } - + interface WindowFilter { bundleName?: string; title?: string; @@ -219,11 +219,11 @@ export class Component { private native isCheckableSync(): boolean; private native comGetBoundsSync(): Rect; private native getBoundsCenterSync(): Point; - + click():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.comClickSync()); - promise1.then((e:NullishType) => { + promise1.then((e:Any) => { resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -232,11 +232,11 @@ export class Component { }); return promise; } - + longClick():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.comLongClickSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -245,11 +245,11 @@ export class Component { }); return promise; } - + doubleClick():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.comDoubleClickSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -258,11 +258,11 @@ export class Component { }); return promise; } - + scrollSearch(on: On, vertical?: boolean, offset?: int):Promise { let promise = new Promise((resolve, reject) => { let promise1 = taskpool.execute(():Component|null => this.scrollSearchSync(on, vertical, offset)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ if (e) { let value : Component = e as Component; resolve(value); @@ -276,11 +276,11 @@ export class Component { }); return promise; } - + scrollSearch(on: On):Promise { let promise = new Promise((resolve, reject) => { let promise1 = taskpool.execute(():Component|null => this.scrollSearchSync(on, true, 80)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ if (e) { let value : Component = e as Component; resolve(value); @@ -294,11 +294,11 @@ export class Component { }); return promise; } - + pinchIn(scale: double):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.pinchInSync(scale)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -306,11 +306,11 @@ export class Component { }); }); return promise; - } + } pinchOut(scale: double):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.pinchOutSync(scale)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -319,11 +319,11 @@ export class Component { }); return promise; } - + scrollToTop(speed?: int):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.scrollToTopSync(speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -332,11 +332,11 @@ export class Component { }); return promise; } - + scrollToBottom(speed?: int):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.scrollToBottomSync(speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -345,11 +345,11 @@ export class Component { }); return promise; } - + inputText(text: string):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.comInputTextSync(text)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -362,7 +362,7 @@ export class Component { inputText(text: string, mode: InputTextMode):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.comInputTextWithModeSync(text, mode)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -371,11 +371,11 @@ export class Component { }); return promise; } - + dragTo(target: Component):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.comDragToSync(target)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -384,11 +384,11 @@ export class Component { }); return promise; } - + clearText():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.clearTextSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -397,11 +397,11 @@ export class Component { }); return promise; } - + getHint():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getHintSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -411,11 +411,11 @@ export class Component { }); return promise; } - + getDescription():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getDescriptionSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -425,11 +425,11 @@ export class Component { }); return promise; } - + getType():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getTypeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -439,11 +439,11 @@ export class Component { }); return promise; } - + getText():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getTextSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -453,11 +453,11 @@ export class Component { }); return promise; } - + getId():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getIdSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -471,7 +471,7 @@ export class Component { isChecked():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isCheckedSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -484,7 +484,7 @@ export class Component { isCheckable():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isCheckableSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -497,7 +497,7 @@ export class Component { isScrollable():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isScrollableSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -510,7 +510,7 @@ export class Component { isFocused():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isFocusedSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -523,7 +523,7 @@ export class Component { isEnabled():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isEnabledSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -536,7 +536,7 @@ export class Component { isSelected():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isSelectedSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -549,7 +549,7 @@ export class Component { isLongClickable():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isLongClickableSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -562,7 +562,7 @@ export class Component { isClickable():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isClickableSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -575,7 +575,7 @@ export class Component { getBounds():Promise { let promise = new Promise((resolve: (value: Rect) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():Rect => this.comGetBoundsSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : Rect = e as Rect; resolve(value); }, (err: Error): void => { @@ -588,7 +588,7 @@ export class Component { getBoundsCenter():Promise { let promise = new Promise((resolve: (value: Point) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():Point => this.getBoundsCenterSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : Point = e as Point; resolve(value); }, (err: Error): void => { @@ -599,7 +599,7 @@ export class Component { return promise; } } - + export class UiWindow { static { currentState = UiTest.GetConnectionStat(); @@ -623,11 +623,11 @@ export class Component { private native getBundleNameSync(): string; private native getTitleSync(): string; private native winGetBoundsSync(): Rect; - + split():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.splitSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -636,11 +636,11 @@ export class Component { }); return promise; } - + resume():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.resumeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -649,11 +649,11 @@ export class Component { }); return promise; } - + close():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.closeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -662,11 +662,11 @@ export class Component { }); return promise; } - + minimize():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.minimizeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -675,11 +675,11 @@ export class Component { }); return promise; } - + maximize():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.maximizeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -688,11 +688,11 @@ export class Component { }); return promise; } - + focus():Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.focusSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -701,11 +701,11 @@ export class Component { }); return promise; } - + isFocused():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isFocusedSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -715,11 +715,11 @@ export class Component { }); return promise; } - + isActive():Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.isActiveSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -729,11 +729,11 @@ export class Component { }); return promise; } - + resize(w:int, h:int, d:ResizeDirection):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.resizeSync(w, h, d)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -742,11 +742,11 @@ export class Component { }); return promise; } - + moveTo(x:int, y:int):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.moveToSync(x, y)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -755,11 +755,11 @@ export class Component { }); return promise; } - + getWindowMode():Promise { let promise = new Promise((resolve: (value: WindowMode) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():WindowMode => this.getWindowModeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : WindowMode = e as WindowMode; resolve(value); }, (err: Error): void => { @@ -769,11 +769,11 @@ export class Component { }); return promise; } - + getBundleName():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getBundleNameSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -783,11 +783,11 @@ export class Component { }); return promise; } - + getTitle():Promise { let promise = new Promise((resolve: (value: string) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():string => this.getTitleSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : string = e as string; resolve(value); }, (err: Error): void => { @@ -797,11 +797,11 @@ export class Component { }); return promise; } - + getBounds():Promise { let promise = new Promise((resolve: (value: Rect) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():Rect => this.winGetBoundsSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : Rect = e as Rect; resolve(value); }, (err: Error): void => { @@ -812,7 +812,7 @@ export class Component { return promise; } } - + export class Driver { static { currentState = UiTest.GetConnectionStat(); @@ -833,7 +833,7 @@ export class Component { fling(from:Point, to: Point, stepLen: int, speed: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.flingSync(from, to, stepLen, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -846,7 +846,7 @@ export class Component { fling(direction:UiDirection, speed: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.flingSyncDirection(direction, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -859,7 +859,7 @@ export class Component { fling(direction:UiDirection, speed: int, displayId: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.flingWithDisplayIdSync(direction, speed, displayId)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -872,7 +872,7 @@ export class Component { swipe(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.swipeSync(startx, starty, endx, endy, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -885,7 +885,7 @@ export class Component { drag(startx: int, starty: int, endx: int, endy: int, speed?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.dragSync(startx, starty, endx, endy, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -898,7 +898,7 @@ export class Component { pressBack(): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.pressBackSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -911,7 +911,7 @@ export class Component { pressBack(displayId: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.pressBackWithDisplayIdSync(displayId)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -924,7 +924,7 @@ export class Component { assertComponentExist(on: On): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.assertComponentExistSync(on)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -937,7 +937,7 @@ export class Component { triggerKey(keyCode: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.triggerKeySync(keyCode)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -950,7 +950,7 @@ export class Component { triggerKey(keyCode: int, displayId: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.triggerKeyWithDisplayIdSync(keyCode, displayId)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -963,7 +963,7 @@ export class Component { inputText(p: Point, text: string): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.inputTextSync(p, text)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -976,7 +976,7 @@ export class Component { inputText(p: Point, text: string, mode: InputTextMode): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.inputTextWithModeSync(p, text, mode)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -989,7 +989,7 @@ export class Component { findWindow(filter: WindowFilter): Promise { let promise = new Promise((resolve, reject) => { let promise1 = taskpool.execute(():UiWindow|null => this.findWindowSync(filter)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ if (e) { hilog.info(domain, tag, "findWindow return UIWindow object"); let value : UiWindow = e as UiWindow; @@ -1010,7 +1010,7 @@ export class Component { wakeUpDisplay(): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.wakeUpDisplaySync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1023,7 +1023,7 @@ export class Component { pressHome(): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.pressHomeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1036,7 +1036,7 @@ export class Component { pressHome(displayId: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.pressHomeWithDisplayIdSync(displayId)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1049,7 +1049,7 @@ export class Component { getDisplaySize(): Promise { let promise = new Promise((resolve: (value: Point) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():Point => this.getDisplaySizeSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : Point = e as Point; resolve(value); }, (err: Error): void => { @@ -1063,7 +1063,7 @@ export class Component { getDisplaySize(displayId: int): Promise { let promise = new Promise((resolve: (value: Point) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():Point => this.getDisplaySizeWithDisplayIdSync(displayId)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : Point = e as Point; resolve(value); }, (err: Error): void => { @@ -1077,7 +1077,7 @@ export class Component { getDisplayDensity(): Promise { let promise = new Promise((resolve: (value: Point) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():Point => this.getDisplayDensitySync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : Point = e as Point; resolve(value); }, (err: Error): void => { @@ -1091,7 +1091,7 @@ export class Component { getDisplayRotation(): Promise { let promise = new Promise((resolve: (value: DisplayRotation) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():DisplayRotation => this.getDisplayRotationSync()); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : DisplayRotation = e as DisplayRotation; hilog.info(domain, tag, "getDisplayRotationSync return DisplayRotation"); resolve(value); @@ -1106,7 +1106,7 @@ export class Component { findComponents(on: On): Promise|null> { let promise = new Promise|null>((resolve, reject) => { let promise1 = taskpool.execute(():Array => this.findComponentsSync(on)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ if (e){ let value : Array = e as Array; resolve(value); @@ -1123,17 +1123,17 @@ export class Component { private native waitForIdleSync(idleTime: int, timeout: int):boolean; private native waitForComponentSync(on: On, time: int):Component; private native triggerCombineKeysSync(key0: int, key1: int, key2?: int):boolean; - + private native setDisplayRotationEnabledSync(enable: boolean):boolean; private native setDisplayRotationSync(rotation: DisplayRotation):boolean; private native screenCaptureSync(savepath: string, rect?: Rect):boolean; private native screenCapSync(savepath: string):boolean; - + private native penSwipeSync(f: Point, t: Point, speed?: int, pressure?: double): boolean; private native penClickSync(p: Point):boolean; private native penDoubleClickSync(p: Point):boolean; private native penLongClickSync(p: Point, pressure?: double):boolean; - + private native mouseScrollSync(p: Point, down: boolean, d:int, key1?: int, key2?: int, speed?: int): boolean; private native mouseMoveWithTrackSync(f: Point, t: Point, speed?: int): boolean; private native mouseMoveToSync(p: Point): boolean; @@ -1141,15 +1141,15 @@ export class Component { private native mouseClickSync(p: Point, btnId: MouseButton, key1?: int, key2?: int):boolean; private native mouseDoubleClickSync(p: Point, btnId: MouseButton, key1?: int, key2?: int):boolean; private native mouseLongClickSync(p: Point, btnId: MouseButton, key1?: int, key2?: int):boolean; - + private native injectMultiPointerActionSync(pointers: PointerMatrix, speed?: int): boolean; private native injectPenPointerActionSync(pointers: PointerMatrix, speed?: int, pressure?: double): boolean; private native touchPadMultiFingerSwipeSync(fingers: int, direction: UiDirection, options?: TouchPadSwipeOptions): boolean; - + delayMs(t: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.delayMsSync(t)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1158,11 +1158,11 @@ export class Component { }); return promise; } - + click(x: int, y: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.clickSync(x, y)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1171,11 +1171,11 @@ export class Component { }); return promise; } - + doubleClick(x: int, y: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.doubleClickSync(x, y)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1184,11 +1184,11 @@ export class Component { }); return promise; } - + longClick(x: int, y: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.longClickSync(x, y)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1197,11 +1197,11 @@ export class Component { }); return promise; } - + findComponent(on: On): Promise { let promise = new Promise((resolve, reject) => { let promise1 = taskpool.execute(():Component|null => this.findComponentSync(on)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ if (e) { let value : Component = e as Component; hilog.info(domain, tag, "findComponent return Component object"); @@ -1216,11 +1216,11 @@ export class Component { }); return promise; } - + waitForIdle(idleTime: int, timeout: int): Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.waitForIdleSync(idleTime, timeout)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -1230,11 +1230,11 @@ export class Component { }); return promise; } - + waitForComponent(on: On, time: int): Promise { let promise = new Promise((resolve, reject) => { let promise1 = taskpool.execute(():Component|null => this.waitForComponentSync(on, time)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ if (e) { let value : Component = e as Component; resolve(value); @@ -1248,12 +1248,12 @@ export class Component { }); return promise; } - + triggerCombineKeys(key0: int, key1: int, key2?: int): Promise { if (key2 == null) { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.triggerCombineKeysSync(key0, key1, 0)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1264,7 +1264,7 @@ export class Component { } else { let promise1 = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.triggerCombineKeysSync(key0, key1, key2)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1274,11 +1274,11 @@ export class Component { return promise1; } } - + setDisplayRotationEnabled(enable: boolean): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.setDisplayRotationEnabledSync(enable)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1287,11 +1287,11 @@ export class Component { }); return promise; } - + setDisplayRotation(rotation: DisplayRotation): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.setDisplayRotationSync(rotation)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1300,11 +1300,11 @@ export class Component { }); return promise; } - + screenCapture(path: string, rect?: Rect): Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.screenCaptureSync(path, rect)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -1314,11 +1314,11 @@ export class Component { }); return promise; } - + screenCap(path: string): Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.screenCapSync(path)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -1328,11 +1328,11 @@ export class Component { }); return promise; } - + penSwipe(f: Point, t: Point, speed?: int, pressure?: double): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.penSwipeSync(f, t, speed, pressure)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1341,11 +1341,11 @@ export class Component { }); return promise; } - + penClick(p: Point): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.penClickSync(p)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1354,11 +1354,11 @@ export class Component { }); return promise; } - + penDoubleClick(p: Point): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.penDoubleClickSync(p)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1367,11 +1367,11 @@ export class Component { }); return promise; } - + penLongClick(p: Point, pressure?: double): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.penLongClickSync(p, pressure)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1380,11 +1380,11 @@ export class Component { }); return promise; } - + mouseScroll(p: Point, down: boolean, d:int, key1?: int, key2?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseScrollSync(p, down, d, key1, key2, 20)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1397,7 +1397,7 @@ export class Component { mouseScroll(p: Point, down: boolean, d:int, key1?: int, key2?: int, speed?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseScrollSync(p, down, d, key1, key2, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1406,11 +1406,11 @@ export class Component { }); return promise; } - + mouseMoveWithTrack(f: Point, t: Point, speed?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseMoveWithTrackSync(f, t, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1419,11 +1419,11 @@ export class Component { }); return promise; } - + mouseMoveTo(p: Point): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseMoveToSync(p)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1432,11 +1432,11 @@ export class Component { }); return promise; } - + mouseDrag(f: Point, t: Point, speed?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseDragSync(f, t, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1448,7 +1448,7 @@ export class Component { mouseClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseClickSync(p, btnId, key1, key2)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1457,11 +1457,11 @@ export class Component { }); return promise; } - + mouseDoubleClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseDoubleClickSync(p, btnId, key1, key2)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1470,11 +1470,11 @@ export class Component { }); return promise; } - + mouseLongClick(p: Point, btnId: MouseButton, key1?: int, key2?: int): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.mouseLongClickSync(p, btnId, key1, key2)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1483,11 +1483,11 @@ export class Component { }); return promise; } - + injectMultiPointerAction(pointers: PointerMatrix, speed?: int): Promise { let promise = new Promise((resolve: (value: boolean) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.injectMultiPointerActionSync(pointers, speed)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ let value : boolean = e as boolean; resolve(value); }, (err: Error): void => { @@ -1497,11 +1497,11 @@ export class Component { }); return promise; } - + injectPenPointerAction(pointers: PointerMatrix, speed?: int, pressure?: double): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.injectPenPointerActionSync(pointers, speed, pressure)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1510,11 +1510,11 @@ export class Component { }); return promise; } - + touchPadMultiFingerSwipe(fingers: int, direction: UiDirection, options?: TouchPadSwipeOptions): Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { let promise1 = taskpool.execute(():boolean => this.touchPadMultiFingerSwipeSync(fingers, direction, options)); - promise1.then((e:NullishType)=>{ + promise1.then((e:Any)=>{ resolve(Promise.resolve()); }, (err: Error): void => { let br = err as BusinessError; @@ -1524,7 +1524,7 @@ export class Component { return promise; } } - + export class PointerMatrix { static { currentState = UiTest.GetConnectionStat(); @@ -1536,7 +1536,7 @@ export class Component { this.nativePointerMatrix = PointerMatrix; } } - + native static create(fingers: int, steps: int): PointerMatrix; native setPoint(finger: int, step: int, point: Point): void; } @@ -1571,7 +1571,7 @@ export class Component { native id(id: string, pattern?: MatchPattern): On; native type(tp: string, pattern?: MatchPattern): On; native hint(val: string, pattern?: MatchPattern): On; - + id(id: string): On { return this.id(id, MatchPattern.EQUALS); } @@ -1596,4 +1596,4 @@ export class UIEventObserver { } -export const ON: On = new On(); \ No newline at end of file +export const ON: On = new On(); -- Gitee