Description: modify dinput PartI and PartII conflit

Match-id-95701c9f395e01f22f32df0471d2b2e76d2edc0f
This commit is contained in:
xxxx
2022-08-30 21:21:57 +08:00
parent da85b1dfbc
commit f0cc34789c
43 changed files with 465 additions and 537 deletions
@@ -61,20 +61,6 @@ void DistributedInputClient::UnregisterDInputCb::OnResult(
}
}
void DistributedInputClient::StartDInputServerCb::OnResult(const int32_t& status, const uint32_t& inputTypes)
{
if (DInputServerType::SOURCE_SERVER_TYPE == static_cast<DInputServerType>(status)) {
DistributedInputClient::GetInstance().serverType = DInputServerType::SOURCE_SERVER_TYPE;
DistributedInputClient::GetInstance().inputTypes_ = static_cast<DInputDeviceType>(inputTypes);
} else if (DInputServerType::SINK_SERVER_TYPE == static_cast<DInputServerType>(status)) {
DistributedInputClient::GetInstance().serverType = DInputServerType::SINK_SERVER_TYPE;
DistributedInputClient::GetInstance().inputTypes_ = static_cast<DInputDeviceType>(inputTypes);
} else {
DistributedInputClient::GetInstance().serverType = DInputServerType::NULL_SERVER_TYPE;
DistributedInputClient::GetInstance().inputTypes_ = DInputDeviceType::NONE;
}
}
void DistributedInputClient::AddWhiteListInfosCb::OnResult(const std::string &deviceId, const std::string &strJson)
{
nlohmann::json inputData = nlohmann::json::parse(strJson);
@@ -150,11 +136,6 @@ bool DistributedInputClient::IsNeedFilterOut(const std::string& deviceId, const
return true;
}
DInputServerType DistributedInputClient::IsStartDistributedInput(const uint32_t& inputType)
{
return serverType;
}
bool DistributedInputClient::IsJsonData(std::string strData) const
{
return true;