openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2025-03-01 07:35:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix compile problem

Browse Source 
Signed-off-by: yichengzhao <yichengzhao1@huawei.com>
This commit is contained in:
yichengzhao 2022-01-28 17:38:45 +08:00
parent 676523f70a
commit 93f3eb5e40
11 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dummyData/multimoduleDummy.cpp
View File

@ -18,7 +18,7 @@
namespace OHOS {
namespace Accessibility {
void MultimodalInputFilter::InjectEventToMultimodal(MultimodalEvent &event) {
void MultimodalInputFilter::InjectEventToMultimodal(MMI::MultimodalEvent &event) {
}
void MultimodalInputManager::RegisterMultimodalInputFilter(MultimodalInputFilter &inputFilter) {

4
dummyData/multimoduleDummy.h
View File

@ -25,8 +25,8 @@ class MultimodalInputFilter {
public:
MultimodalInputFilter() {};
virtual ~MultimodalInputFilter() = default;
virtual void OnInputEvent(MultimodalEvent &event) {};
void InjectEventToMultimodal(MultimodalEvent &event);
virtual void OnInputEvent(MMI::MultimodalEvent &event) {};
void InjectEventToMultimodal(MMI::MultimodalEvent &event);
};
class MultimodalInputManager {

2
services/aams/include/accessibility_input_filter.h
View File

@ -48,7 +48,7 @@ public:
AccessibilityInputFilter();
~AccessibilityInputFilter();
void OnInputEvent(MultimodalEvent &event) override;
void OnInputEvent(MMI::MultimodalEvent &event) override;
void OnTouchEvent(TouchEvent &event) override;
void OnMouseEvent(MouseEvent &event) override;
void OnKeyEvent(MMI::KeyEvent &event) override;

8
services/aams/src/accessibility_input_filter.cpp
View File

@ -44,7 +44,7 @@ AccessibilityInputFilter::~AccessibilityInputFilter()
DestroyTransmitters();
}
void AccessibilityInputFilter::OnInputEvent(MultimodalEvent &event)
void AccessibilityInputFilter::OnInputEvent(MMI::MultimodalEvent &event)
{
HILOG_DEBUG();
@ -57,19 +57,19 @@ void AccessibilityInputFilter::OnInputEvent(MultimodalEvent &event)
int sourceType = event.GetSourceDevice();
HILOG_DEBUG("Source type[%d].", sourceType);
switch (sourceType) {
case SourceDevice::TOUCH_PANEL: {
case MMI::SourceDevice::TOUCH_PANEL: {
TouchEvent touchEvent = static_cast<TouchEvent&>(event);
auto task = std::bind(&AccessibilityInputFilter::ProcessTouchEvent, this, touchEvent);
eventHandler_->PostTask(task, AppExecFwk::EventQueue::Priority::LOW);
}
break;
case SourceDevice::MOUSE: {
case MMI::SourceDevice::MOUSE: {
MouseEvent mouseEvent = static_cast<MouseEvent&>(event);
auto task = std::bind(&AccessibilityInputFilter::ProcessMouseEvent, this, mouseEvent);
eventHandler_->PostTask(task, AppExecFwk::EventQueue::Priority::LOW);
}
break;
case SourceDevice::KEYBOARD: {
case MMI::SourceDevice::KEYBOARD: {
// TODO: fixme
// MMI::KeyEvent keyEvent = static_cast<MMI::KeyEvent&>(event);
// auto task = std::bind(&AccessibilityInputFilter::ProcessKeyEvent, this, keyEvent);

2
services/aams/src/accessibility_touch_guider.cpp
View File

@ -115,7 +115,7 @@ void TouchGuider::OnAccessibilityEvent(AccessibilityEventInfo &event) {
}
void TouchGuider::ClearEvents(uint32_t inputSource) {
if (inputSource == SourceDevice::TOUCH_PANEL) {
if (inputSource == MMI::SourceDevice::TOUCH_PANEL) {
Clear();
}
EventTransmission::ClearEvents(inputSource);

2
services/aams/test/mock/multimoduleDummy_mock.cpp
View File

@ -22,7 +22,7 @@ namespace Accessibility {
int MTtouchAction = -1;
std::vector<int> mtTouchAction;
void MultimodalInputFilter::InjectEventToMultimodal(MultimodalEvent &event) {
void MultimodalInputFilter::InjectEventToMultimodal(MMI::MultimodalEvent &event) {
TouchEvent* touchAction = (TouchEvent*)&event;
MTtouchAction = touchAction->GetAction();
mtTouchAction.push_back(MTtouchAction);

12
services/aams/test/unittest/accessibility_input_filter_test.cpp
View File

@ -157,7 +157,7 @@ HWTEST_F(AccessibilityInputFilterTest, AccessibilityInputFilterTest_Unittest_OnT
TouchEvent touchEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::TOUCH_PANEL,
.sourceType = MMI::SourceDevice::TOUCH_PANEL,
};
struct ManipulationProperty manipulationProperty = {
@ -192,7 +192,7 @@ HWTEST_F(AccessibilityInputFilterTest, AccessibilityInputFilterTest_Unittest_OnT
TouchEvent touchEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::TOUCH_PANEL,
.sourceType = MMI::SourceDevice::TOUCH_PANEL,
};
struct ManipulationProperty manipulationProperty = {
@ -239,7 +239,7 @@ HWTEST_F(AccessibilityInputFilterTest, AccessibilityInputFilterTest_Unittest_OnM
MouseEvent mouseEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::MOUSE,
.sourceType = MMI::SourceDevice::MOUSE,
};
struct MouseProperty mouseProperty = {
@ -270,7 +270,7 @@ HWTEST_F(AccessibilityInputFilterTest, AccessibilityInputFilterTest_Unittest_OnM
MouseEvent mouseEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::MOUSE,
.sourceType = MMI::SourceDevice::MOUSE,
};
struct MouseProperty mouseProperty = {
@ -313,7 +313,7 @@ HWTEST_F(AccessibilityInputFilterTest, AccessibilityInputFilterTest_Unittest_OnK
MMI::KeyEvent keyEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::KEYBOARD,
.sourceType = MMI::SourceDevice::KEYBOARD,
};
struct KeyProperty property = {
@ -344,7 +344,7 @@ HWTEST_F(AccessibilityInputFilterTest, AccessibilityInputFilterTest_Unittest_OnK
MMI::KeyEvent keyEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::KEYBOARD,
.sourceType = MMI::SourceDevice::KEYBOARD,
};
struct KeyProperty property = {

2
services/test/mock/multimoduleDummy_mock.cpp
View File

@ -22,7 +22,7 @@ namespace Accessibility {
int MTtouchAction = -1;
std::vector<int> mtTouchAction;
void MultimodalInputFilter::InjectEventToMultimodal(MultimodalEvent &event) {
void MultimodalInputFilter::InjectEventToMultimodal(MMI::MultimodalEvent &event) {
TouchEvent* touchAction = (TouchEvent*)&event;
MTtouchAction = touchAction->GetAction();
mtTouchAction.push_back(MTtouchAction);

2
services/test/moduletest/aamstest/aams_accessibility_keyevent_filter_test/aams_accessibility_keyevent_filter_test.cpp
View File

@ -172,7 +172,7 @@ KeyEvent aamsKeyEventFilterTest::CreateOnKeyEvent(int keycode) {
KeyEvent keyEvent{};
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::KEYBOARD,
.sourceType = MMI::SourceDevice::KEYBOARD,
};
struct KeyProperty property{

2
services/test/moduletest/aamstest/aams_accessibility_keyevent_filter_test/mock/multimoduleDummy_mock.cpp
View File

@ -21,7 +21,7 @@ int MTkeyCode = -1;
namespace OHOS {
namespace Accessibility {
void MultimodalInputFilter::InjectEventToMultimodal(MultimodalEvent &event) {
void MultimodalInputFilter::InjectEventToMultimodal(MMI::MultimodalEvent &event) {
KeyEvent* keyevent = (KeyEvent*)&event;
MTkeyCode = keyevent->GetKeyCode();
}

2
services/test/moduletest/aamstest/aams_accessibility_touch_guider_test/aams_accessibility_touch_guider_test.cpp
View File

@ -204,7 +204,7 @@ TouchEvent aamsTouchGuideTest::CreateTouchEvent(int action, MmiPoint &point, int
{
TouchEvent touchEvent;
struct MultimodalProperty multimodal = {
.sourceType = SourceDevice::TOUCH_PANEL,
.sourceType = MMI::SourceDevice::TOUCH_PANEL,
.occurredTime = occurredTime,
};
struct ManipulationProperty manipulationProperty = {