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

add

Browse Source 
Signed-off-by: hwzhangchuang <zhangchuang.zhang@huawei.com>
This commit is contained in:
hwzhangchuang
2023-12-02 11:58:08 +08:00
parent becdd9273b
commit b22062bff6
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/include/constants_dinput.h
+3 -2
View File
@@ -136,8 +136,9 @@ namespace DistributedInput {
const std::string DINPUT_SPLIT_COMMA = ", ";
const char VIR_NODE_SPLIT = '|';
const char VIR_NODE_PID_SPLIT = '/';
const char VIR_NODE_SPLIT_CHAR = '|';
const std::string VIR_NODE_SPLIT = "|";
const std::string VIR_NODE_PID_SPLIT = "/";
const uint32_t VIR_NODE_PHY_LEN = 3;
const uint32_t VIR_NODE_PHY_DEVID_IDX = 1;
const uint32_t VIR_NODE_PHY_DHID_IDX = 2;
services/source/inputinject/src/distributed_input_node_manager.cpp
+4 -4
View File
@@ -250,7 +250,7 @@ bool DistributedInputNodeManager::GetDevDhUniqueIdByFd(int fd, DhUniqueID &dhUnq
DHLOGD("GetDevDhUniqueIdByFd physicalPath %s.", physicalPath.c_str());
std::vector<std::string> phyPathVec;
SplitStringToVector(physicalPath, VIR_NODE_SPLIT, phyPathVec);
SplitStringToVector(physicalPath, VIR_NODE_SPLIT_CHAR, phyPathVec);
if (phyPathVec.size() != VIR_NODE_PHY_LEN) {
DHLOGE("The physical path is invalid");
return false;
@@ -405,18 +405,18 @@ void DistributedInputNodeManager::AddDeviceLocked(const std::string &networkId,
int32_t DistributedInputNodeManager::CloseDeviceLocked(const std::string &devId, const std::string &dhId)
{
DHLOGI("CloseDeviceLocked called, deviceId=%s, dhId=%s",
GetAnonyString(networkId).c_str(), GetAnonyString(dhId).c_str());
GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
std::lock_guard<std::mutex> lock(virtualDeviceMapMutex_);
DhUniqueID dhUniqueId = {devId, dhId};
std::map<DhUniqueID, std::unique_ptr<VirtualDevice>>::iterator iter = virtualDeviceMap_.find(dhUniqueId);
if (iter != virtualDeviceMap_.end()) {
DHLOGI("CloseDeviceLocked called success, deviceId=%s, dhId=%s",
GetAnonyString(networkId).c_str(), GetAnonyString(dhId).c_str());
GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
virtualDeviceMap_.erase(iter);
return DH_SUCCESS;
}
DHLOGE("CloseDeviceLocked called failure, deviceId=%s, dhId=%s",
GetAnonyString(networkId).c_str(), GetAnonyString(dhId).c_str());
GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
return ERR_DH_INPUT_SERVER_SOURCE_CLOSE_DEVICE_FAIL;
}