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

!150 修复DINPUT问题：首次穿越对端无法获取down事件

Browse Source 
Merge pull request !150 from 李尚/master
This commit is contained in:
openharmony_ci
2024-01-29 10:51:14 +00:00
committed by Gitee
parent 4002be268c 56060b9e53
commit bfe640fcc4
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/sink/sinkmanager/src/distributed_input_sink_manager.cpp
+7 -20
View File
@@ -133,16 +133,6 @@ void DistributedInputSinkManager::DInputSinkListener::OnPrepareRemoteInput(
nlohmann::json jsonStr;
jsonStr[DINPUT_SOFTBUS_KEY_CMD_TYPE] = TRANS_SINK_MSG_ONPREPARE;
std::string smsg = "";
int32_t ret = DistributedInputCollector::GetInstance().StartCollectionThread(
DistributedInputSinkTransport::GetInstance().GetEventHandler());
if (ret != DH_SUCCESS) {
DHLOGE("DInputSinkListener init InputCollector error.");
jsonStr[DINPUT_SOFTBUS_KEY_RESP_VALUE] = false;
jsonStr[DINPUT_SOFTBUS_KEY_WHITE_LIST] = "";
smsg = jsonStr.dump();
DistributedInputSinkTransport::GetInstance().RespPrepareRemoteInput(sessionId, smsg);
return;
}
DistributedInputSinkSwitch::GetInstance().AddSession(sessionId);
sinkManagerObj_->QueryLocalWhiteList(jsonStr);
@@ -173,16 +163,6 @@ void DistributedInputSinkManager::DInputSinkListener::OnRelayPrepareRemoteInput(
jsonStr[DINPUT_SOFTBUS_KEY_CMD_TYPE] = TRANS_SINK_MSG_ON_RELAY_PREPARE;
jsonStr[DINPUT_SOFTBUS_KEY_SESSION_ID] = toSrcSessionId;
std::string smsg = "";
int ret = DistributedInputCollector::GetInstance().StartCollectionThread(
DistributedInputSinkTransport::GetInstance().GetEventHandler());
if (ret != DH_SUCCESS) {
DHLOGE("DInputSinkListener init InputCollector error.");
jsonStr[DINPUT_SOFTBUS_KEY_RESP_VALUE] = false;
jsonStr[DINPUT_SOFTBUS_KEY_WHITE_LIST] = "";
smsg = jsonStr.dump();
DistributedInputSinkTransport::GetInstance().RespPrepareRemoteInput(toSinkSessionId, smsg);
return;
}
DistributedInputSinkSwitch::GetInstance().AddSession(toSinkSessionId);
sinkManagerObj_->QueryLocalWhiteList(jsonStr);
@@ -636,6 +616,13 @@ int32_t DistributedInputSinkManager::Init()
dhFwkKit->RegisterPublisherListener(DHTopic::TOPIC_PHY_DEV_PLUGIN, pluginStartListener_);
DistributedInputCollector::GetInstance().PreInit();
DHLOGI("init InputCollector.");
int result = DistributedInputCollector::GetInstance().StartCollectionThread(
DistributedInputSinkTransport::GetInstance().GetEventHandler());
if (result != DH_SUCCESS) {
DHLOGE("init InputCollector error.");
}
return DH_SUCCESS;
}