From ef70d7bd464ee82b29df73c95d04d790c66368d2 Mon Sep 17 00:00:00 2001 From: xxxx Date: Fri, 2 Sep 2022 11:16:28 +0800 Subject: [PATCH] Description: modify device id print Match-id-0d1987414a3cb7fe0526e23d5de2eb7b03a72898 --- .../src/distributed_input_sink_transport.cpp | 10 ++++---- .../src/distributed_input_source_manager.cpp | 24 +++++++++---------- .../distributed_input_source_transport.cpp | 8 +++---- utils/src/dinput_utils_tool.cpp | 3 --- 4 files changed, 21 insertions(+), 24 deletions(-) diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index e877af4..e164b77 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -163,7 +163,7 @@ int32_t DistributedInputSinkTransport::RespPrepareRemoteInput( const int32_t sessionId, std::string &smsg) { if (sessionId > 0) { - DHLOGI("RespPrepareRemoteInput sessionId: %d, smsg:%s.", sessionId, smsg.c_str()); + DHLOGI("RespPrepareRemoteInput sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); int32_t ret = SendMessage(sessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("RespPrepareRemoteInput error, SendMessage fail."); @@ -180,7 +180,7 @@ int32_t DistributedInputSinkTransport::RespUnprepareRemoteInput( const int32_t sessionId, std::string &smsg) { if (sessionId > 0) { - DHLOGI("RespUnprepareRemoteInput sessionId: %d, smsg:%s.", sessionId, smsg.c_str()); + DHLOGI("RespUnprepareRemoteInput sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); int32_t ret = SendMessage(sessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("RespUnprepareRemoteInput error, SendMessage fail."); @@ -197,7 +197,7 @@ int32_t DistributedInputSinkTransport::RespStartRemoteInput( const int32_t sessionId, std::string &smsg) { if (sessionId > 0) { - DHLOGI("RespStartRemoteInput sessionId: %d, smsg:%s.", sessionId, smsg.c_str()); + DHLOGI("RespStartRemoteInput sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); int32_t ret = SendMessage(sessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("RespStartRemoteInput error, SendMessage fail."); @@ -213,7 +213,7 @@ int32_t DistributedInputSinkTransport::RespStartRemoteInput( int32_t DistributedInputSinkTransport::RespStopRemoteInput(const int32_t sessionId, std::string &smsg) { if (sessionId > 0) { - DHLOGI("RespStopRemoteInput sessionId: %d, smsg:%s.", sessionId, smsg.c_str()); + DHLOGI("RespStopRemoteInput sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); int32_t ret = SendMessage(sessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("RespStopRemoteInput error, SendMessage fail."); @@ -239,7 +239,7 @@ int32_t DistributedInputSinkTransport::RespLatency(const int32_t sessionId, std: return ERR_DH_INPUT_SERVER_SINK_TRANSPORT_RESP_LATENCY_FAIL; } - DHLOGI("RespLatency sessionId: %d, smsg:%s.", sessionId, smsg.c_str()); + DHLOGI("RespLatency sessionId: %d, smsg:%s.", sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 6e52594..43db716 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -88,7 +88,7 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseRegisterDist const std::string deviceId, const std::string dhId, bool result) { DHLOGI("onResponseRegisterDistributedHardware called, deviceId: %s, " - "result: %s.", GetAnonyString(deviceId).c_str(), result); + "result: %s.", GetAnonyString(deviceId).c_str(), result ? "success" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponseRegisterDistributedHardware sourceManagerObj_ is null."); return; @@ -115,8 +115,8 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseRegisterDist void DistributedInputSourceManager::DInputSourceListener::onResponsePrepareRemoteInput(const std::string deviceId, bool result, const std::string &object) { - DHLOGI("onResponsePrepareRemoteInput called, deviceId: %s, result: %d.", - GetAnonyString(deviceId).c_str(), result); + DHLOGI("onResponsePrepareRemoteInput called, deviceId: %s, result: %s.", + GetAnonyString(deviceId).c_str(), result ? "success" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponsePrepareRemoteInput sourceManagerObj_ is null."); @@ -144,7 +144,7 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseUnprepareRem const std::string deviceId, bool result) { DHLOGI("onResponseUnprepareRemoteInput called, deviceId: %s, " - "result: %d.", GetAnonyString(deviceId).c_str(), result); + "result: %s.", GetAnonyString(deviceId).c_str(), result ? "success" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponseUnprepareRemoteInput sourceManagerObj_ is null."); @@ -170,8 +170,8 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseUnprepareRem void DistributedInputSourceManager::DInputSourceListener::onResponseStartRemoteInput( const std::string deviceId, const uint32_t inputTypes, bool result) { - DHLOGI("onResponseStartRemoteInput called, deviceId: %s, inputTypes: %d, result: %d.", - GetAnonyString(deviceId).c_str(), inputTypes, result); + DHLOGI("onResponseStartRemoteInput called, deviceId: %s, inputTypes: %d, result: %s.", + GetAnonyString(deviceId).c_str(), inputTypes, result ? "success" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponseStartRemoteInput sourceManagerObj_ is null."); @@ -206,8 +206,8 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseStartRemoteI void DistributedInputSourceManager::DInputSourceListener::onResponseStopRemoteInput( const std::string deviceId, const uint32_t inputTypes, bool result) { - DHLOGI("onResponseStopRemoteInput called, deviceId: %s, inputTypes: %d, result: %d.", - GetAnonyString(deviceId).c_str(), inputTypes, result); + DHLOGI("onResponseStopRemoteInput called, deviceId: %s, inputTypes: %d, result: %s.", + GetAnonyString(deviceId).c_str(), inputTypes, result ? "true" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponseStopRemoteInput sourceManagerObj_ is null."); @@ -234,8 +234,8 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseStopRemoteIn void DistributedInputSourceManager::DInputSourceListener::onResponseStartRemoteInputDhid( const std::string deviceId, const std::string &dhids, bool result) { - DHLOGI("onResponseStartRemoteInputDhid called, deviceId: %s, result: %d.", - GetAnonyString(deviceId).c_str(), result); + DHLOGI("onResponseStartRemoteInputDhid called, deviceId: %s, result: %s.", + GetAnonyString(deviceId).c_str(), result ? "success" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponseStartRemoteInputDhid sourceManagerObj_ is null."); @@ -270,8 +270,8 @@ void DistributedInputSourceManager::DInputSourceListener::onResponseStartRemoteI void DistributedInputSourceManager::DInputSourceListener::onResponseStopRemoteInputDhid( const std::string deviceId, const std::string &dhids, bool result) { - DHLOGI("onResponseStopRemoteInputDhid called, deviceId: %s, result: %d.", - GetAnonyString(deviceId).c_str(), result); + DHLOGI("onResponseStopRemoteInputDhid called, deviceId: %s, result: %s.", + GetAnonyString(deviceId).c_str(), result ? "success" : "failed"); if (sourceManagerObj_ == nullptr) { DHLOGE("onResponseStopRemoteInputDhid sourceManagerObj_ is null."); diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 5452617..96a504e 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -435,11 +435,11 @@ int32_t DistributedInputSourceTransport::StartRemoteInput(const std::string &dev int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("StartRemoteInput deviceId:%s, sessionId: %d, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), sessionId, smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_START_FAIL; } DHLOGI("StartRemoteInput deviceId:%s, sessionId: %d, smsg:%s.", GetAnonyString(deviceId).c_str(), - sessionId, smsg.c_str()); + sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } @@ -468,11 +468,11 @@ int32_t DistributedInputSourceTransport::StopRemoteInput(const std::string &devi int32_t ret = SendMsg(sessionId, smsg); if (ret != DH_SUCCESS) { DHLOGE("StopRemoteInput deviceId:%s, sessionId: %d, smsg:%s, SendMsg error, ret:%d.", - GetAnonyString(deviceId).c_str(), sessionId, smsg.c_str(), ret); + GetAnonyString(deviceId).c_str(), sessionId, SetAnonyId(smsg).c_str(), ret); return ERR_DH_INPUT_SERVER_SOURCE_TRANSPORT_STOP_FAIL; } DHLOGI("StopRemoteInput deviceId:%s, sessionId: %d, smsg:%s.", GetAnonyString(deviceId).c_str(), - sessionId, smsg.c_str()); + sessionId, SetAnonyId(smsg).c_str()); return DH_SUCCESS; } diff --git a/utils/src/dinput_utils_tool.cpp b/utils/src/dinput_utils_tool.cpp index 2b17156..9e3ee2b 100644 --- a/utils/src/dinput_utils_tool.cpp +++ b/utils/src/dinput_utils_tool.cpp @@ -90,9 +90,6 @@ std::string SetAnonyId(const std::string &message) if (IsString(jsonObj, DINPUT_SOFTBUS_KEY_DEVICE_ID)) { jsonObj[DINPUT_SOFTBUS_KEY_DEVICE_ID] = GetAnonyString(jsonObj[DINPUT_SOFTBUS_KEY_DEVICE_ID]); } - if (IsInt32(jsonObj, DINPUT_SOFTBUS_KEY_SESSION_ID)) { - jsonObj[DINPUT_SOFTBUS_KEY_SESSION_ID] = GetAnonyInt32(jsonObj[DINPUT_SOFTBUS_KEY_SESSION_ID]); - } if (IsString(jsonObj, DESCRIPTOR)) { jsonObj[DESCRIPTOR] = GetAnonyString(jsonObj[DESCRIPTOR]); }