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

检视意见修改

Browse Source 
Signed-off-by: litiangang4 <litiangang4@huawei.com>
This commit is contained in:
litiangang4
2023-09-15 16:35:21 +08:00
parent f1594e89c2
commit 5b385efc4c
22 changed files with 197 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/source/sourcemanager/src/dinput_source_listener.cpp
+3 -3
View File
@@ -255,9 +255,9 @@ void DInputSourceListener::OnResponseStartRemoteInputDhid(
sourceManagerObj_->SetDeviceMapValue(deviceId, DINPUT_SOURCE_SWITCH_ON);
}
std::vector<std::string> vecStr;
StringSplitToVector(dhids, INPUT_STRING_SPLIT_POINT, vecStr);
DInputState::GetInstance().RecordDhids(vecStr, DhidState::THROUGH_IN, -1);
std::vector<std::string> devDhIds;
SplitStringToVector(dhids, INPUT_STRING_SPLIT_POINT, devDhIds);
DInputState::GetInstance().RecordDhIds(devDhIds, DhIdState::THROUGH_IN, -1);
auto jsonArrayMsg = std::make_shared<nlohmann::json>();
nlohmann::json tmpJson;
services/source/sourcemanager/src/distributed_input_source_manager.cpp
+7 -7
View File
@@ -1401,7 +1401,7 @@ void DistributedInputSourceManager::RunWhiteListCallback(const std::string &devI
DHLOGE("addWhiteListCallbacks_ is empty.");
return;
}
for (const auto& it : addWhiteListCallbacks_) {
for (const auto &it : addWhiteListCallbacks_) {
it->OnResult(devId, object);
}
}
@@ -1449,7 +1449,7 @@ void DistributedInputSourceManager::RunUnprepareCallback(const std::string &devI
DHLOGE("ProcessEvent DINPUT_SOURCE_MANAGER_UNPREPARE_MSG delWhiteListCallback is null.");
return;
}
for (const auto& it : delWhiteListCallbacks_) {
for (const auto &it : delWhiteListCallbacks_) {
it->OnResult(devId);
}
return;
@@ -1490,7 +1490,7 @@ void DistributedInputSourceManager::RunStartDhidCallback(const std::string &sink
const int32_t &status)
{
std::vector<std::string> dhidsVec;
StringSplitToVector(dhIds, INPUT_STRING_SPLIT_POINT, dhidsVec);
SplitStringToVector(dhIds, INPUT_STRING_SPLIT_POINT, dhidsVec);
DHLOGI("ProcessEvent DINPUT_SOURCE_MANAGER_START_DHID_MSG dhIds:%s, vec-size:%d", GetAnonyString(dhIds).c_str(),
dhidsVec.size());
std::string localNetWorkId = GetLocalNetworkId();
@@ -1512,7 +1512,7 @@ void DistributedInputSourceManager::RunStopDhidCallback(const std::string &sinkI
const int32_t &status)
{
std::vector<std::string> dhidsVec;
StringSplitToVector(dhIds, INPUT_STRING_SPLIT_POINT, dhidsVec);
SplitStringToVector(dhIds, INPUT_STRING_SPLIT_POINT, dhidsVec);
std::string localNetworkId = GetLocalNetworkId();
if (localNetworkId.empty()) {
return;
@@ -1533,7 +1533,7 @@ void DistributedInputSourceManager::RunRelayStartDhidCallback(const std::string
const int32_t status, const std::string &dhids)
{
std::vector<std::string> dhidsVec;
StringSplitToVector(dhids, INPUT_STRING_SPLIT_POINT, dhidsVec);
SplitStringToVector(dhids, INPUT_STRING_SPLIT_POINT, dhidsVec);
DHLOGI("ProcessEvent DINPUT_SOURCE_MANAGER_RELAY_STARTDHID_RESULT_MMI dhIds:%s, vec-size:%d",
dhids.c_str(), dhidsVec.size());
bool isCbRun = false;
@@ -1557,7 +1557,7 @@ void DistributedInputSourceManager::RunRelayStopDhidCallback(const std::string &
const int32_t status, const std::string &dhids)
{
std::vector<std::string> dhidsVec;
StringSplitToVector(dhids, INPUT_STRING_SPLIT_POINT, dhidsVec);
SplitStringToVector(dhids, INPUT_STRING_SPLIT_POINT, dhidsVec);
bool isCbRun = false;
for (std::vector<DInputClientStopDhidInfo>::iterator iter = relayStpDhidCallbacks_.begin();
iter != relayStpDhidCallbacks_.end(); ++iter) {
@@ -1951,7 +1951,7 @@ void DistributedInputSourceManager::DeviceOfflineListener::DeleteNodeInfoAndNoti
}
std::set<BeRegNodeInfo> nodeSet = sourceManagerContext_->GetSyncNodeInfo(offlineDevId);
std::string localNetWorkId = GetLocalNetworkId();
for (const auto& node : nodeSet) {
for (const auto &node : nodeSet) {
DHLOGI("DeleteNodeInfoAndNotify device: %s, dhId: %s", GetAnonyString(offlineDevId).c_str(),
GetAnonyString(node.dhId).c_str());
// Notify multimodal