From 1ee93009faaf276ac43d6f3dbac84126b19f1d0e Mon Sep 17 00:00:00 2001 From: songliy Date: Mon, 18 Oct 2021 21:28:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E8=81=94=E8=B0=83=E4=BB=A3=E7=A0=81=20Signed-off-by:=20licheng?= =?UTF-8?q?.li=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/kits/ability/native/BUILD.gn | 8 +--- .../kits/ability/native/include/ability.h | 7 --- .../ability/native/include/ability_impl.h | 12 +---- .../ability/native/include/ability_keyevent.h | 19 ++------ .../native/include/ability_touchevent.h | 18 ++----- .../kits/ability/native/src/ability.cpp | 10 +--- .../kits/ability/native/src/ability_impl.cpp | 18 +++---- .../ability/native/src/ability_keyevent.cpp | 2 - .../ability/native/src/ability_touchevent.cpp | 2 - .../ability/native/src/ability_window.cpp | 4 -- frameworks/kits/ability/native/test/BUILD.gn | 47 +++++++++++-------- frameworks/kits/test/BUILD.gn | 4 ++ 12 files changed, 52 insertions(+), 99 deletions(-) diff --git a/frameworks/kits/ability/native/BUILD.gn b/frameworks/kits/ability/native/BUILD.gn index 4e914c3226d..74d79a719f0 100755 --- a/frameworks/kits/ability/native/BUILD.gn +++ b/frameworks/kits/ability/native/BUILD.gn @@ -84,9 +84,6 @@ ohos_shared_library("abilitykit_native") { "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/common", "//foundation/distributeddatamgr/appdatamgr/frameworks/jskitsimpl/native_dataability", ] - cflags = [ - #"-DMMI_COMPILE" - ] sources = [ "${SUBSYSTEM_APPEXEXFWK_DIR}/interfaces/innerkits/appexecfwk_core/src/appmgr/process_info.cpp", @@ -184,13 +181,10 @@ ohos_shared_library("abilitykit_native") { "appexecfwk_standard:fmskit_native", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", - - #"multimodalinput_base:libmmi-util", - #"multimodalinput_base:libmmi-client", - #"multimodalinput_base:mmi_event", ] public_deps = [ diff --git a/frameworks/kits/ability/native/include/ability.h b/frameworks/kits/ability/native/include/ability.h index b4cfea6aef5..32292eb688e 100755 --- a/frameworks/kits/ability/native/include/ability.h +++ b/frameworks/kits/ability/native/include/ability.h @@ -43,11 +43,6 @@ #include "form_provider_info.h" #include "form_info.h" -#ifndef MMI_COMPILE -#include "key_event.h" -#include "touch_event.h" -#endif - using Uri = OHOS::Uri; namespace OHOS { @@ -56,10 +51,8 @@ class AbsSharedResultSet; class DataAbilityPredicates; class ValuesBucket; } // namespace NativeRdb -#ifdef MMI_COMPILE class KeyEvent; class TouchEvent; -#endif namespace AppExecFwk { class DataAbilityResult; class DataAbilityOperation; diff --git a/frameworks/kits/ability/native/include/ability_impl.h b/frameworks/kits/ability/native/include/ability_impl.h index eb3a50955ae..65a9e3e1031 100644 --- a/frameworks/kits/ability/native/include/ability_impl.h +++ b/frameworks/kits/ability/native/include/ability_impl.h @@ -29,16 +29,10 @@ #include "dummy_values_bucket.h" #include "dummy_data_ability_predicates.h" #include "dummy_result_set.h" - -#ifdef MMI_COMPILE -#include "key_events.h" -#include "touch_events.h" -#include "ability_keyevent.h" -#include "ability_touchevent.h" -#else #include "key_event.h" #include "touch_event.h" -#endif +#include "ability_keyevent.h" +#include "ability_touchevent.h" namespace OHOS { namespace AppExecFwk { @@ -425,10 +419,8 @@ private: */ void MMIUnRegister(); -#ifdef MMI_COMPILE sptr abilityKeyEventHandle_ = nullptr; sptr abilityTouchEventHandle_ = nullptr; -#endif bool hasSaveData_ = false; PacMap restoreData_; }; diff --git a/frameworks/kits/ability/native/include/ability_keyevent.h b/frameworks/kits/ability/native/include/ability_keyevent.h index 532f78b732a..e98e5fb76f1 100644 --- a/frameworks/kits/ability/native/include/ability_keyevent.h +++ b/frameworks/kits/ability/native/include/ability_keyevent.h @@ -17,32 +17,23 @@ #define FOUNDATION_APPEXECFWK_OHOS_ABILITY_KEYEVENT_HANDLE_H #include - -#ifdef MMI_COMPILE -#include "multimodal_events_handler.h" -#include "key_events_handler.h" -#endif +#include "multimodal_event_handler.h" +#include "key_event_handler.h" namespace OHOS { namespace AppExecFwk { class AbilityImpl; - -#ifdef MMI_COMPILE -class AbilityKeyEventHandle : public MMI::KeyEventHandler { -#else -class AbilityKeyEventHandle { -#endif - +class AbilityKeyEventHandle + : public MMI::KeyEventHandler +{ public: AbilityKeyEventHandle(const std::shared_ptr &ability); ~AbilityKeyEventHandle(); -#ifdef MMI_COMPILE /** * @brief Called back when on key. */ virtual bool OnKey(const KeyEvent& keyEvent) override; -#endif private: std::shared_ptr abilityImpl_ = nullptr; diff --git a/frameworks/kits/ability/native/include/ability_touchevent.h b/frameworks/kits/ability/native/include/ability_touchevent.h index b7ab7e029d1..65a01b64b93 100644 --- a/frameworks/kits/ability/native/include/ability_touchevent.h +++ b/frameworks/kits/ability/native/include/ability_touchevent.h @@ -17,31 +17,23 @@ #define FOUNDATION_APPEXECFWK_OHOS_ABILITY_TOUCHEVENT_HANDLE_H #include - -#ifdef MMI_COMPILE -#include "multimodal_events_handler.h" -#include "touch_events_handler.h" -#endif +#include "multimodal_event_handler.h" +#include "touch_event_handler.h" namespace OHOS { namespace AppExecFwk { class AbilityImpl; - -#ifdef MMI_COMPILE -class AbilityTouchEventHandle : public MMI::TouchEventHandler { -#else -class AbilityTouchEventHandle { -#endif +class AbilityTouchEventHandle + : public MMI::TouchEventHandler +{ public: AbilityTouchEventHandle(std::shared_ptr ability); virtual ~AbilityTouchEventHandle(); -#ifdef MMI_COMPILE /** * @brief Called back when on touch. */ virtual bool OnTouch(const TouchEvent& touchEvent) override; -#endif private: std::shared_ptr abilityImpl_ = nullptr; diff --git a/frameworks/kits/ability/native/src/ability.cpp b/frameworks/kits/ability/native/src/ability.cpp index ac3012da1d8..f4e9df23cc7 100755 --- a/frameworks/kits/ability/native/src/ability.cpp +++ b/frameworks/kits/ability/native/src/ability.cpp @@ -43,13 +43,9 @@ #include "data_ability_operation.h" #include "data_uri_utils.h" -#ifdef MMI_COMPILE -#include "key_events.h" -#include "touch_events.h" -#else + #include "key_event.h" #include "touch_event.h" -#endif #include "form_host_client.h" #include "form_mgr.h" #include "ipc_skeleton.h" @@ -501,11 +497,7 @@ bool Ability::OnKeyUp(int keyCode, const KeyEvent &keyEvent) APP_LOGI("Ability::OnKeyUp called"); APP_LOGI("Ability::OnKeyUp keyCode: %{public}d.", keyCode); switch (keyCode) { -#ifdef MMI_COMPILE case OHOS::KeyEventEnum::KEY_BACK: -#else - case KeyEvent::CODE_BACK: -#endif APP_LOGI("Ability::OnKey Back key pressed."); OnBackPressed(); return true; diff --git a/frameworks/kits/ability/native/src/ability_impl.cpp b/frameworks/kits/ability/native/src/ability_impl.cpp index 1126bd8e857..680dc4bc5ec 100644 --- a/frameworks/kits/ability/native/src/ability_impl.cpp +++ b/frameworks/kits/ability/native/src/ability_impl.cpp @@ -44,11 +44,9 @@ void AbilityImpl::Init(std::shared_ptr &application, const std: contextDeal_ = contextDeal; // Multimodal Events -#ifdef MMI_COMPILE abilityKeyEventHandle_ = sptr(new (std::nothrow) AbilityKeyEventHandle(shared_from_this())); abilityTouchEventHandle_ = sptr(new (std::nothrow) AbilityTouchEventHandle(shared_from_this())); -#endif APP_LOGI("AbilityImpl::init end"); } @@ -698,28 +696,26 @@ void AbilityImpl::ScheduleUpdateConfiguration(const AAFwk::DummyConfiguration &c */ void AbilityImpl::MMIRegister() { -#ifdef MMI_COMPILE APP_LOGI("%{public}s called.", __func__); int32_t ret = 0; int32_t windowID = 0; if (ability_->GetAbilityInfo()->type == AppExecFwk::AbilityType::PAGE) { if (ability_->GetWindow() != nullptr) { - windowID = ability_->GetWindow()->GetWindowID(); + windowID = ability_->GetWindow()->GetID(); } } // register keyEvent - ret = MMIEventHdl->RegisterStandardizedEventHandle(token_, windowID, abilityKeyEventHandle_); + ret = MMIEventHdl.RegisterStandardizedEventHandle(token_, windowID, abilityKeyEventHandle_); APP_LOGI("MMIRegister :token:%{public}p windowID:%{public}d", token_.GetRefPtr(), windowID); APP_LOGI("MMIRegister :keyEventHandler:%{public}p", abilityKeyEventHandle_.GetRefPtr()); APP_LOGI("MMIRegister :RegisterkeyEventHandler ret:%{public}d", ret); // register touchEvent - ret = MMIEventHdl->RegisterStandardizedEventHandle(token_, windowID, abilityTouchEventHandle_); + ret = MMIEventHdl.RegisterStandardizedEventHandle(token_, windowID, abilityTouchEventHandle_); APP_LOGI("MMIRegister :token:%{public}p windowID:%{public}d", token_.GetRefPtr(), windowID); APP_LOGI("MMIRegister :touchEventHandler:%{public}p", abilityTouchEventHandle_.GetRefPtr()); APP_LOGI("MMIRegister :RegistertouchEventHandler ret:%{public}d", ret); -#endif } /** @@ -727,27 +723,25 @@ void AbilityImpl::MMIRegister() */ void AbilityImpl::MMIUnRegister() { -#ifdef MMI_COMPILE APP_LOGI("%{public}s called.", __func__); int32_t ret = 0; int32_t windowID = 0; if (ability_->GetAbilityInfo()->type == AppExecFwk::AbilityType::PAGE) { if (ability_->GetWindow() != nullptr) { - windowID = ability_->GetWindow()->GetWindowID(); + windowID = ability_->GetWindow()->GetID(); } } // unregister keyEvent - ret = MMIEventHdl->UnregisterStandardizedEventHandle(token_, windowID, abilityKeyEventHandle_); + ret = MMIEventHdl.UnregisterStandardizedEventHandle(token_, windowID, abilityKeyEventHandle_); APP_LOGI("MMIUnRegister :token:%{public}p windowID:%{public}d", token_.GetRefPtr(), windowID); APP_LOGI("MMIUnRegister :keyEventHandler:%{public}p", abilityKeyEventHandle_.GetRefPtr()); APP_LOGI("MMIUnRegister :UnRegisterkeyEventHandler ret:%{public}d", ret); // unregister touchEvent - ret = MMIEventHdl->UnregisterStandardizedEventHandle(token_, windowID, abilityTouchEventHandle_); + ret = MMIEventHdl.UnregisterStandardizedEventHandle(token_, windowID, abilityTouchEventHandle_); APP_LOGI("MMIUnRegister :token:%{public}p windowID:%{public}d", token_.GetRefPtr(), windowID); APP_LOGI("MMIUnRegister :touchEventHandler:%{public}p", abilityTouchEventHandle_.GetRefPtr()); APP_LOGI("MMIUnRegister :UnRegistertouchEventHandler ret:%{public}d", ret); -#endif } /** diff --git a/frameworks/kits/ability/native/src/ability_keyevent.cpp b/frameworks/kits/ability/native/src/ability_keyevent.cpp index f56205b9de9..d6b1f83a39a 100644 --- a/frameworks/kits/ability/native/src/ability_keyevent.cpp +++ b/frameworks/kits/ability/native/src/ability_keyevent.cpp @@ -31,7 +31,6 @@ AbilityKeyEventHandle::~AbilityKeyEventHandle() APP_LOGI("AbilityKeyEventHandle is destroyed"); } -#ifdef MMI_COMPILE /** * @brief Called back when on key. */ @@ -77,6 +76,5 @@ bool AbilityKeyEventHandle::OnKey(const KeyEvent &keyEvent) APP_LOGI("AbilityKeyEventHandle::OnKey called end. return %{public}s", ret ? "true" : "false"); return ret; } -#endif } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/frameworks/kits/ability/native/src/ability_touchevent.cpp b/frameworks/kits/ability/native/src/ability_touchevent.cpp index 6109b60ae92..82b2157853c 100644 --- a/frameworks/kits/ability/native/src/ability_touchevent.cpp +++ b/frameworks/kits/ability/native/src/ability_touchevent.cpp @@ -30,7 +30,6 @@ AbilityTouchEventHandle::~AbilityTouchEventHandle() APP_LOGI("AbilityTouchEventHandle is destroyed"); } -#ifdef MMI_COMPILE /** * @brief Called back when on touch. */ @@ -63,6 +62,5 @@ bool AbilityTouchEventHandle::OnTouch(const TouchEvent &touchEvent) touchEvent.GetPhase()); return ret; } -#endif } // namespace AppExecFwk } // namespace OHOS \ No newline at end of file diff --git a/frameworks/kits/ability/native/src/ability_window.cpp b/frameworks/kits/ability/native/src/ability_window.cpp index f1efe6e4e67..a114b9cff6d 100755 --- a/frameworks/kits/ability/native/src/ability_window.cpp +++ b/frameworks/kits/ability/native/src/ability_window.cpp @@ -120,11 +120,7 @@ bool AbilityWindow::OnKeyEvent(KeyEvent event) return ret; } switch (event.GetKeyCode()) { -#ifdef MMI_COMPILE case OHOS::KeyEventEnum::KEY_BACK: -#else - case KeyEvent::CODE_BACK: -#endif APP_LOGI("AbilityWindow::OnKeyEvent Back key pressed."); if (!event.IsKeyDown()) { ret = OnBackPressed(ability); diff --git a/frameworks/kits/ability/native/test/BUILD.gn b/frameworks/kits/ability/native/test/BUILD.gn index f9487343eda..225948c089b 100755 --- a/frameworks/kits/ability/native/test/BUILD.gn +++ b/frameworks/kits/ability/native/test/BUILD.gn @@ -112,7 +112,6 @@ ohos_unittest("ability_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher:appkit_dispatcher_td", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -120,6 +119,7 @@ ohos_unittest("ability_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -143,7 +143,6 @@ ohos_unittest("ability_lifecycle_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -151,6 +150,7 @@ ohos_unittest("ability_lifecycle_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -174,7 +174,6 @@ ohos_unittest("ability_lifecycle_executor_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/appexecfwk_base:appexecfwk_base", "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -182,6 +181,7 @@ ohos_unittest("ability_lifecycle_executor_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -204,7 +204,6 @@ ohos_unittest("ability_context_for_task_dispacher_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher:appkit_dispatcher_td", "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -213,6 +212,7 @@ ohos_unittest("ability_context_for_task_dispacher_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -236,7 +236,6 @@ ohos_unittest("ability_context_interface_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -245,6 +244,7 @@ ohos_unittest("ability_context_interface_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -270,7 +270,6 @@ ohos_unittest("ability_context_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -279,6 +278,7 @@ ohos_unittest("ability_context_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -303,7 +303,6 @@ ohos_unittest("page_ability_impl_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -311,6 +310,7 @@ ohos_unittest("page_ability_impl_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -334,7 +334,6 @@ ohos_unittest("service_ability_impl_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -342,6 +341,7 @@ ohos_unittest("service_ability_impl_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -368,6 +368,7 @@ ohos_unittest("data_ability_helper_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -392,7 +393,6 @@ ohos_unittest("data_ability_operation_test") { "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -401,6 +401,7 @@ ohos_unittest("data_ability_operation_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -431,7 +432,6 @@ ohos_unittest("ability_impl_active_test") { "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -439,6 +439,7 @@ ohos_unittest("ability_impl_active_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -467,7 +468,6 @@ ohos_unittest("ability_impl_test") { "//foundation/appexecfwk/standard/kits:appkit_native", "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -475,6 +475,7 @@ ohos_unittest("ability_impl_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -515,7 +516,6 @@ ohos_unittest("ability_thread_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -523,6 +523,7 @@ ohos_unittest("ability_thread_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -557,7 +558,6 @@ ohos_unittest("form_provider_client_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -565,6 +565,7 @@ ohos_unittest("form_provider_client_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -599,7 +600,6 @@ ohos_unittest("data_ability_impl_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -607,6 +607,7 @@ ohos_unittest("data_ability_impl_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -644,7 +645,6 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -652,6 +652,7 @@ ohos_unittest("data_ability_impl_file_secondpart_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -689,7 +690,6 @@ ohos_unittest("data_ability_impl_file_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -697,6 +697,7 @@ ohos_unittest("data_ability_impl_file_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -737,7 +738,6 @@ ohos_unittest("ability_thread_dataability_test") { "//foundation/distributedschedule/dmsfwk/interfaces/innerkits/uri:zuri", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gtest_main", "//utils/native/base:utils", ] @@ -745,6 +745,7 @@ ohos_unittest("ability_thread_dataability_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -791,6 +792,7 @@ ohos_unittest("data_uri_utils_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -812,6 +814,7 @@ ohos_unittest("pac_map_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -843,6 +846,7 @@ ohos_unittest("ability_permission_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -861,7 +865,10 @@ ohos_unittest("task_handler_client_test") { "//utils/native/base:utils", ] - external_deps = [ "hiviewdfx_hilog_native:libhilog" ] + external_deps = [ + "hiviewdfx_hilog_native:libhilog", + "multimodalinput_base:libmmi-client", + ] } ohos_unittest("ability_thread_for_ability_on_configuration_update") { @@ -885,6 +892,7 @@ ohos_unittest("ability_thread_for_ability_on_configuration_update") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -904,6 +912,7 @@ ohos_unittest("data_ability_result_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } @@ -934,7 +943,6 @@ ohos_unittest("form_host_client_test") { "//foundation/appexecfwk/standard/interfaces/innerkits/task_dispatcher:appkit_dispatcher_td", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//foundation/graphic/standard:libwmclient", - "//foundation/multimodalinput/input/interfaces/native/innerkits/event:mmi_event", "//third_party/googletest:gmock_main", "//third_party/googletest:gtest_main", "//utils/native/base:utils", @@ -944,6 +952,7 @@ ohos_unittest("form_host_client_test") { "appexecfwk_standard:fmskit_native", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", ] } diff --git a/frameworks/kits/test/BUILD.gn b/frameworks/kits/test/BUILD.gn index 173a8cc511e..560989d6fae 100755 --- a/frameworks/kits/test/BUILD.gn +++ b/frameworks/kits/test/BUILD.gn @@ -102,6 +102,7 @@ ohos_moduletest("ability_moduletest") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -160,6 +161,7 @@ ohos_moduletest("ability_conetxt_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -226,6 +228,7 @@ ohos_moduletest("data_ability_operation_moduletest") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", @@ -269,6 +272,7 @@ ohos_moduletest("data_ability_helper_module_test") { external_deps = [ "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", + "multimodalinput_base:libmmi-client", "native_appdatamgr:native_appdatafwk", "native_appdatamgr:native_dataability", "native_appdatamgr:native_rdb", -- Gitee From 2d360bb3f5936e19ee0016eba6b02671dfdf936d Mon Sep 17 00:00:00 2001 From: songliy Date: Tue, 19 Oct 2021 10:31:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E4=BF=AE=E6=94=B9aafwk?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=20Signed-off-by:=20licheng.li=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/kits/ability/native/include/ability_keyevent.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/kits/ability/native/include/ability_keyevent.h b/frameworks/kits/ability/native/include/ability_keyevent.h index e98e5fb76f1..1bb4bf1f4d5 100644 --- a/frameworks/kits/ability/native/include/ability_keyevent.h +++ b/frameworks/kits/ability/native/include/ability_keyevent.h @@ -23,8 +23,7 @@ namespace OHOS { namespace AppExecFwk { class AbilityImpl; -class AbilityKeyEventHandle - : public MMI::KeyEventHandler +class AbilityKeyEventHandle : public MMI::KeyEventHandler { public: AbilityKeyEventHandle(const std::shared_ptr &ability); -- Gitee From d8883fd88da8b239cfe732c6c90ec64231264aba Mon Sep 17 00:00:00 2001 From: songliy Date: Tue, 19 Oct 2021 10:33:30 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E4=BF=AE=E6=94=B9aafwk?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=20Signed-off-by:=20licheng.li=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/kits/ability/native/include/ability_touchevent.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/frameworks/kits/ability/native/include/ability_touchevent.h b/frameworks/kits/ability/native/include/ability_touchevent.h index 65a01b64b93..aba765d724b 100644 --- a/frameworks/kits/ability/native/include/ability_touchevent.h +++ b/frameworks/kits/ability/native/include/ability_touchevent.h @@ -23,8 +23,7 @@ namespace OHOS { namespace AppExecFwk { class AbilityImpl; -class AbilityTouchEventHandle - : public MMI::TouchEventHandler +class AbilityTouchEventHandle : public MMI::TouchEventHandler { public: AbilityTouchEventHandle(std::shared_ptr ability); -- Gitee From dcb285e1a063e8b674d9cba107026477b36d6fce Mon Sep 17 00:00:00 2001 From: songliy Date: Tue, 19 Oct 2021 14:14:04 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=A4=9A=E6=A8=A1=E4=BF=AE=E6=94=B9aafwk?= =?UTF-8?q?=E5=91=8A=E8=AD=A6=20Signed-off-by:=20licheng.li=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frameworks/kits/ability/native/include/ability_keyevent.h | 3 +-- frameworks/kits/ability/native/include/ability_touchevent.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/frameworks/kits/ability/native/include/ability_keyevent.h b/frameworks/kits/ability/native/include/ability_keyevent.h index 1bb4bf1f4d5..dfabb9bdc1e 100644 --- a/frameworks/kits/ability/native/include/ability_keyevent.h +++ b/frameworks/kits/ability/native/include/ability_keyevent.h @@ -23,8 +23,7 @@ namespace OHOS { namespace AppExecFwk { class AbilityImpl; -class AbilityKeyEventHandle : public MMI::KeyEventHandler -{ +class AbilityKeyEventHandle : public MMI::KeyEventHandler { public: AbilityKeyEventHandle(const std::shared_ptr &ability); ~AbilityKeyEventHandle(); diff --git a/frameworks/kits/ability/native/include/ability_touchevent.h b/frameworks/kits/ability/native/include/ability_touchevent.h index aba765d724b..6ec21c60d16 100644 --- a/frameworks/kits/ability/native/include/ability_touchevent.h +++ b/frameworks/kits/ability/native/include/ability_touchevent.h @@ -23,8 +23,7 @@ namespace OHOS { namespace AppExecFwk { class AbilityImpl; -class AbilityTouchEventHandle : public MMI::TouchEventHandler -{ +class AbilityTouchEventHandle : public MMI::TouchEventHandler { public: AbilityTouchEventHandle(std::shared_ptr ability); virtual ~AbilityTouchEventHandle(); -- Gitee