From 40829d6475a3b2a1afe62d4798bab7e23f61498f Mon Sep 17 00:00:00 2001 From: gaoqiang_strong Date: Tue, 30 Aug 2022 10:34:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E8=A7=86=E6=84=8F=E8=A7=81=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: gaoqiang_strong --- common/include/dscreen_errcode.h | 3 + common/src/dscreen_hisysevent.cpp | 18 ++-- common/src/dscreen_sa_process_state.cpp | 5 +- common/src/dscreen_util.cpp | 3 +- .../screen_sink/src/dscreen_sink_handler.cpp | 27 ++++-- .../src/callback/dscreen_source_callback.cpp | 6 +- .../src/dscreen_source_handler.cpp | 19 +++-- screenhandler/src/dscreen_handler.cpp | 8 +- services/screenclient/src/screen_client.cpp | 36 ++++---- .../src/screen_client_window_adapter.cpp | 30 +++---- .../src/dscreen_sink_service.cpp | 4 +- .../dscreenmgr/include/dscreen.h | 4 +- .../dscreenmgr/include/dscreen_manager.h | 12 +-- .../dscreenmgr/src/dscreen_manager.cpp | 82 +++++++++---------- .../src/dscreen_source_service.cpp | 16 ++-- .../src/dscreen_source_stub.cpp | 8 -- 16 files changed, 156 insertions(+), 125 deletions(-) diff --git a/common/include/dscreen_errcode.h b/common/include/dscreen_errcode.h index 6b11c11e..0806f91e 100644 --- a/common/include/dscreen_errcode.h +++ b/common/include/dscreen_errcode.h @@ -58,6 +58,7 @@ enum DScreenErrorCode { ERR_DH_SCREEN_SA_LOAD_TIMEOUT = -500032, ERR_DH_SCREEN_SA_HIDUMPER_ERROR = -500033, ERR_DH_SCREEN_SA_ENABLE_JSON_ERROR = -500034, + ERR_DH_SCREEN_SA_VALUE_NOT_INIT = -500035, // Transport component error code ERR_DH_SCREEN_TRANS_ERROR = -51000, ERR_DH_SCREEN_TRANS_TIMEOUT = -51001, @@ -96,6 +97,8 @@ enum DScreenErrorCode { ERR_DH_SCREEN_SCREENCLIENT_HIDE_WINDOW_ERROR = -54004, // screen register callback ERR_DH_SCREEN_REGISTER_CALLBACK_NOT_INIT = -55000, + // screen string param empty + ERR_DH_SCREEN_STRING_PARAM_EMPTY = -56000, }; } // namespace DistributedHardware } // namespace OHOS diff --git a/common/src/dscreen_hisysevent.cpp b/common/src/dscreen_hisysevent.cpp index aafa6827..b94575d5 100644 --- a/common/src/dscreen_hisysevent.cpp +++ b/common/src/dscreen_hisysevent.cpp @@ -15,6 +15,8 @@ #include "dscreen_hisysevent.h" +#include + #include "hisysevent.h" #include "dscreen_errcode.h" @@ -32,7 +34,7 @@ void ReportSaFail(const std::string &eventName, int32_t errCode, int32_t saId, c "SAID", saId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -48,7 +50,7 @@ void ReportRegisterFail(const std::string &eventName, int32_t errCode, const std "DHID", dhId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -64,7 +66,7 @@ void ReportUnRegisterFail(const std::string &eventName, int32_t errCode, const s "DHID", dhId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -77,7 +79,7 @@ void ReportOptFail(const std::string &eventName, int32_t errCode, const std::str "ERRCODE", errCode, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -90,7 +92,7 @@ void ReportSaEvent(const std::string &eventName, int32_t saId, const std::string "SAID", saId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -105,7 +107,7 @@ void ReportRegisterScreenEvent(const std::string &eventName, const std::string & "DHID", dhId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -120,7 +122,7 @@ void ReportUnRegisterScreenEvent(const std::string &eventName, const std::string "DHID", dhId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } @@ -135,7 +137,7 @@ void ReportScreenMirrorEvent(const std::string &eventName, const std::string &de "DHID", dhId, "MSG", errMsg); if (res != DH_SUCCESS) { - DHLOGE("Write HiSysEvent error, res:%d", res); + DHLOGE("Write HiSysEvent error, res: " PRId32, res); } } } // namespace DistributedHardware diff --git a/common/src/dscreen_sa_process_state.cpp b/common/src/dscreen_sa_process_state.cpp index 5272ed99..df341d66 100644 --- a/common/src/dscreen_sa_process_state.cpp +++ b/common/src/dscreen_sa_process_state.cpp @@ -18,6 +18,7 @@ #include #include #include +#include #include "dscreen_constants.h" #include "dscreen_hisysevent.h" @@ -38,7 +39,7 @@ void SetSinkProcessExit() DHLOGI("set sink process exit."); std::lock_guard autoLock(g_saProcessState); g_sinkSAState = DSCREEN_SA_EXIT_STATE_STOP; - DHLOGI("g_sourceSAState = %d g_sinkSAState = %d", g_sourceSAState, g_sinkSAState); + DHLOGI("g_sourceSAState = " PRId32 ", g_sinkSAState = " PRId32, g_sourceSAState, g_sinkSAState); if (g_sourceSAState == DSCREEN_SA_EXIT_STATE_START || g_sinkSAState == DSCREEN_SA_EXIT_STATE_START) { return; } @@ -52,7 +53,7 @@ void SetSourceProcessExit() DHLOGI("set sources process exit."); std::lock_guard autoLock(g_saProcessState); g_sourceSAState = DSCREEN_SA_EXIT_STATE_STOP; - DHLOGI("g_sourceSAState = %d g_sinkSAState = %d", g_sourceSAState, g_sinkSAState); + DHLOGI("g_sourceSAState = " PRId32 ", g_sinkSAState = " PRId32, g_sourceSAState, g_sinkSAState); if (g_sourceSAState == DSCREEN_SA_EXIT_STATE_START || g_sinkSAState == DSCREEN_SA_EXIT_STATE_START) { return; } diff --git a/common/src/dscreen_util.cpp b/common/src/dscreen_util.cpp index 21703d55..6863c2f1 100644 --- a/common/src/dscreen_util.cpp +++ b/common/src/dscreen_util.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -38,7 +39,7 @@ int32_t GetLocalDeviceNetworkId(std::string &networkId) NodeBasicInfo basicInfo = { { 0 } }; int32_t ret = GetLocalNodeDeviceInfo(PKG_NAME.c_str(), &basicInfo); if (ret != DH_SUCCESS) { - DHLOGE("GetLocalDeviceNetworkId failed ret: %d", ret); + DHLOGE("GetLocalDeviceNetworkId failed ret: " PRId32, ret); return ret; } diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp index e503e1f7..9089f115 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_handler.cpp @@ -16,6 +16,7 @@ #include "dscreen_sink_handler.h" #include +#include #include #include "errors.h" @@ -73,7 +74,7 @@ int32_t DScreenSinkHandler::InitSink(const std::string ¶ms) StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SINK_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, loadCallback); if (ret != ERR_OK) { - DHLOGE("Failed to Load systemAbility, systemAbilityId:%d, ret code:%d", + DHLOGE("Failed to Load systemAbility, systemAbilityId:" PRId32 ", ret code: " PRId32, DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, ret); ReportSaFail(DSCREEN_INIT_FAIL, ret, DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, "dscreen sink LoadSystemAbility call failed."); @@ -97,7 +98,7 @@ int32_t DScreenSinkHandler::InitSink(const std::string ¶ms) void DScreenSinkHandler::FinishStartSA(const std::string ¶ms, const sptr &remoteObject) { DHLOGI("DScreenSinkHandler FinishStartSA"); - std::unique_lock lock(proxyMutex_); + std::lock_guard lock(proxyMutex_); if (sinkSvrRecipient_ == nullptr) { DHLOGE("sinkSvrRecipient is nullptr."); ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_SINKPROXY_NOT_INIT, DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, @@ -106,7 +107,7 @@ void DScreenSinkHandler::FinishStartSA(const std::string ¶ms, const sptrAddDeathRecipient(sinkSvrRecipient_); dScreenSinkProxy_ = iface_cast(remoteObject); - if ((dScreenSinkProxy_== nullptr) || (!dScreenSinkProxy_->AsObject())) { + if ((dScreenSinkProxy_== nullptr) || (dScreenSinkProxy_->AsObject() == nullptr)) { DHLOGE("Failed to get dscreen sink proxy."); ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_SINKPROXY_NOT_INIT, DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID, "dscreen sink get proxy failed."); @@ -141,8 +142,8 @@ int32_t DScreenSinkHandler::SubscribeLocalHardware(const std::string &dhId, cons DHLOGE("screen sink proxy not init."); return ERR_DH_SCREEN_SA_SINKPROXY_NOT_INIT; } - int32_t ret = dScreenSinkProxy_->SubscribeLocalHardware(dhId, param); - return ret; + + return dScreenSinkProxy_->SubscribeLocalHardware(dhId, param); } int32_t DScreenSinkHandler::UnsubscribeLocalHardware(const std::string &dhId) @@ -153,8 +154,8 @@ int32_t DScreenSinkHandler::UnsubscribeLocalHardware(const std::string &dhId) DHLOGE("screen sink proxy not init."); return ERR_DH_SCREEN_SA_SINKPROXY_NOT_INIT; } - int32_t ret = dScreenSinkProxy_->UnsubscribeLocalHardware(dhId); - return ret; + + return dScreenSinkProxy_->UnsubscribeLocalHardware(dhId); } void DScreenSinkHandler::DScreenSinkSvrRecipient::OnRemoteDied(const wptr &remote) @@ -172,10 +173,18 @@ void DScreenSinkHandler::OnRemoteSinkSvrDied(const wptr &remote) return; } std::lock_guard lock(proxyMutex_); - if (dScreenSinkProxy_ != nullptr && sinkSvrRecipient_ != nullptr) { - dScreenSinkProxy_->AsObject()->RemoveDeathRecipient(sinkSvrRecipient_); + if (dScreenSinkProxy_ == nullptr || dScreenSinkProxy_->AsObject() == nullptr) { + delete sinkSvrRecipient_; + sinkSvrRecipient_ = nullptr; dScreenSinkProxy_ = nullptr; + return; + } + if (sinkSvrRecipient_ == nullptr) { + dScreenSinkProxy_ = nullptr; + return; } + dScreenSinkProxy_->AsObject()->RemoveDeathRecipient(sinkSvrRecipient_); + dScreenSinkProxy_ = nullptr; } IDistributedHardwareSink *GetSinkHardwareHandler() diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp index e22ba562..cf1dc8d0 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback.cpp @@ -15,6 +15,8 @@ #include "dscreen_source_callback.h" +#include + #include "dscreen_errcode.h" #include "dscreen_log.h" #include "dscreen_util.h" @@ -26,7 +28,7 @@ DScreenSourceCallback::~DScreenSourceCallback() {} int32_t DScreenSourceCallback::OnNotifyRegResult(const std::string &devId, const std::string &dhId, const std::string &reqId, int32_t status, const std::string &data) { - DHLOGI("DScreenSourceCallback OnNotifyRegResult devId: %s dhId: %s status: %d", + DHLOGI("DScreenSourceCallback OnNotifyRegResult devId: %s dhId: %s status: " PRId32, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); auto iter = registerCallbackMap_.find(reqId); if (iter != registerCallbackMap_.end()) { @@ -41,7 +43,7 @@ int32_t DScreenSourceCallback::OnNotifyRegResult(const std::string &devId, const int32_t DScreenSourceCallback::OnNotifyUnregResult(const std::string &devId, const std::string &dhId, const std::string &reqId, int32_t status, const std::string &data) { - DHLOGI("DScreenSourceCallback OnNotifyUnregResult devId: %s dhId: %s status: %d", + DHLOGI("DScreenSourceCallback OnNotifyUnregResult devId: %s dhId: %s status: " PRId32, GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), status); auto iter = unregisterCallbackMap_.find(reqId); if (iter != unregisterCallbackMap_.end()) { diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp index beff2a16..c5009fbe 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_handler.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include "errors.h" @@ -73,7 +74,7 @@ int32_t DScreenSourceHandler::InitSource(const std::string ¶ms) StartTrace(DSCREEN_HITRACE_LABEL, DSCREEN_SOURCE_LOAD_SYSTEM_ABILITY_START); int32_t ret = samgr->LoadSystemAbility(DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, loadCallback); if (ret != ERR_OK) { - DHLOGE("Failed to Load systemAbility, systemAbilityId:%d, ret code:%d", + DHLOGE("Failed to Load systemAbility, systemAbilityId: " PRId32 ", ret code: " PRId32, DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, ret); ReportSaFail(DSCREEN_INIT_FAIL, ret, DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, "dscreen source LoadSystemAbility call failed."); @@ -97,7 +98,7 @@ int32_t DScreenSourceHandler::InitSource(const std::string ¶ms) void DScreenSourceHandler::FinishStartSA(const std::string ¶ms, const sptr &remoteObject) { DHLOGI("DScreenSourceHandler FinishStartSA"); - std::unique_lock lock(proxyMutex_); + std::lock_guard lock(proxyMutex_); if (sourceSvrRecipient_ == nullptr) { DHLOGE("sourceSvrRecipient is nullptr."); ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, @@ -106,7 +107,7 @@ void DScreenSourceHandler::FinishStartSA(const std::string ¶ms, const sptrAddDeathRecipient(sourceSvrRecipient_); dScreenSourceProxy_ = iface_cast(remoteObject); - if ((dScreenSourceProxy_ == nullptr) || (!dScreenSourceProxy_->AsObject())) { + if ((dScreenSourceProxy_ == nullptr) || (dScreenSourceProxy_->AsObject() == nullptr)) { DHLOGE("Failed to get dscreen source proxy."); ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID, "dscreen source get proxy failed."); @@ -210,10 +211,18 @@ void DScreenSourceHandler::OnRemoteSourceSvrDied(const wptr &remo return; } std::lock_guard lock(proxyMutex_); - if (dScreenSourceProxy_ != nullptr && sourceSvrRecipient_ != nullptr) { - dScreenSourceProxy_->AsObject()->RemoveDeathRecipient(sourceSvrRecipient_); + if (dScreenSourceProxy_ == nullptr || dScreenSourceProxy_->AsObject() == nullptr) { + delete sourceSvrRecipient_; + sourceSvrRecipient_ = nullptr; + dScreenSourceProxy_ = nullptr; + return; + } + if (sourceSvrRecipient_ == nullptr) { dScreenSourceProxy_ = nullptr; + return; } + dScreenSourceProxy_->AsObject()->RemoveDeathRecipient(sourceSvrRecipient_); + dScreenSourceProxy_ = nullptr; } IDistributedHardwareSource *GetSourceHardwareHandler() diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp index 435a4f53..f6e3ddf8 100644 --- a/screenhandler/src/dscreen_handler.cpp +++ b/screenhandler/src/dscreen_handler.cpp @@ -15,6 +15,8 @@ #include "dscreen_handler.h" +#include + #include "avcodec_info.h" #include "avcodec_list.h" #include "nlohmann/json.hpp" @@ -60,12 +62,12 @@ void ScreenListener::OnConnect(uint64_t screenId) { DHLOGI("on screen connect"); if (screenId != SCREEN_ID_DEFAULT) { - DHLOGE("screenId is invalid, screenId: %ulld", screenId); + DHLOGE("screenId is invalid, screenId: " PRId64, screenId); return; } sptr screen = Rosen::ScreenManager::GetInstance().GetScreenById(screenId); if (screen == nullptr) { - DHLOGE("screen not found, screenId: %ulld", screenId); + DHLOGE("screen not found, screenId: " PRId64, screenId); return; } @@ -111,7 +113,7 @@ std::vector DScreenHandler::Query() DHLOGI("DScreenHandler query hardware info"); std::vector dhItemVec; std::vector> screens = Rosen::ScreenManager::GetInstance().GetAllScreens(); - DHLOGI("screens size is: %d.", screens.size()); + DHLOGI("screens size is: " PRId32, screens.size()); for (const auto &screen : screens) { if (screen == nullptr) { DHLOGE("screen is nullptr."); diff --git a/services/screenclient/src/screen_client.cpp b/services/screenclient/src/screen_client.cpp index a2b17115..c6f9cb0a 100644 --- a/services/screenclient/src/screen_client.cpp +++ b/services/screenclient/src/screen_client.cpp @@ -15,6 +15,8 @@ #include "screen_client.h" +#include + #include "dscreen_errcode.h" #include "dscreen_log.h" #include "screen_client_window_adapter.h" @@ -31,7 +33,7 @@ ScreenClient::~ScreenClient() for (const auto &item : surfaceMap_) { int32_t ret = ScreenClientWindowAdapter::GetInstance().RemoveWindow(item.first); if (ret != DH_SUCCESS) { - DHLOGE("windowId (ID = %d) remove failed.", item.first); + DHLOGE("windowId (ID = " PRId32 ") remove failed.", item.first); return; } } @@ -58,7 +60,7 @@ int32_t ScreenClient::AddWindow(std::shared_ptr windowProperty) std::lock_guard dataLock(surfaceMapMutex_); surfaceMap_.emplace(windowId, surface); } - DHLOGI("Add window (ID = %d) success.", windowId); + DHLOGI("Add window (ID = " PRId32 ") success.", windowId); return windowId; } @@ -68,16 +70,16 @@ int32_t ScreenClient::ShowWindow(int32_t windowId) std::lock_guard dataLock(surfaceMapMutex_); auto iter = surfaceMap_.find(windowId); if (iter == surfaceMap_.end()) { - DHLOGE("windowId (ID = %d) is non-existent.", windowId); + DHLOGE("windowId (ID = " PRId32 ") is non-existent.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR; } } int32_t ret = ScreenClientWindowAdapter::GetInstance().ShowWindow(windowId); if (DH_SUCCESS != ret) { - DHLOGE("Show window (ID = %d) failed.", windowId); + DHLOGE("Show window (ID = " PRId32 ") failed.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR; } - DHLOGI("Show window (ID = %d) success.", windowId); + DHLOGI("Show window (ID = " PRId32 ") success.", windowId); return ret; } @@ -87,16 +89,16 @@ int32_t ScreenClient::HideWindow(int32_t windowId) std::lock_guard dataLock(surfaceMapMutex_); auto iter = surfaceMap_.find(windowId); if (iter == surfaceMap_.end()) { - DHLOGE("windowId (ID = %d) is non-existent.", windowId); + DHLOGE("windowId (ID = " PRId32 ") is non-existent.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_HIDE_WINDOW_ERROR; } } int32_t ret = ScreenClientWindowAdapter::GetInstance().HideWindow(windowId); if (DH_SUCCESS != ret) { - DHLOGE("Hide window (ID = %d) failed.", windowId); + DHLOGE("Hide window (ID = " PRId32 ") failed.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_HIDE_WINDOW_ERROR; } - DHLOGI("Hide window (ID = %d) success.", windowId); + DHLOGI("Hide window (ID = " PRId32 ") success.", windowId); return ret; } @@ -106,16 +108,16 @@ int32_t ScreenClient::MoveWindow(int32_t windowId, int32_t startX, int32_t start std::lock_guard dataLock(surfaceMapMutex_); auto iter = surfaceMap_.find(windowId); if (iter == surfaceMap_.end()) { - DHLOGE("windowId (ID = %d) is non-existent.", windowId); + DHLOGE("windowId (ID = " PRId32 ") is non-existent.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR; } } int32_t ret = ScreenClientWindowAdapter::GetInstance().MoveWindow(windowId, startX, startY); if (DH_SUCCESS != ret) { - DHLOGE("Move window (ID = %d) failed.", windowId); + DHLOGE("Move window (ID = " PRId32 ") failed.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR; } - DHLOGD("Move window (ID = %d) success.", windowId); + DHLOGD("Move window (ID = " PRId32 ") success.", windowId); return ret; } @@ -126,16 +128,16 @@ sptr ScreenClient::GetSurface(int32_t windowId) std::lock_guard dataLock(surfaceMapMutex_); auto iter = surfaceMap_.find(windowId); if (iter == surfaceMap_.end()) { - DHLOGE("windowId (ID = %d) is non-existent.", windowId); + DHLOGE("windowId (ID = " PRId32 ") is non-existent.", windowId); return nullptr; } surface = iter->second; } if (surface == nullptr) { - DHLOGE("Get surface is null(ID = %d).", windowId); + DHLOGE("Get surface is null(ID = " PRId32 ").", windowId); return nullptr; } - DHLOGD("Get surface (ID = %d) success.", windowId); + DHLOGD("Get surface (ID = " PRId32 ") success.", windowId); return surface; } @@ -145,17 +147,17 @@ int32_t ScreenClient::RemoveWindow(int32_t windowId) std::lock_guard dataLock(surfaceMapMutex_); auto iter = surfaceMap_.find(windowId); if (iter == surfaceMap_.end()) { - DHLOGE("windowId (ID = %d) is non-existent.", windowId); + DHLOGE("windowId (ID = " PRId32 ") is non-existent.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR; } surfaceMap_.erase(windowId); } int32_t ret = ScreenClientWindowAdapter::GetInstance().RemoveWindow(windowId); if (ret != DH_SUCCESS) { - DHLOGE("windowId (ID = %d) remove failed.", windowId); + DHLOGE("windowId (ID = " PRId32 ") remove failed.", windowId); return ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR; } - DHLOGD("windowId (ID = %d) remove success.", windowId); + DHLOGD("windowId (ID = " PRId32 ") remove success.", windowId); return DH_SUCCESS; } } // namespace DistributedHardware diff --git a/services/screenclient/src/screen_client_window_adapter.cpp b/services/screenclient/src/screen_client_window_adapter.cpp index 8499d197..8b152b90 100644 --- a/services/screenclient/src/screen_client_window_adapter.cpp +++ b/services/screenclient/src/screen_client_window_adapter.cpp @@ -15,6 +15,8 @@ #include "screen_client_window_adapter.h" +#include + #include "rs_surface_node.h" #include "transaction/rs_interfaces.h" #include "window_option.h" @@ -36,11 +38,11 @@ ScreenClientWindowAdapter::~ScreenClientWindowAdapter() for (const auto &item : windowIdMap_) { auto window = item.second; if (window == nullptr) { - DHLOGE("window is nullptr(windowId = %d).", item.first); + DHLOGE("window is nullptr(windowId = " PRId32 ").", item.first); return; } if (OHOS::Rosen::WMError::WM_OK != window->Destroy()) { - DHLOGE("screenclientSurface is nullptr(windowId = %d).", item.first); + DHLOGE("screenclientSurface is nullptr(windowId = " PRId32 ").", item.first); return; } } @@ -96,7 +98,7 @@ sptr ScreenClientWindowAdapter::CreateWindow(std::shared_ptr dataLock(windowIdMapMutex_); windowIdMap_.emplace(windowId, window); } - DHLOGD("Get surface(windowId = %d) success.", windowId); + DHLOGD("Get surface(windowId = " PRId32 ") success.", windowId); return surface; } @@ -120,7 +122,7 @@ int32_t ScreenClientWindowAdapter::ShowWindow(int32_t windowId) DHLOGE("Show window failed."); return ERR_DH_SCREEN_SCREENCLIENT_SHOW_WINDOW_ERROR; } - DHLOGD("Show window (windowId = %d) success.", windowId); + DHLOGD("Show window (windowId = " PRId32 ") success.", windowId); return DH_SUCCESS; } @@ -144,7 +146,7 @@ int32_t ScreenClientWindowAdapter::HideWindow(int32_t windowId) DHLOGE("Hide window failed."); return ERR_DH_SCREEN_SCREENCLIENT_HIDE_WINDOW_ERROR; } - DHLOGD("Hide window (windowId = %d) success.", windowId); + DHLOGD("Hide window (windowId = " PRId32 ") success.", windowId); return DH_SUCCESS; } @@ -155,20 +157,20 @@ int32_t ScreenClientWindowAdapter::MoveWindow(int32_t windowId, int32_t startX, std::lock_guard dataLock(windowIdMapMutex_); auto iter = windowIdMap_.find(windowId); if (iter == windowIdMap_.end()) { - DHLOGE("Invalid windowId (windowId = %d).", windowId); + DHLOGE("Invalid windowId (windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR; } window = iter->second; } if (window == nullptr) { - DHLOGE("Current window is null(windowId = %d).", windowId); + DHLOGE("Current window is null(windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR; } if (OHOS::Rosen::WMError::WM_OK != window->MoveTo(startX, startY)) { - DHLOGE("Move window failed (windowId = %d).", windowId); + DHLOGE("Move window failed (windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_MOVE_WINDOW_ERROR; } - DHLOGD("MoveTo window (windowId = %d) success.", windowId); + DHLOGD("MoveTo window (windowId = " PRId32 ") success.", windowId); return DH_SUCCESS; } @@ -179,25 +181,25 @@ int32_t ScreenClientWindowAdapter::RemoveWindow(int32_t windowId) std::lock_guard dataLock(windowIdMapMutex_); auto iter = windowIdMap_.find(windowId); if (iter == windowIdMap_.end()) { - DHLOGE("Invalid windowId(windowId = %d).", windowId); + DHLOGE("Invalid windowId(windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR; } window = iter->second; windowIdMap_.erase(windowId); } if (window == nullptr) { - DHLOGE("Current window is null(windowId = %d).", windowId); + DHLOGE("Current window is null(windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR; } if (OHOS::Rosen::WMError::WM_OK != window->Hide()) { - DHLOGE("Remove window window failed(windowId = %d).", windowId); + DHLOGE("Remove window window failed(windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR; } if (OHOS::Rosen::WMError::WM_OK != window->Destroy()) { - DHLOGE("Remove window window failed(windowId = %d).", windowId); + DHLOGE("Remove window window failed(windowId = " PRId32 ").", windowId); return ERR_DH_SCREEN_SCREENCLIENT_REMOVE_WINDOW_ERROR; } - DHLOGD("Remove window success(windowId = %d).", windowId); + DHLOGD("Remove window success(windowId = " PRId32 ").", windowId); return DH_SUCCESS; } diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp index bb888f81..16b4d626 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp @@ -15,6 +15,8 @@ #include "dscreen_sink_service.h" +#include + #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" @@ -97,7 +99,7 @@ int32_t DScreenSinkService::UnsubscribeLocalHardware(const std::string &dhId) void DScreenSinkService::DScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent) { - DHLOGI("DScreenNotify, devId:%s, eventCode: %d, eventContent:%s", GetAnonyString(devId).c_str(), + DHLOGI("DScreenNotify, devId:%s, eventCode: " PRId32 ", eventContent:%s", GetAnonyString(devId).c_str(), eventCode, eventContent.c_str()); ScreenRegionManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent); } diff --git a/services/screenservice/sourceservice/dscreenmgr/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/include/dscreen.h index 3729dd6f..90a394bf 100644 --- a/services/screenservice/sourceservice/dscreenmgr/include/dscreen.h +++ b/services/screenservice/sourceservice/dscreenmgr/include/dscreen.h @@ -33,9 +33,9 @@ class IDScreenCallback { public: virtual ~IDScreenCallback() {}; virtual void OnRegResult(const std::shared_ptr &dScreen, - const std::string &reqId, int32_t status, const std::string &data) = 0; + const std::string &reqId, const int32_t status, const std::string &data) = 0; virtual void OnUnregResult(const std::shared_ptr &dScreen, - const std::string &reqId, int32_t status, const std::string &data) = 0; + const std::string &reqId, const int32_t status, const std::string &data) = 0; }; class ScreenSourceTransCallback : public IScreenSourceTransCallback { diff --git a/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h b/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h index 0e58de3c..df558954 100644 --- a/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h +++ b/services/screenservice/sourceservice/dscreenmgr/include/dscreen_manager.h @@ -32,9 +32,9 @@ namespace DistributedHardware { class DScreenCallback : public IDScreenCallback { public: void OnRegResult(const std::shared_ptr &dScreen, const std::string &reqId, - int32_t status, const std::string &data) override; + const int32_t status, const std::string &data) override; void OnUnregResult(const std::shared_ptr &dScreen, const std::string &reqId, - int32_t status, const std::string &data) override; + const int32_t status, const std::string &data) override; }; class DScreenGroupListener : public Rosen::ScreenManager::IScreenGroupListener { @@ -46,9 +46,9 @@ class DScreenManager { DECLARE_SINGLE_INSTANCE_BASE(DScreenManager); public: void OnRegResult(const std::shared_ptr &dScreen, const std::string &reqId, - int32_t status, const std::string &data); + const int32_t status, const std::string &data); void OnUnregResult(const std::shared_ptr &dScreen, const std::string &reqId, - int32_t status, const std::string &data); + const int32_t status, const std::string &data); int32_t Init(); int32_t UnInit(); @@ -59,8 +59,8 @@ public: void RegisterDScreenCallback(const sptr &callback); void HandleScreenChange(const std::shared_ptr &changedScreen, Rosen::ScreenGroupChangeEvent event); std::shared_ptr FindDScreenByScreenId(uint64_t screenId); - void AddToGroup(const std::shared_ptr &changedScreen, uint64_t screenId); - void RemoveFromGroup(const std::shared_ptr &changedScreen, uint64_t screenId); + int32_t AddToGroup(const std::shared_ptr &changedScreen, uint64_t screenId); + int32_t RemoveFromGroup(const std::shared_ptr &changedScreen, uint64_t screenId); void GetScreenDumpInfo(std::string &result); void PublishMessage(const DHTopic topic, const std::shared_ptr &dScreen); private: diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp index e5dfbe52..694bc480 100644 --- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp +++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp @@ -16,6 +16,7 @@ #include "dscreen_manager.h" #include +#include #include "if_system_ability_manager.h" #include "iservice_registry.h" @@ -81,7 +82,7 @@ int32_t DScreenManager::UnInit() } if (ret != DH_SUCCESS) { - DHLOGE("DScreenManager UnInit failed, err: %d", ret); + DHLOGE("DScreenManager UnInit failed, err: " PRId32, ret); } dScreenCallback_ = nullptr; @@ -101,12 +102,11 @@ int32_t DScreenManager::UnInit() void DScreenGroupListener::OnChange(const std::vector &screenIds, Rosen::ScreenGroupChangeEvent event) { - DHLOGI("On Screen change, screenIds size: %d", screenIds.size()); + DHLOGI("On Screen change, screenIds size: " PRId32, screenIds.size()); for (uint64_t screenId : screenIds) { - std::shared_ptr changedScreen = nullptr; - changedScreen = DScreenManager::GetInstance().FindDScreenByScreenId(screenId); + std::shared_ptr changedScreen = DScreenManager::GetInstance().FindDScreenByScreenId(screenId); if (changedScreen == nullptr) { - DHLOGD("screen change not about remote screen, screenId: %ulld", screenId); + DHLOGD("screen change not about remote screen, screenId: " PRId64, screenId); continue; } DScreenManager::GetInstance().HandleScreenChange(changedScreen, event); @@ -122,13 +122,18 @@ void DScreenManager::HandleScreenChange(const std::shared_ptr &changedS } uint64_t screenId = changedScreen->GetScreenId(); - DHLOGI("DScreenManager::HandleScreenChange, screenId: %ulld, changeEvent: %", screenId, event); + DHLOGI("DScreenManager::HandleScreenChange, screenId: " PRId64, screenId); if (event == Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP) { - AddToGroup(changedScreen, screenId); + if (DH_SUCCESS != AddToGroup(changedScreen, screenId)) { + DHLOGE("AddToGroup failed."); + return; + } NotifyRemoteSinkSetUp(changedScreen); PublishMessage(DHTopic::TOPIC_START_DSCREEN, changedScreen); } else if (event == Rosen::ScreenGroupChangeEvent::REMOVE_FROM_GROUP) { - RemoveFromGroup(changedScreen, screenId); + if (DH_SUCCESS != RemoveFromGroup(changedScreen, screenId)) { + DHLOGE("RemoveFromGroup failed."); + } PublishMessage(DHTopic::TOPIC_STOP_DSCREEN, changedScreen); } else if (event == Rosen::ScreenGroupChangeEvent::CHANGE_GROUP) { DHLOGE("CHANGE_GROUP not implement."); @@ -137,22 +142,22 @@ void DScreenManager::HandleScreenChange(const std::shared_ptr &changedS } } -void DScreenManager::AddToGroup(const std::shared_ptr &changedScreen, uint64_t screenId) +int32_t DScreenManager::AddToGroup(const std::shared_ptr &changedScreen, uint64_t screenId) { - DHLOGI("DScreenManager::ADDToGroup, screenId: %ulld", screenId); + DHLOGI("DScreenManager::ADDToGroup, screenId: " PRId64, screenId); if (changedScreen == nullptr) { DHLOGE("DScreenManager::ADDToGroup, dScreen is null."); - return; + return ERR_DH_SCREEN_SA_VALUE_NOT_INIT; } if (changedScreen->GetState() == CONNECTING) { DHLOGD("screen is connecting, no need handle change"); - return; + return DH_SUCCESS; } std::shared_ptr mapRelation = ScreenMgrAdapter::GetInstance().GetMapRelation(screenId); if (mapRelation == nullptr) { - DHLOGE("mapRelation construct failed. screenId: %ulld", screenId); - return; + DHLOGE("mapRelation construct failed. screenId: " PRId64, screenId); + return ERR_DH_SCREEN_SA_VALUE_NOT_INIT; } std::shared_ptr videoParam = changedScreen->GetVideoParam(); @@ -165,35 +170,32 @@ void DScreenManager::AddToGroup(const std::shared_ptr &changedScreen, u std::lock_guard lock(dScreenMapRelationMtx_); mapRelations_[screenId] = mapRelation; } + return DH_SUCCESS; } -void DScreenManager::RemoveFromGroup(const std::shared_ptr &changedScreen, uint64_t screenId) +int32_t DScreenManager::RemoveFromGroup(const std::shared_ptr &changedScreen, uint64_t screenId) { - DHLOGI("DScreenManager::RemoveFromGroup, screenId: %ulld", screenId); + DHLOGI("DScreenManager::RemoveFromGroup, screenId: " PRId64, screenId); if (changedScreen == nullptr) { DHLOGE("DScreenManager::RemoveFromGroup, dScreen is null."); - return; + return ERR_DH_SCREEN_SA_VALUE_NOT_INIT; } if (changedScreen->GetState() == DISCONNECTING) { DHLOGD("screen is disconnecting, no need handle change"); - return; + return DH_SUCCESS; } std::shared_ptr mapRelation = nullptr; { std::lock_guard lock(dScreenMapRelationMtx_); - if (mapRelations_.count(screenId) == 0) { - DHLOGE("destroyed relation not found."); - return; - } - mapRelation = mapRelations_[screenId]; mapRelations_.erase(screenId); } changedScreen->AddTask(std::make_shared(TaskType::TASK_DISCONNECT, "")); + return DH_SUCCESS; } void DScreenCallback::OnRegResult(const std::shared_ptr &dScreen, - const std::string &reqId, int32_t status, const std::string &data) + const std::string &reqId, const int32_t status, const std::string &data) { DHLOGI("DScreenCallback::OnRegResult, devId: %s, dhId: %s, reqId: %s", GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); @@ -201,7 +203,7 @@ void DScreenCallback::OnRegResult(const std::shared_ptr &dScreen, } void DScreenCallback::OnUnregResult(const std::shared_ptr &dScreen, - const std::string &reqId, int32_t status, const std::string &data) + const std::string &reqId, const int32_t status, const std::string &data) { DHLOGI("DScreenCallback::OnUnregResult, devId: %s, dhId: %s, reqId: %s", GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); @@ -209,7 +211,7 @@ void DScreenCallback::OnUnregResult(const std::shared_ptr &dScreen, } void DScreenManager::OnRegResult(const std::shared_ptr &dScreen, - const std::string &reqId, int32_t status, const std::string &data) + const std::string &reqId, const int32_t status, const std::string &data) { DHLOGI("DScreenManager::OnRegResult, devId: %s, dhId: %s, reqId: %s", GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); @@ -221,7 +223,7 @@ void DScreenManager::OnRegResult(const std::shared_ptr &dScreen, } void DScreenManager::OnUnregResult(const std::shared_ptr &dScreen, - const std::string &reqId, int32_t status, const std::string &data) + const std::string &reqId, const int32_t status, const std::string &data) { DHLOGI("DScreenManager::OnUnregResult, devId: %s, dhId: %s, reqId: %s", GetAnonyString(dScreen->GetDevId()).c_str(), GetAnonyString(dScreen->GetDHId()).c_str(), reqId.c_str()); @@ -243,19 +245,15 @@ int32_t DScreenManager::EnableDistributedScreen(const std::string &devId, const } std::string dScreenIdx = devId + SEPERATOR + dhId; - std::shared_ptr dScreen = nullptr; std::lock_guard lock(dScreenMapMtx_); - if (dScreens_.count(dScreenIdx) != 0) { - dScreen = dScreens_[dScreenIdx]; - } - + std::shared_ptr dScreen = dScreens_[dScreenIdx]; if (dScreen == nullptr) { dScreen = std::make_shared(devId, dhId, dScreenCallback_); } int32_t dScreenState = dScreen->GetState(); - if (dScreenState != DISABLED && dScreenState != DISABLING) { - DHLOGE("dScreen state is invalid."); + if (dScreenState == ENABLED || dScreenState == ENABLING) { + DHLOGE("dScreen state is ENABLED or ENABLING."); return ERR_DH_SCREEN_SA_ENABLE_FAILED; } @@ -318,7 +316,7 @@ void DScreenManager::RegisterDScreenCallback(const sptr std::shared_ptr DScreenManager::FindDScreenByScreenId(uint64_t screenId) { - DHLOGD("FindDScreenByScreenId, screenId: %ulld", screenId); + DHLOGD("FindDScreenByScreenId, screenId: " PRId64, screenId); std::lock_guard lock(dScreenMapMtx_); for (const auto &iter : dScreens_) { std::shared_ptr dScreen = iter.second; @@ -330,7 +328,7 @@ std::shared_ptr DScreenManager::FindDScreenByScreenId(uint64_t screenId return dScreen; } } - DHLOGD("DScreen not found, screenId: %ulld", screenId); + DHLOGD("DScreen not found, screenId: " PRId64, screenId); return nullptr; } @@ -377,19 +375,19 @@ void DScreenManager::GetScreenDumpInfo(std::string &result) void DScreenManager::HandleDScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent) { - DHLOGI("HandleDScreenNotify, devId: %s, eventCode: %d", GetAnonyString(devId).c_str(), eventCode); + DHLOGI("HandleDScreenNotify, devId: %s, eventCode: " PRId32, GetAnonyString(devId).c_str(), eventCode); if (eventCode == NOTIFY_SOURCE_SETUP_RESULT) { HandleNotifySetUpResult(devId, eventContent); return; } - DHLOGE("invalid eventCode, eventCode: %d", eventCode); + DHLOGE("invalid eventCode, eventCode: " PRId32, eventCode); } int32_t DScreenManager::NotifyRemoteScreenService(const std::string &devId, int32_t eventCode, const std::string &eventContent) { - DHLOGI("Notify remote sink screen service, remote devId: %s, eventCode: %d", + DHLOGI("Notify remote sink screen service, remote devId: %s, eventCode: " PRId32, GetAnonyString(devId).c_str(), eventCode); sptr remoteSinkSA = GetDScreenSinkSA(devId); if (!remoteSinkSA) { @@ -469,14 +467,14 @@ void DScreenManager::NotifyRemoteSinkSetUp(const std::shared_ptr &dScre eventContentJson[KEY_SCREEN_ID] = dScreen->GetScreenId(); eventContentJson[KEY_DH_ID] = dScreen->GetDHId(); if (dScreen->GetVideoParam() == nullptr) { - DHLOGE("videoParam is null, back to enabled state screedId: %ulld", dScreen->GetScreenId()); + DHLOGE("videoParam is null, back to enabled state screedId: " PRId64, dScreen->GetScreenId()); dScreen->SetState(ENABLED); return; } eventContentJson[KEY_VIDEO_PARAM] = *(dScreen->GetVideoParam()); if (mapRelations_.count(dScreen->GetScreenId()) == 0) { - DHLOGE("mapRelation not found, back to enabled state screedId: %ulld", dScreen->GetScreenId()); + DHLOGE("mapRelation not found, back to enabled state screedId: " PRId64, dScreen->GetScreenId()); dScreen->SetState(ENABLED); return; } @@ -516,7 +514,7 @@ void DScreenManager::HandleNotifySetUpResult(const std::string &remoteDevId, con } if (errCode != DH_SUCCESS) { - DHLOGE("remote sink set up failed, errCode: %d, reason: %s", errCode, errContent.c_str()); + DHLOGE("remote sink set up failed, errCode: " PRId32 ", reason: %s", errCode, errContent.c_str()); dScreens_[dScreenIdx]->SetState(ENABLED); return; } diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp index 54613670..8374431e 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp @@ -15,6 +15,8 @@ #include "dscreen_source_service.h" +#include + #include "if_system_ability_manager.h" #include "ipc_skeleton.h" #include "ipc_types.h" @@ -54,7 +56,7 @@ void DScreenSourceService::OnStop() DHLOGI("dscreen source service stop."); int32_t ret = DScreenManager::GetInstance().UnInit(); if (ret != DH_SUCCESS) { - DHLOGE("UnInit DScreenManager failed. err: %d", ret); + DHLOGE("UnInit DScreenManager failed. err: " PRId32, ret); } registerToService_ = false; } @@ -77,9 +79,10 @@ bool DScreenSourceService::Init() int32_t DScreenSourceService::InitSource(const std::string ¶ms, const sptr &callback) { DHLOGI("InitSource"); + (void)params; int32_t ret = DScreenManager::GetInstance().Init(); if (ret != DH_SUCCESS) { - DHLOGE("Init DScreenManager failed. err: %d", ret); + DHLOGE("Init DScreenManager failed. err: " PRId32, ret); return ret; } @@ -92,7 +95,7 @@ int32_t DScreenSourceService::ReleaseSource() DHLOGI("ReleaseSource"); int32_t ret = DScreenManager::GetInstance().UnInit(); if (ret != DH_SUCCESS) { - DHLOGE("UnInit DScreenManager failed. err: %d", ret); + DHLOGE("UnInit DScreenManager failed. err: " PRId32, ret); return ret; } DHLOGI("exit source sa process"); @@ -137,14 +140,17 @@ int32_t DScreenSourceService::UnregisterDistributedHardware(const std::string &d int32_t DScreenSourceService::ConfigDistributedHardware(const std::string &devId, const std::string &dhId, const std::string &key, const std::string &value) { - DHLOGI("ConfigDistributedHardware"); + (void)devId; + (void)dhId; + (void)key; + (void)value; return DH_SUCCESS; } void DScreenSourceService::DScreenNotify(const std::string &devId, const int32_t eventCode, const std::string &eventContent) { - DHLOGI("DScreenNotify, devId: %s, eventCode: %d", GetAnonyString(devId).c_str(), eventCode); + DHLOGI("DScreenNotify, devId: %s, eventCode: " PRId32, GetAnonyString(devId).c_str(), eventCode); DScreenManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent); } diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp index bb03193c..e967201f 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp @@ -26,7 +26,6 @@ namespace OHOS { namespace DistributedHardware { DScreenSourceStub::DScreenSourceStub() { - DHLOGI("DScreenSourceStub construct."); memberFuncMap_[INIT_SOURCE] = &DScreenSourceStub::InitSourceInner; memberFuncMap_[RELEASE_SOURCE] = &DScreenSourceStub::ReleaseSourceInner; memberFuncMap_[REGISTER_DISTRIBUTED_HARDWARE] = &DScreenSourceStub::RegisterDistributedHardwareInner; @@ -43,7 +42,6 @@ DScreenSourceStub::~DScreenSourceStub() int32_t DScreenSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("OnRemoteRequest, code: %d", code); std::u16string desc = DScreenSourceStub::GetDescriptor(); std::u16string remoteDesc = data.ReadInterfaceToken(); if (desc != remoteDesc) { @@ -63,7 +61,6 @@ int32_t DScreenSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, M int32_t DScreenSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("InitSourceInner"); std::string param = data.ReadString(); sptr remoteObject = data.ReadRemoteObject(); if (remoteObject == nullptr) { @@ -80,7 +77,6 @@ int32_t DScreenSourceStub::InitSourceInner(MessageParcel &data, MessageParcel &r int32_t DScreenSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("ReleaseSourceInner"); int32_t ret = ReleaseSource(); reply.WriteInt32(ret); return DH_SUCCESS; @@ -89,7 +85,6 @@ int32_t DScreenSourceStub::ReleaseSourceInner(MessageParcel &data, MessageParcel int32_t DScreenSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("RegisterDistributedHardwareInner"); std::string devId = data.ReadString(); std::string dhId = data.ReadString(); std::string version = data.ReadString(); @@ -107,7 +102,6 @@ int32_t DScreenSourceStub::RegisterDistributedHardwareInner(MessageParcel &data, int32_t DScreenSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("UnregisterDistributedHardwareInner"); std::string devId = data.ReadString(); std::string dhId = data.ReadString(); std::string reqId = data.ReadString(); @@ -120,7 +114,6 @@ int32_t DScreenSourceStub::UnregisterDistributedHardwareInner(MessageParcel &dat int32_t DScreenSourceStub::ConfigDistributedHardwareInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("ConfigDistributedHardwareInner"); std::string devId = data.ReadString(); std::string dhId = data.ReadString(); std::string key = data.ReadString(); @@ -134,7 +127,6 @@ int32_t DScreenSourceStub::ConfigDistributedHardwareInner(MessageParcel &data, M int32_t DScreenSourceStub::DScreenNotifyInner(MessageParcel &data, MessageParcel &reply, MessageOption &option) { - DHLOGI("DScreenNotifyInner"); std::string devId = data.ReadString(); int32_t eventCode = data.ReadInt32(); std::string eventContent = data.ReadString(); -- Gitee