mirror of
https://github.com/openharmony/distributedhardware_distributed_input.git
synced 2026-07-18 16:04:40 -04:00
Merge remote-tracking branch 'origin/master' into surface3
Change-Id: I1b2a9619bb2e4f2a2e99c961da5fd267866e43f9
This commit is contained in:
@@ -42,7 +42,6 @@
|
||||
"hicollie",
|
||||
"hisysevent",
|
||||
"hitrace",
|
||||
"graphic_2d",
|
||||
"graphic_surface",
|
||||
"window_manager"
|
||||
],
|
||||
|
||||
@@ -21,36 +21,42 @@ namespace DistributedInput {
|
||||
int32_t DistributedInputKit::PrepareRemoteInput(
|
||||
const std::string &sinkId, sptr<IPrepareDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("PrepareRemoteInput entrance by sinkId");
|
||||
return DistributedInputClient::GetInstance().PrepareRemoteInput(sinkId, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::UnprepareRemoteInput(
|
||||
const std::string &sinkId, sptr<IUnprepareDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("UnprepareRemoteInput entrance by sinkId");
|
||||
return DistributedInputClient::GetInstance().UnprepareRemoteInput(sinkId, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StartRemoteInput(
|
||||
const std::string &sinkId, const uint32_t &inputTypes, sptr<IStartDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("StartRemoteInput entrance by sinkId and inputTypes");
|
||||
return DistributedInputClient::GetInstance().StartRemoteInput(sinkId, inputTypes, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StopRemoteInput(
|
||||
const std::string &sinkId, const uint32_t &inputTypes, sptr<IStopDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("StopRemoteInput entrance by sinkId and inputTypes");
|
||||
return DistributedInputClient::GetInstance().StopRemoteInput(sinkId, inputTypes, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StartRemoteInput(const std::string &srcId, const std::string &sinkId,
|
||||
const uint32_t &inputTypes, sptr<IStartDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("StartRemoteInput entrance by srcId,sinkId,inputTypes");
|
||||
return DistributedInputClient::GetInstance().StartRemoteInput(srcId, sinkId, inputTypes, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StopRemoteInput(const std::string &srcId, const std::string &sinkId,
|
||||
const uint32_t &inputTypes, sptr<IStopDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("StopRemoteInput entrance by srcId,sinkId,inputTypes");
|
||||
return DistributedInputClient::GetInstance().StopRemoteInput(srcId, sinkId, inputTypes, callback);
|
||||
}
|
||||
|
||||
@@ -77,55 +83,65 @@ bool DistributedInputKit::IsStartDistributedInput(const std::string &dhId)
|
||||
int32_t DistributedInputKit::PrepareRemoteInput(const std::string &srcId, const std::string &sinkId,
|
||||
sptr<IPrepareDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("PrepareRemoteInput entrance by srcId and sinkId");
|
||||
return DistributedInputClient::GetInstance().PrepareRemoteInput(srcId, sinkId, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::UnprepareRemoteInput(const std::string &srcId, const std::string &sinkId,
|
||||
sptr<IUnprepareDInputCallback> callback)
|
||||
{
|
||||
DHLOGI("UnprepareRemoteInput entrance by srcId and sinkId");
|
||||
return DistributedInputClient::GetInstance().UnprepareRemoteInput(srcId, sinkId, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StartRemoteInput(const std::string &sinkId, const std::vector<std::string> &dhIds,
|
||||
sptr<IStartStopDInputsCallback> callback)
|
||||
{
|
||||
DHLOGI("StartRemoteInput entrance by sinkId and dhIds");
|
||||
return DistributedInputClient::GetInstance().StartRemoteInput(sinkId, dhIds, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StopRemoteInput(const std::string &sinkId, const std::vector<std::string> &dhIds,
|
||||
sptr<IStartStopDInputsCallback> callback)
|
||||
{
|
||||
DHLOGI("StopRemoteInput entrance by sinkId and dhIds");
|
||||
return DistributedInputClient::GetInstance().StopRemoteInput(sinkId, dhIds, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StartRemoteInput(const std::string &srcId, const std::string &sinkId,
|
||||
const std::vector<std::string> &dhIds, sptr<IStartStopDInputsCallback> callback)
|
||||
{
|
||||
DHLOGI("StartRemoteInput entrance by srcId,sinkId,dhIds");
|
||||
return DistributedInputClient::GetInstance().StartRemoteInput(srcId, sinkId, dhIds, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::StopRemoteInput(const std::string &srcId, const std::string &sinkId,
|
||||
const std::vector<std::string> &dhIds, sptr<IStartStopDInputsCallback> callback)
|
||||
{
|
||||
DHLOGI("StopRemoteInput entrance by srcId,sinkId,dhIds");
|
||||
return DistributedInputClient::GetInstance().StopRemoteInput(srcId, sinkId, dhIds, callback);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::RegisterSimulationEventListener(sptr<ISimulationEventListener> listener)
|
||||
{
|
||||
DHLOGI("RegisterSimulationEventListener entrance");
|
||||
return DistributedInputClient::GetInstance().RegisterSimulationEventListener(listener);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::UnregisterSimulationEventListener(sptr<ISimulationEventListener> listener)
|
||||
{
|
||||
DHLOGI("UnregisterSimulationEventListener entrance");
|
||||
return DistributedInputClient::GetInstance().UnregisterSimulationEventListener(listener);
|
||||
}
|
||||
|
||||
int32_t DistributedInputKit::RegisterSessionStateCb(sptr<ISessionStateCallback> callback)
|
||||
{
|
||||
DHLOGI("RegisterSessionStateCb entrance");
|
||||
return DistributedInputClient::GetInstance().RegisterSessionStateCb(callback);
|
||||
}
|
||||
int32_t DistributedInputKit::UnregisterSessionStateCb()
|
||||
{
|
||||
DHLOGI("UnregisterSessionStateCb entrance");
|
||||
return DistributedInputClient::GetInstance().UnregisterSessionStateCb();
|
||||
}
|
||||
} // namespace DistributedInput
|
||||
|
||||
@@ -598,6 +598,7 @@ int32_t DistributedInputSourceStub::HandleUnregisterSessionStateCb(MessageParcel
|
||||
int32_t DistributedInputSourceStub::OnRemoteRequest(
|
||||
uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option)
|
||||
{
|
||||
DHLOGI("OnRemoteRequest code: %u.", code);
|
||||
if (data.ReadInterfaceToken() != GetDescriptor()) {
|
||||
DHLOGE("DistributedInputSourceStub read token valid failed");
|
||||
return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL;
|
||||
|
||||
@@ -41,9 +41,9 @@ namespace {
|
||||
const int32_t SESSION_STATUS_OPENED = 0;
|
||||
const int32_t SESSION_STATUS_CLOSED = 1;
|
||||
static QosTV g_qosInfo[] = {
|
||||
{ .qos = QOS_TYPE_MIN_BW, .value = 10 * 1024 * 1024},
|
||||
{ .qos = QOS_TYPE_MAX_LATENCY, .value = 2000 },
|
||||
{ .qos = QOS_TYPE_TRANS_RELIABILITY, .value = QOS_RELIABILITY_FULL }
|
||||
{ .qos = QOS_TYPE_MIN_BW, .value = 80 * 1024 * 1024},
|
||||
{ .qos = QOS_TYPE_MAX_LATENCY, .value = 8000 },
|
||||
{ .qos = QOS_TYPE_MIN_LATENCY, .value = 2000 }
|
||||
};
|
||||
static uint32_t g_QosTV_Param_Index = static_cast<uint32_t>(sizeof(g_qosInfo) / sizeof(g_qosInfo[0]));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user