openharmony/distributedhardware_distributed_input
1
0
Fork 0
mirror of https://github.com/openharmony/distributedhardware_distributed_input.git synced 2026-07-18 16:04:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

resolve cppcheck and Cyclomatic Complexity

Browse Source 
Signed-off-by: l30054665 <lishang21@huawei.com>
This commit is contained in:
l30054665
2023-12-22 09:58:44 +08:00
parent ccd419aecd
commit 63e2e81e28
3 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/input_hub.cpp
+22 -21
View File
@@ -221,27 +221,7 @@ bool InputHub::IsTouchPad(const InputDevice &inputDevice)
void InputHub::MatchAndDealEvent(Device *device, const RawEvent &event)
{
// Deal key state
if (event.type == EV_KEY && event.code != BTN_TOOL_FINGER && event.value == KEY_DOWN_STATE) {
DInputState::GetInstance().AddKeyDownState(event);
RecordChangeEventLog(event);
}
if (event.type == EV_KEY && event.value == KEY_UP_STATE) {
DInputState::GetInstance().RemoveKeyDownState(event);
RecordChangeEventLog(event);
}
if (event.type == EV_KEY && event.value == KEY_REPEAT) {
DInputState::GetInstance().CheckAndSetLongPressedKeyOrder(event);
}
if (event.type == EV_ABS && (event.code == ABS_MT_POSITION_X || event.code == ABS_X)) {
DInputState::GetInstance().RefreshABSPosition(event.descriptor, event.value, -1);
}
if (event.type == EV_ABS && (event.code == ABS_MT_POSITION_Y || event.code == ABS_Y)) {
DInputState::GetInstance().RefreshABSPosition(event.descriptor, -1, event.value);
}
DealKeyEvent(event);
if (IsTouchPad(device) && event.type == EV_KEY && event.code == BTN_MOUSE && event.value == KEY_UP_STATE &&
!DInputState::GetInstance().IsDhIdDown(event.descriptor)) {
@@ -265,6 +245,27 @@ void InputHub::MatchAndDealEvent(Device *device, const RawEvent &event)
}
}
void InputHub::DealKeyEvent(const RawEvent &event)
{
if (event.type == EV_KEY && event.code != BTN_TOOL_FINGER && event.value == KEY_DOWN_STATE) {
DInputState::GetInstance().AddKeyDownState(event);
RecordChangeEventLog(event);
}
if (event.type == EV_KEY && event.value == KEY_UP_STATE) {
DInputState::GetInstance().RemoveKeyDownState(event);
RecordChangeEventLog(event);
}
if (event.type == EV_KEY && event.value == KEY_REPEAT) {
DInputState::GetInstance().CheckAndSetLongPressedKeyOrder(event);
}
if (event.type == EV_ABS && (event.code == ABS_MT_POSITION_X || event.code == ABS_X)) {
DInputState::GetInstance().RefreshABSPosition(event.descriptor, event.value, -1);
}
if (event.type == EV_ABS && (event.code == ABS_MT_POSITION_Y || event.code == ABS_Y)) {
DInputState::GetInstance().RefreshABSPosition(event.descriptor, -1, event.value);
}
}
void InputHub::RecordDeviceChangeStates(Device *device, struct input_event readBuffer[], const size_t count)
{
bool isTouchEvent = false;
common/include/input_hub.h
+1
View File
@@ -182,6 +182,7 @@ private:
*/
void RecordDeviceChangeStates(Device *device, struct input_event readBuffer[], const size_t count);
void MatchAndDealEvent(Device *device, const RawEvent &event);
void DealKeyEvent(const RawEvent &event);
/*
* Scan the input device node and save info.
*/
services/sink/inputcollector/src/distributed_input_collector.cpp
+1 -1
View File
@@ -116,7 +116,7 @@ void DistributedInputCollector::StartCollectEventsThread()
return;
}
size_t count = inputHub_->StartCollectInputEvents(mEventBuffer, INPUT_EVENT_BUFFER_SIZE);
if (count <= 0) {
if (count == 0) {
continue;
}