diff --git a/uitest/ets/ani/ets/@ohos.UiTest.ets b/uitest/ets/ani/ets/@ohos.UiTest.ets index 31c17cbd0e5dad903baad676d131b2ecf57d182e..cd15a558f2583d90dc82f5c751d1196aaf73c23e 100644 --- a/uitest/ets/ani/ets/@ohos.UiTest.ets +++ b/uitest/ets/ani/ets/@ohos.UiTest.ets @@ -276,24 +276,6 @@ 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)=>{ - if (e) { - let value : Component = e as Component; - resolve(value); - } else { - resolve(null) - } - }, (err: Object): void => { - let br = err as BusinessError; - reject(br); - }); - }); - return promise; - } pinchIn(scale: double):Promise { let promise = new Promise((resolve: (value: PromiseLike) => void, reject: (error: Error) => void) => { @@ -1380,19 +1362,6 @@ 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)=>{ - resolve(Promise.resolve()); - }, (err: Error): void => { - let br = err as BusinessError; - reject(br); - }); - }); - return promise; - } 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) => { @@ -1592,8 +1561,8 @@ export class UIEventObserver { this.nativeUIEventObserver = UIEventObserver; } } - native once(type: String, callback: Callback): void; - + native onceToastShow(callback: Callback): void; + native onceDialogShow(callback: Callback): void; } export const ON: On = new On(); \ No newline at end of file diff --git a/uitest/ets/ani/src/uitest_ani.cpp b/uitest/ets/ani/src/uitest_ani.cpp index be37141a56f62617dfa8a866906f2216a212d313..71383aa623cd67a9830ec058c2621ea622991d6f 100644 --- a/uitest/ets/ani/src/uitest_ani.cpp +++ b/uitest/ets/ani/src/uitest_ani.cpp @@ -669,6 +669,7 @@ static ani_boolean BindOn(ani_env *env) return false; } static constexpr const char *SIGNATURE = "C{std.core.String}E{@ohos.UiTest.MatchPattern}:C{@ohos.UiTest.On}"; + std::array methods = { ani_native_function{"id", SIGNATURE, reinterpret_cast(id)}, ani_native_function{"text", nullptr, reinterpret_cast(text)}, @@ -1605,9 +1606,7 @@ static ani_boolean BindDriver(ani_env *env) ani_native_function{"penSwipeSync", nullptr, reinterpret_cast(penSwipeSync)}, ani_native_function{"penClickSync", nullptr, reinterpret_cast(penClickSync)}, ani_native_function{"penDoubleClickSync", nullptr, reinterpret_cast(penDoubleClickSync)}, - ani_native_function{"penLongClickSync", - "C{@ohos.UiTest.Point}C{std.core.Double}:z", reinterpret_cast(penLongClickSync)}, - ani_native_function{"mouseScrollSync", nullptr, reinterpret_cast(mouseScrollSync)}, + ani_native_function{"penLongClickSync", "C{@ohos.UiTest.Point}C{std.core.Double}:z", reinterpret_cast(penLongClickSync)}, ani_native_function{"mouseScrollSync", nullptr, reinterpret_cast(mouseScrollSync)}, ani_native_function{"mouseMoveWithTrackSync", nullptr, reinterpret_cast(mouseMoveWithTrackSync)}, ani_native_function{"mouseMoveToSync", nullptr, reinterpret_cast(mouseMoveToSync)}, ani_native_function{"mouseDragSync", nullptr, reinterpret_cast(mouseDragSync)}, @@ -2135,17 +2134,29 @@ static ani_boolean BindComponent(ani_env *env) } return true; } -static void once(ani_env *env, ani_object obj, ani_string type, ani_object callback) +static void once(ani_env *env, ani_object obj, nlohmann::json paramList, ani_object callback) { ApiCallInfo callInfo_; ApiReplyInfo reply_; callInfo_.callerObjRef_ = aniStringToStdString(env, unwrapp(env, obj, "nativeUIEventObserver")); callInfo_.apiId_ = "UIEventObserver.once"; - callInfo_.paramList_.push_back(aniStringToStdString(env, type)); + callInfo_.paramList_ = paramList; UiEventObserverAni::Get().PreprocessCallOnce(env, callInfo_, obj, callback, reply_); Transact(callInfo_, reply_); UnmarshalReply(env, callInfo_, reply_); } +static void onceToastShow(ani_env *env, ani_object obj, ani_object callback) +{ + nlohmann::json paramList_ = nlohmann::json::array(); + paramList_.push_back("toastShow"); + once(env, obj, paramList_, callback); +} +static void onceDialogShow(ani_env *env, ani_object obj, ani_object callback) +{ + nlohmann::json paramList_ = nlohmann::json::array(); + paramList_.push_back("dialogShow"); + once(env, obj, paramList_, callback); +} static ani_boolean BindUiEventObserver(ani_env *env) { ani_class cls; @@ -2154,7 +2165,8 @@ static ani_boolean BindUiEventObserver(ani_env *env) return false; } std::array methods = { - ani_native_function{"once", nullptr, reinterpret_cast(once)}, + ani_native_function{"onceToastShow", nullptr, reinterpret_cast(onceToastShow)}, + ani_native_function{"onceDialogShow", nullptr, reinterpret_cast(onceDialogShow)}, }; if (ANI_OK != env->Class_BindNativeMethods(cls, methods.data(), methods.size())) {