From 2dd5d4520a3b84743340e6b3995d9b7d34757ae6 Mon Sep 17 00:00:00 2001 From: hwzhangchuang Date: Sat, 28 Oct 2023 09:14:15 +0800 Subject: [PATCH] modify code format check Signed-off-by: hwzhangchuang --- common/include/input_hub.cpp | 24 +++++++++---------- .../include/distributed_input_node_manager.h | 4 +++- .../src/distributed_input_node_manager.cpp | 14 +++++++++-- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/common/include/input_hub.cpp b/common/include/input_hub.cpp index 8389a6e..d7fe27f 100644 --- a/common/include/input_hub.cpp +++ b/common/include/input_hub.cpp @@ -559,11 +559,11 @@ void InputHub::GetEventMask(int fd, const std::string &eventName, uint32_t type, void InputHub::GetMSCBits(int fd, std::unique_ptr &device) { - uint8_t mscBitmask_[NBYTES(MSC_MAX)] {}; - GetEventMask(fd, "msc", EV_MSC, sizeof(mscBitmask_), mscBitmask_); + uint8_t mscBitmask[NBYTES(MSC_MAX)] {}; + GetEventMask(fd, "msc", EV_MSC, sizeof(mscBitmask), mscBitmask); for (uint32_t msc = MSC_SERIAL; msc < MSC_MAX; ++msc) { - if (TestBit(EV_MSC, device->evBitmask) && TestBit(msc, mscBitmask_)) { + if (TestBit(EV_MSC, device->evBitmask) && TestBit(msc, mscBitmask)) { DHLOGI("Get MSC event: %d", msc); device->identifier.miscellaneous.push_back(msc); } @@ -572,10 +572,10 @@ void InputHub::GetMSCBits(int fd, std::unique_ptr &device) void InputHub::GetLEDBits(int fd, std::unique_ptr &device) { - uint8_t ledBitmask_[NBYTES(LED_MAX)] {}; - GetEventMask(fd, "led", EV_LED, sizeof(ledBitmask_), ledBitmask_); + uint8_t ledBitmask[NBYTES(LED_MAX)] {}; + GetEventMask(fd, "led", EV_LED, sizeof(ledBitmask), ledBitmask); for (uint32_t led = LED_NUML; led < LED_MAX; ++led) { - if (TestBit(EV_LED, device->evBitmask) && TestBit(led, ledBitmask_)) { + if (TestBit(EV_LED, device->evBitmask) && TestBit(led, ledBitmask)) { DHLOGI("Get LED event: %d", led); device->identifier.leds.push_back(led); } @@ -584,11 +584,11 @@ void InputHub::GetLEDBits(int fd, std::unique_ptr &device) void InputHub::GetSwitchBits(int fd, std::unique_ptr &device) { - uint8_t switchBitmask_[NBYTES(SW_MAX)] {}; - GetEventMask(fd, "switch", EV_SW, sizeof(switchBitmask_), switchBitmask_); + uint8_t switchBitmask[NBYTES(SW_MAX)] {}; + GetEventMask(fd, "switch", EV_SW, sizeof(switchBitmask), switchBitmask); for (uint32_t sw = SW_LID; sw < SW_MAX; ++sw) { - if (TestBit(EV_SW, device->evBitmask) && TestBit(sw, switchBitmask_)) { + if (TestBit(EV_SW, device->evBitmask) && TestBit(sw, switchBitmask)) { DHLOGI("Get Switch event: %d", sw); device->identifier.switchs.push_back(sw); } @@ -597,11 +597,11 @@ void InputHub::GetSwitchBits(int fd, std::unique_ptr &device) void InputHub::GetRepeatBits(int fd, std::unique_ptr &device) { - uint8_t repBitmask_[NBYTES(REP_MAX)] {}; - GetEventMask(fd, "repeat", EV_REP, sizeof(repBitmask_), repBitmask_); + uint8_t repBitmask[NBYTES(REP_MAX)] {}; + GetEventMask(fd, "repeat", EV_REP, sizeof(repBitmask), repBitmask); for (uint32_t rep = REP_DELAY; rep < REP_MAX; ++rep) { - if (TestBit(EV_REP, device->evBitmask) && TestBit(rep, repBitmask_)) { + if (TestBit(EV_REP, device->evBitmask) && TestBit(rep, repBitmask)) { DHLOGI("Get Repeat event: %d", rep); device->identifier.repeats.push_back(rep); } diff --git a/services/source/inputinject/include/distributed_input_node_manager.h b/services/source/inputinject/include/distributed_input_node_manager.h index ddae65d..fd6c022 100644 --- a/services/source/inputinject/include/distributed_input_node_manager.h +++ b/services/source/inputinject/include/distributed_input_node_manager.h @@ -89,7 +89,9 @@ private: void AddDeviceLocked(const std::string &dhId, std::unique_ptr device); int32_t CreateHandle(const InputDevice &inputDevice, const std::string &devId, const std::string &dhId); void ParseInputDeviceJson(const std::string &str, InputDevice &pBuf); - void VerifyInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf); + void ParseInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf); + void ParseInputDeviceBasicInfo(const nlohmann::json &inputDeviceJson, InputDevice &pBuf); + void ParseInputDeviceEvents(const nlohmann::json &inputDeviceJson, InputDevice &pBuf); void InjectEvent(); void ScanSinkInputDevices(const std::string &dhId); diff --git a/services/source/inputinject/src/distributed_input_node_manager.cpp b/services/source/inputinject/src/distributed_input_node_manager.cpp index 5c2c603..ab9553c 100644 --- a/services/source/inputinject/src/distributed_input_node_manager.cpp +++ b/services/source/inputinject/src/distributed_input_node_manager.cpp @@ -79,10 +79,16 @@ void DistributedInputNodeManager::ParseInputDeviceJson(const std::string &str, I DHLOGE("recMsg parse failed!"); return; } - VerifyInputDevice(inputDeviceJson, pBuf); + ParseInputDevice(inputDeviceJson, pBuf); } -void DistributedInputNodeManager::VerifyInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf) +void DistributedInputNodeManager::ParseInputDevice(const nlohmann::json &inputDeviceJson, InputDevice &pBuf) +{ + ParseInputDeviceBasicInfo(inputDeviceJson, pBuf); + ParseInputDeviceEvents(inputDeviceJson, pBuf); +} + +void DistributedInputNodeManager::ParseInputDeviceBasicInfo(const nlohmann::json &inputDeviceJson, InputDevice &pBuf) { if (IsString(inputDeviceJson, DEVICE_NAME)) { pBuf.name = inputDeviceJson[DEVICE_NAME].get(); @@ -111,6 +117,10 @@ void DistributedInputNodeManager::VerifyInputDevice(const nlohmann::json &inputD if (IsUInt32(inputDeviceJson, CLASSES)) { pBuf.classes = inputDeviceJson[CLASSES].get(); } +} + +void DistributedInputNodeManager::ParseInputDeviceEvents(const nlohmann::json &inputDeviceJson, InputDevice &pBuf) +{ if (IsArray(inputDeviceJson, EVENT_TYPES)) { pBuf.eventTypes = inputDeviceJson[EVENT_TYPES].get>(); } -- Gitee