diff --git a/bundle.json b/bundle.json index f8495f2..f304dae 100755 --- a/bundle.json +++ b/bundle.json @@ -42,7 +42,6 @@ "hicollie", "hisysevent", "hitrace", - "graphic_2d", "graphic_surface", "window_manager" ], diff --git a/interfaces/inner_kits/src/distributed_input_kit.cpp b/interfaces/inner_kits/src/distributed_input_kit.cpp index 663c696..a96641b 100644 --- a/interfaces/inner_kits/src/distributed_input_kit.cpp +++ b/interfaces/inner_kits/src/distributed_input_kit.cpp @@ -21,36 +21,42 @@ namespace DistributedInput { int32_t DistributedInputKit::PrepareRemoteInput( const std::string &sinkId, sptr callback) { + DHLOGI("PrepareRemoteInput entrance by sinkId"); return DistributedInputClient::GetInstance().PrepareRemoteInput(sinkId, callback); } int32_t DistributedInputKit::UnprepareRemoteInput( const std::string &sinkId, sptr 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 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 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 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 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 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 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 &dhIds, sptr 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 &dhIds, sptr 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 &dhIds, sptr 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 &dhIds, sptr callback) { + DHLOGI("StopRemoteInput entrance by srcId,sinkId,dhIds"); return DistributedInputClient::GetInstance().StopRemoteInput(srcId, sinkId, dhIds, callback); } int32_t DistributedInputKit::RegisterSimulationEventListener(sptr listener) { + DHLOGI("RegisterSimulationEventListener entrance"); return DistributedInputClient::GetInstance().RegisterSimulationEventListener(listener); } int32_t DistributedInputKit::UnregisterSimulationEventListener(sptr listener) { + DHLOGI("UnregisterSimulationEventListener entrance"); return DistributedInputClient::GetInstance().UnregisterSimulationEventListener(listener); } int32_t DistributedInputKit::RegisterSessionStateCb(sptr callback) { + DHLOGI("RegisterSessionStateCb entrance"); return DistributedInputClient::GetInstance().RegisterSessionStateCb(callback); } int32_t DistributedInputKit::UnregisterSessionStateCb() { + DHLOGI("UnregisterSessionStateCb entrance"); return DistributedInputClient::GetInstance().UnregisterSessionStateCb(); } } // namespace DistributedInput diff --git a/interfaces/ipc/src/distributed_input_source_stub.cpp b/interfaces/ipc/src/distributed_input_source_stub.cpp index bba0223..624aabc 100644 --- a/interfaces/ipc/src/distributed_input_source_stub.cpp +++ b/interfaces/ipc/src/distributed_input_source_stub.cpp @@ -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; diff --git a/services/transportbase/src/distributed_input_transport_base.cpp b/services/transportbase/src/distributed_input_transport_base.cpp index 03a040f..4551118 100644 --- a/services/transportbase/src/distributed_input_transport_base.cpp +++ b/services/transportbase/src/distributed_input_transport_base.cpp @@ -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(sizeof(g_qosInfo) / sizeof(g_qosInfo[0])); }