diff --git a/common/include/dscreen_errcode.h b/common/include/dscreen_errcode.h
index 6b11c11ecf2178c11542415596dd80e02b762477..0806f91e2d4b1fdd6c5389ca1be6e24e69c860f4 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 aafa6827e935eb68b0bc08ab4c3865f3346871eb..b94575d501775adc553bd35346085ccda3150cb1 100644
--- a/common/src/dscreen_hisysevent.cpp
+++ b/common/src/dscreen_hisysevent.cpp
@@ -15,6 +15,8 @@
 
 #include "dscreen_hisysevent.h"
 
+#include <cinttypes>
+
 #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 5272ed9944892269ca290a2a16b8d1c1b31a6883..df341d667825433cc24a3704d50dbbac9e219de0 100644
--- a/common/src/dscreen_sa_process_state.cpp
+++ b/common/src/dscreen_sa_process_state.cpp
@@ -18,6 +18,7 @@
 #include <cstdint>
 #include <cstdlib>
 #include <mutex>
+#include <cinttypes>
 
 #include "dscreen_constants.h"
 #include "dscreen_hisysevent.h"
@@ -38,7 +39,7 @@ void SetSinkProcessExit()
     DHLOGI("set sink process exit.");
     std::lock_guard<std::mutex> 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<std::mutex> 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 21703d556244bcac55f3d8ab03e4c6c0d05316f8..6863c2f14b8f9d9532ba8e15cceba453cc6dd11b 100644
--- a/common/src/dscreen_util.cpp
+++ b/common/src/dscreen_util.cpp
@@ -17,6 +17,7 @@
 
 #include <algorithm>
 #include <cstddef>
+#include <cinttypes>
 #include <iomanip>
 #include <random>
 #include <sstream>
@@ -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/callback/dscreen_sink_load_callback.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp
index 37e7be1c90f7d6f1bb21a534b49331e02371d323..ac69e7aace3ca791722313eab7c44e9296aa38ee 100644
--- a/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp
+++ b/interfaces/innerkits/native_cpp/screen_sink/src/callback/dscreen_sink_load_callback.cpp
@@ -15,6 +15,8 @@
 
 #include "dscreen_sink_load_callback.h"
 
+#include <cinttypes>
+
 #include "dscreen_constants.h"
 #include "dscreen_errcode.h"
 #include "dscreen_hisysevent.h"
@@ -30,7 +32,7 @@ DScreenSinkLoadCallback::DScreenSinkLoadCallback(
 void DScreenSinkLoadCallback::OnLoadSystemAbilitySuccess(
     int32_t systemAbilityId, const sptr<IRemoteObject> &remoteObject)
 {
-    DHLOGI("load screen SA success, systemAbilityId:%d, remoteObject result:%s",
+    DHLOGI("load screen SA success, systemAbilityId: " PRId32 ", remoteObject result:%s",
         systemAbilityId, (remoteObject != nullptr) ? "true" : "false");
     if (systemAbilityId != DISTRIBUTED_HARDWARE_SCREEN_SINK_SA_ID) {
         DHLOGE("start systemabilityId is not sinkSAId!");
@@ -46,7 +48,7 @@ void DScreenSinkLoadCallback::OnLoadSystemAbilitySuccess(
 
 void DScreenSinkLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId)
 {
-    DHLOGE("load screen SA failed, systemAbilityId: %d", systemAbilityId);
+    DHLOGE("load screen SA failed, systemAbilityId: " PRId32, systemAbilityId);
     ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_SINKPROXY_NOT_INIT, systemAbilityId,
         "dscreen sink OnLoadSystemAbilityFail.");
 }
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 e503e1f7bb6d98700e6f188c720aa8fa2521600d..9089f115127ab2a02e7b22db0737eb2d9b08f60d 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 <chrono>
+#include <cinttypes>
 #include <new>
 
 #include "errors.h"
@@ -73,7 +74,7 @@ int32_t DScreenSinkHandler::InitSink(const std::string &params)
         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 &params)
 void DScreenSinkHandler::FinishStartSA(const std::string &params, const sptr<IRemoteObject> &remoteObject)
 {
     DHLOGI("DScreenSinkHandler FinishStartSA");
-    std::unique_lock<std::mutex> lock(proxyMutex_);
+    std::lock_guard<std::mutex> 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 &params, const sptr<IRe
     }
     remoteObject->AddDeathRecipient(sinkSvrRecipient_);
     dScreenSinkProxy_ = iface_cast<IDScreenSink>(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<IRemoteObject> &remote)
@@ -172,10 +173,18 @@ void DScreenSinkHandler::OnRemoteSinkSvrDied(const wptr<IRemoteObject> &remote)
         return;
     }
     std::lock_guard<std::mutex> 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_sink/src/dscreen_sink_proxy.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp
index 92c5688cf34d219755ad1394ba92eeff9ecf5330..1da1aeba8997fd2abd5ce34980746f0318ba0067 100644
--- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp
+++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp
@@ -27,7 +27,6 @@ namespace OHOS {
 namespace DistributedHardware {
 int32_t DScreenSinkProxy::InitSink(const std::string &params)
 {
-    DHLOGI("DScreenSinkProxy InitSink");
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSinkProxy remote service null");
@@ -53,7 +52,6 @@ int32_t DScreenSinkProxy::InitSink(const std::string &params)
 
 int32_t DScreenSinkProxy::ReleaseSink()
 {
-    DHLOGI("DScreenSinkProxy ReleaseSink");
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSinkProxy remote service null");
@@ -74,7 +72,6 @@ int32_t DScreenSinkProxy::ReleaseSink()
 
 int32_t DScreenSinkProxy::SubscribeLocalHardware(const std::string &dhId, const std::string &param)
 {
-    DHLOGI("DScreenSinkProxy SubscribeLocalHardware dhId: %s", GetAnonyString(dhId).c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSinkProxy remote service null");
@@ -100,7 +97,6 @@ int32_t DScreenSinkProxy::SubscribeLocalHardware(const std::string &dhId, const
 
 int32_t DScreenSinkProxy::UnsubscribeLocalHardware(const std::string &dhId)
 {
-    DHLOGI("DScreenSinkProxy UnsubscribeLocalHardware dhId: %s", GetAnonyString(dhId).c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSinkProxy remote service null");
@@ -126,8 +122,6 @@ int32_t DScreenSinkProxy::UnsubscribeLocalHardware(const std::string &dhId)
 
 void DScreenSinkProxy::DScreenNotify(const std::string &devId, int32_t eventCode, const std::string &eventContent)
 {
-    DHLOGI("DScreenNotify devId: %s eventCode: %d eventContent: %s",
-        GetAnonyString(devId).c_str(), eventCode, eventContent.c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSinkProxy remote service null");
diff --git a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h
index bcb400340e998329dc5bb003e95b204c1632bb05..6f13791a8b105a12878e593eb493f83d0e284547 100644
--- a/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h
+++ b/interfaces/innerkits/native_cpp/screen_source/include/dscreen_source_handler.h
@@ -51,7 +51,7 @@ private:
     };
 
     DScreenSourceHandler();
-    ~DScreenSourceHandler();
+    ~DScreenSourceHandler() = default;
 
     std::mutex proxyMutex_;
     std::condition_variable proxyConVar_;
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 e22ba562089bfa45a77e688d82bef203b32d68b3..cf1dc8d0311d86b1f1907b1e846c1259fc4410c5 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 <cinttypes>
+
 #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/callback/dscreen_source_load_callback.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp
index 1e0943a5df16e2b61980eef10e797fdfa28ed71f..94d6c8525121776c198ec901a6e6305e2168f79a 100644
--- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp
+++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_load_callback.cpp
@@ -14,6 +14,8 @@
  */
 #include "dscreen_source_load_callback.h"
 
+#include <cinttypes>
+
 #include "dscreen_constants.h"
 #include "dscreen_errcode.h"
 #include "dscreen_hisysevent.h"
@@ -29,7 +31,7 @@ DScreenSourceLoadCallback::DScreenSourceLoadCallback(
 void DScreenSourceLoadCallback::OnLoadSystemAbilitySuccess(
     int32_t systemAbilityId, const sptr<IRemoteObject> &remoteObject)
 {
-    DHLOGI("load screen SA success, systemAbilityId:%d, remoteObject result:%s",
+    DHLOGI("load screen SA success, systemAbilityId: " PRId32 ", remoteObject result:%s",
         systemAbilityId, (remoteObject != nullptr) ? "true" : "false");
     if (systemAbilityId != DISTRIBUTED_HARDWARE_SCREEN_SOURCE_SA_ID) {
         DHLOGE("start systemabilityId is not sourceSAId!");
@@ -44,7 +46,7 @@ void DScreenSourceLoadCallback::OnLoadSystemAbilitySuccess(
 
 void DScreenSourceLoadCallback::OnLoadSystemAbilityFail(int32_t systemAbilityId)
 {
-    DHLOGE("load screen SA failed, systemAbilityId:%d", systemAbilityId);
+    DHLOGE("load screen SA failed, systemAbilityId: " PRId32, systemAbilityId);
     ReportSaFail(DSCREEN_INIT_FAIL, ERR_DH_SCREEN_SA_SOURCEPROXY_NOT_INIT, systemAbilityId,
         "dscreen source OnLoadSystemAbilityFail.");
 }
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 beff2a16cdadc7ee8fd84731ade0eaea07f8ec93..63df27f2c3f45d7d353c29afa1a184db666623cf 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 <chrono>
 #include <new>
+#include <cinttypes>
 #include <string>
 
 #include "errors.h"
@@ -52,11 +53,6 @@ DScreenSourceHandler::DScreenSourceHandler()
     }
 }
 
-DScreenSourceHandler::~DScreenSourceHandler()
-{
-    DHLOGI("~DScreenSourceHandler.");
-}
-
 int32_t DScreenSourceHandler::InitSource(const std::string &params)
 {
     DHLOGI("DScreenSourceHandler InitSource");
@@ -73,7 +69,7 @@ int32_t DScreenSourceHandler::InitSource(const std::string &params)
         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 +93,7 @@ int32_t DScreenSourceHandler::InitSource(const std::string &params)
 void DScreenSourceHandler::FinishStartSA(const std::string &params, const sptr<IRemoteObject> &remoteObject)
 {
     DHLOGI("DScreenSourceHandler FinishStartSA");
-    std::unique_lock<std::mutex> lock(proxyMutex_);
+    std::lock_guard<std::mutex> 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 +102,7 @@ void DScreenSourceHandler::FinishStartSA(const std::string &params, const sptr<I
     }
     remoteObject->AddDeathRecipient(sourceSvrRecipient_);
     dScreenSourceProxy_ = iface_cast<IDScreenSource>(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.");
@@ -141,12 +137,16 @@ int32_t DScreenSourceHandler::ReleaseSource()
 int32_t DScreenSourceHandler::RegisterDistributedHardware(const std::string &devId,
     const std::string &dhId, const EnableParam &param, std::shared_ptr<RegisterCallback> callback)
 {
-    DHLOGI("RegisterDistributedHardware, devId: %s, dhId: %s", GetAnonyString(devId).c_str(),
-        GetAnonyString(dhId).c_str());
+    if (devId.empty() || dhId.empty()) {
+        DHLOGE("device id or dh id empty.");
+        return ERR_DH_SCREEN_STRING_PARAM_EMPTY;
+    }
     if (callback == nullptr) {
         DHLOGE("callback is nullptr.");
         return ERR_DH_SCREEN_REGISTER_CALLBACK_NOT_INIT;
     }
+    DHLOGI("RegisterDistributedHardware, devId: %s, dhId: %s", GetAnonyString(devId).c_str(),
+        GetAnonyString(dhId).c_str());
     std::lock_guard<std::mutex> lock(proxyMutex_);
     if (dScreenSourceProxy_ == nullptr) {
         DHLOGE("screen source proxy not init.");
@@ -166,12 +166,16 @@ int32_t DScreenSourceHandler::RegisterDistributedHardware(const std::string &dev
 int32_t DScreenSourceHandler::UnregisterDistributedHardware(const std::string &devId,
     const std::string &dhId, std::shared_ptr<UnregisterCallback> callback)
 {
-    DHLOGI("UnregisterDistributedHardware, devId: %s, dhId: %s", GetAnonyString(devId).c_str(),
-        GetAnonyString(dhId).c_str());
+    if (devId.empty() || dhId.empty()) {
+        DHLOGE("device id or dh id empty.");
+        return ERR_DH_SCREEN_STRING_PARAM_EMPTY;
+    }
     if (callback == nullptr) {
         DHLOGE("callback is nullptr.");
         return ERR_DH_SCREEN_REGISTER_CALLBACK_NOT_INIT;
     }
+    DHLOGI("UnregisterDistributedHardware, devId: %s, dhId: %s", GetAnonyString(devId).c_str(),
+        GetAnonyString(dhId).c_str());
     std::lock_guard<std::mutex> lock(proxyMutex_);
     if (dScreenSourceProxy_ == nullptr) {
         DHLOGE("screen source proxy not init.");
@@ -210,10 +214,18 @@ void DScreenSourceHandler::OnRemoteSourceSvrDied(const wptr<IRemoteObject> &remo
         return;
     }
     std::lock_guard<std::mutex> 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/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp
index e0b1dc7e4c94d4c3fb6cdc7a45e59ba22da44e19..37fc7138256331fbbf25caf752e78801c38715ce 100644
--- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp
+++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp
@@ -28,7 +28,6 @@ namespace OHOS {
 namespace DistributedHardware {
 int32_t DScreenSourceProxy::InitSource(const std::string &params, const sptr<IDScreenSourceCallback> &callback)
 {
-    DHLOGI("DScreenSourceProxy InitSource");
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSourceProxy remote service null");
@@ -55,7 +54,6 @@ int32_t DScreenSourceProxy::InitSource(const std::string &params, const sptr<IDS
 
 int32_t DScreenSourceProxy::ReleaseSource()
 {
-    DHLOGI("DScreenSourceProxy ReleaseSource");
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSourceProxy remote service null");
@@ -77,8 +75,6 @@ int32_t DScreenSourceProxy::ReleaseSource()
 int32_t DScreenSourceProxy::RegisterDistributedHardware(const std::string &devId,
     const std::string &dhId, const EnableParam &param, const std::string &reqId)
 {
-    DHLOGI("DScreenSourceProxy RegisterDistributedHardware devId: %s dhId: %s",
-        GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSourceProxy remote service null");
@@ -106,8 +102,6 @@ int32_t DScreenSourceProxy::RegisterDistributedHardware(const std::string &devId
 int32_t DScreenSourceProxy::UnregisterDistributedHardware(const std::string &devId,
     const std::string &dhId, const std::string &reqId)
 {
-    DHLOGI("DScreenSourceProxy UnregisterDistributedHardware devId: %s dhId: %s",
-        GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSourceProxy remote service null");
@@ -134,8 +128,6 @@ int32_t DScreenSourceProxy::UnregisterDistributedHardware(const std::string &dev
 int32_t DScreenSourceProxy::ConfigDistributedHardware(const std::string &devId,
     const std::string &dhId, const std::string &key, const std::string &value)
 {
-    DHLOGI("DScreenSourceProxy ConfigDistributedHardware devId: %s dhId: %s",
-        GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSourceProxy remote service null");
@@ -162,8 +154,6 @@ int32_t DScreenSourceProxy::ConfigDistributedHardware(const std::string &devId,
 void DScreenSourceProxy::DScreenNotify(const std::string &devId,
     int32_t eventCode, const std::string &eventContent)
 {
-    DHLOGI("DScreenNotify devId: %s eventCode: %d eventContent: %s",
-        GetAnonyString(devId).c_str(), eventCode, eventContent.c_str());
     sptr<IRemoteObject> remote = Remote();
     if (remote == nullptr) {
         DHLOGE("DScreenSourceProxy remote service null");
diff --git a/screenhandler/src/dscreen_handler.cpp b/screenhandler/src/dscreen_handler.cpp
index 435a4f53b4db833f0b31395749bfe01909899b1e..f6e3ddf81f9a483eaec5a9177012d6f88ac01e90 100644
--- a/screenhandler/src/dscreen_handler.cpp
+++ b/screenhandler/src/dscreen_handler.cpp
@@ -15,6 +15,8 @@
 
 #include "dscreen_handler.h"
 
+#include <cinttypes>
+
 #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<Rosen::Screen> 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<DHItem> DScreenHandler::Query()
     DHLOGI("DScreenHandler query hardware info");
     std::vector<DHItem> dhItemVec;
     std::vector<sptr<Rosen::Screen>> 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 a2b17115838b04f7a4a2c4ac913c1ef491bf35a8..c6f9cb0a98832e7373722799ed974937b5b2003a 100644
--- a/services/screenclient/src/screen_client.cpp
+++ b/services/screenclient/src/screen_client.cpp
@@ -15,6 +15,8 @@
 
 #include "screen_client.h"
 
+#include <cinttypes>
+
 #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> windowProperty)
         std::lock_guard<std::mutex> 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<std::mutex> 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<std::mutex> 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<std::mutex> 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<Surface> ScreenClient::GetSurface(int32_t windowId)
         std::lock_guard<std::mutex> 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<std::mutex> 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 8499d1977ed60123a754cbc48ebf79161b4a3481..8b152b90c72b5dc43b67da53ba529fc14cc8c779 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 <cinttypes>
+
 #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<Surface> ScreenClientWindowAdapter::CreateWindow(std::shared_ptr<WindowProp
         std::lock_guard<std::mutex> 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<std::mutex> 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<std::mutex> 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/include/dscreen_sink_stub.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_stub.h
index 68f8c47afb0b4a10fdb68a728ae278f28bbb4039..7f13411fbfe8335c07e71e09ba018ae4abee472e 100644
--- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_stub.h
+++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_stub.h
@@ -27,7 +27,7 @@ namespace DistributedHardware {
 class DScreenSinkStub : public IRemoteStub<IDScreenSink> {
 public:
     DScreenSinkStub();
-    virtual ~DScreenSinkStub();
+    virtual ~DScreenSinkStub() = default;
     virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
         MessageOption &option) override;
 private:
diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp
index bb888f813548c8e4f5fd888fac4cd0c29eae9a5b..16b4d626de2f74061fcf91c6d40c8f86dd52f9a2 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 <cinttypes>
+
 #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/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp
index 5ca32cd51d4113566e8d08bc6f7f539de478e048..e735fac05f0f561c486a93ee3599b9d9f84e2f72 100644
--- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp
+++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp
@@ -23,7 +23,6 @@ namespace OHOS {
 namespace DistributedHardware {
 DScreenSinkStub::DScreenSinkStub()
 {
-    DHLOGI("DScreenSinkStub construct.");
     memberFuncMap_[INIT_SINK] = &DScreenSinkStub::InitSinkInner;
     memberFuncMap_[RELEASE_SINK] = &DScreenSinkStub::ReleaseSinkInner;
     memberFuncMap_[SUBSCRIBE_DISTRIBUTED_HARDWARE] = &DScreenSinkStub::SubscribeDistributedHardwareInner;
@@ -31,15 +30,9 @@ DScreenSinkStub::DScreenSinkStub()
     memberFuncMap_[DSCREEN_NOTIFY] = &DScreenSinkStub::DScreenNotifyInner;
 }
 
-DScreenSinkStub::~DScreenSinkStub()
-{
-    DHLOGI("DScreenSinkStub deconstruct.");
-}
-
 int32_t DScreenSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("OnRemoteRequest, code: %d", code);
     std::u16string desc = DScreenSinkStub::GetDescriptor();
     std::u16string remoteDesc = data.ReadInterfaceToken();
     if (desc != remoteDesc) {
@@ -59,7 +52,6 @@ int32_t DScreenSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, Mes
 int32_t DScreenSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("InitSinkInner");
     std::string param = data.ReadString();
     int32_t ret = InitSink(param);
     reply.WriteInt32(ret);
@@ -69,7 +61,6 @@ int32_t DScreenSinkStub::InitSinkInner(MessageParcel &data, MessageParcel &reply
 int32_t DScreenSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("ReleaseSinkInner");
     int32_t ret = ReleaseSink();
     reply.WriteInt32(ret);
     return DH_SUCCESS;
@@ -78,7 +69,6 @@ int32_t DScreenSinkStub::ReleaseSinkInner(MessageParcel &data, MessageParcel &re
 int32_t DScreenSinkStub::SubscribeDistributedHardwareInner(MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("SubscribeDistributedHardwareInner");
     std::string dhId = data.ReadString();
     std::string param = data.ReadString();
     int32_t ret = SubscribeLocalHardware(dhId, param);
@@ -89,7 +79,6 @@ int32_t DScreenSinkStub::SubscribeDistributedHardwareInner(MessageParcel &data,
 int32_t DScreenSinkStub::UnsubscribeDistributedHardwareInner(MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("UnsubscribeDistributedHardwareInner");
     std::string dhId = data.ReadString();
     int32_t ret = UnsubscribeLocalHardware(dhId);
     reply.WriteInt32(ret);
@@ -99,7 +88,6 @@ int32_t DScreenSinkStub::UnsubscribeDistributedHardwareInner(MessageParcel &data
 int32_t DScreenSinkStub::DScreenNotifyInner(MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("DScreenNotifyInner");
     std::string devId = data.ReadString();
     int32_t eventCode = data.ReadInt32();
     std::string eventContent = data.ReadString();
diff --git a/services/screenservice/sourceservice/dscreenmgr/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/include/dscreen.h
index 3729dd6fba59ad44f5b89a04e5e03bb02a2965b2..90a394bf5991245dbd9ff0368a70b63630de785b 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> &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> &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 0e58de3cf9109cf18ca32d8f49684359bbccd6b4..df5589542c24cdb18fa37d166c4b9a8cb64eea9e 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> &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> &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> &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> &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<IDScreenSourceCallback> &callback);
     void HandleScreenChange(const std::shared_ptr<DScreen> &changedScreen, Rosen::ScreenGroupChangeEvent event);
     std::shared_ptr<DScreen> FindDScreenByScreenId(uint64_t screenId);
-    void AddToGroup(const std::shared_ptr<DScreen> &changedScreen, uint64_t screenId);
-    void RemoveFromGroup(const std::shared_ptr<DScreen> &changedScreen, uint64_t screenId);
+    int32_t AddToGroup(const std::shared_ptr<DScreen> &changedScreen, uint64_t screenId);
+    int32_t RemoveFromGroup(const std::shared_ptr<DScreen> &changedScreen, uint64_t screenId);
     void GetScreenDumpInfo(std::string &result);
     void PublishMessage(const DHTopic topic, const std::shared_ptr<DScreen> &dScreen);
 private:
diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen_manager.cpp
index e5dfbe528d9393432d87b84854a6e2ed100b8310..87bdbd718c0b34ca921226cac37c165386772c50 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 <map>
+#include <cinttypes>
 
 #include "if_system_ability_manager.h"
 #include "iservice_registry.h"
@@ -60,28 +61,28 @@ int32_t DScreenManager::Init()
     DHLOGI("DScreenManager::Init");
     if (dScreenGroupListener_ == nullptr) {
         dScreenGroupListener_ = new (std::nothrow) DScreenGroupListener();
+        int32_t ret = ScreenMgrAdapter::GetInstance().RegisterScreenGroupListener(dScreenGroupListener_);
+        if (ret != DH_SUCCESS) {
+            DHLOGE("DScreenManager Init failed, err: %d", ret);
+            delete dScreenGroupListener_;
+            dScreenGroupListener_ = nullptr;
+            return ret;
+        }
     }
-    int32_t ret = ScreenMgrAdapter::GetInstance().RegisterScreenGroupListener(dScreenGroupListener_);
-    if (ret != DH_SUCCESS) {
-        DHLOGE("DScreenManager Init failed, err: %d", ret);
-    }
+
     if (dScreenCallback_ == nullptr) {
         dScreenCallback_ = std::make_shared<DScreenCallback>();
     }
 
-    return ret;
+    return DH_SUCCESS;
 }
 
 int32_t DScreenManager::UnInit()
 {
     DHLOGI("DScreenManager::UnInit");
-    int32_t ret = DH_SUCCESS;
-    if (dScreenGroupListener_ != nullptr) {
-        ret = ScreenMgrAdapter::GetInstance().UnregisterScreenGroupListener(dScreenGroupListener_);
-    }
-
+    int32_t ret = ScreenMgrAdapter::GetInstance().UnregisterScreenGroupListener(dScreenGroupListener_);
     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<uint64_t> &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<DScreen> changedScreen = nullptr;
-        changedScreen = DScreenManager::GetInstance().FindDScreenByScreenId(screenId);
+        std::shared_ptr<DScreen> 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<DScreen> &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<DScreen> &changedS
     }
 }
 
-void DScreenManager::AddToGroup(const std::shared_ptr<DScreen> &changedScreen, uint64_t screenId)
+int32_t DScreenManager::AddToGroup(const std::shared_ptr<DScreen> &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<DScreenMapRelation> 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> videoParam = changedScreen->GetVideoParam();
@@ -165,35 +170,32 @@ void DScreenManager::AddToGroup(const std::shared_ptr<DScreen> &changedScreen, u
         std::lock_guard<std::mutex> lock(dScreenMapRelationMtx_);
         mapRelations_[screenId] = mapRelation;
     }
+    return DH_SUCCESS;
 }
 
-void DScreenManager::RemoveFromGroup(const std::shared_ptr<DScreen> &changedScreen, uint64_t screenId)
+int32_t DScreenManager::RemoveFromGroup(const std::shared_ptr<DScreen> &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<DScreenMapRelation> mapRelation = nullptr;
     {
         std::lock_guard<std::mutex> lock(dScreenMapRelationMtx_);
-        if (mapRelations_.count(screenId) == 0) {
-            DHLOGE("destroyed relation not found.");
-            return;
-        }
-        mapRelation = mapRelations_[screenId];
         mapRelations_.erase(screenId);
     }
     changedScreen->AddTask(std::make_shared<Task>(TaskType::TASK_DISCONNECT, ""));
+    return DH_SUCCESS;
 }
 
 void DScreenCallback::OnRegResult(const std::shared_ptr<DScreen> &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> &dScreen,
 }
 
 void DScreenCallback::OnUnregResult(const std::shared_ptr<DScreen> &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> &dScreen,
 }
 
 void DScreenManager::OnRegResult(const std::shared_ptr<DScreen> &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> &dScreen,
 }
 
 void DScreenManager::OnUnregResult(const std::shared_ptr<DScreen> &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> dScreen = nullptr;
     std::lock_guard<std::mutex> lock(dScreenMapMtx_);
-    if (dScreens_.count(dScreenIdx) != 0) {
-        dScreen = dScreens_[dScreenIdx];
-    }
-
+    std::shared_ptr<DScreen> dScreen = dScreens_[dScreenIdx];
     if (dScreen == nullptr) {
         dScreen = std::make_shared<DScreen>(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<IDScreenSourceCallback>
 
 std::shared_ptr<DScreen> DScreenManager::FindDScreenByScreenId(uint64_t screenId)
 {
-    DHLOGD("FindDScreenByScreenId, screenId: %ulld", screenId);
+    DHLOGD("FindDScreenByScreenId, screenId: " PRId64, screenId);
     std::lock_guard<std::mutex> lock(dScreenMapMtx_);
     for (const auto &iter : dScreens_) {
         std::shared_ptr<DScreen> dScreen = iter.second;
@@ -330,7 +328,7 @@ std::shared_ptr<DScreen> 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<IDScreenSink> remoteSinkSA = GetDScreenSinkSA(devId);
     if (!remoteSinkSA) {
@@ -469,14 +467,14 @@ void DScreenManager::NotifyRemoteSinkSetUp(const std::shared_ptr<DScreen> &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/include/dscreen_source_stub.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_stub.h
index 59c4fd9e03c3f4f81aae78c755454cd524822705..9ed200600a6cbba8329e08840c258e9654c5de1d 100644
--- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_stub.h
+++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_stub.h
@@ -25,7 +25,7 @@ namespace DistributedHardware {
 class DScreenSourceStub : public IRemoteStub<IDScreenSource> {
 public:
     DScreenSourceStub();
-    virtual ~DScreenSourceStub();
+    virtual ~DScreenSourceStub() = default;
     virtual int32_t OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,
         MessageOption &option) override;
 
diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp
index 5461367099b4db87fc85d12f38bfad3ad12a4333..3b4bad0cec290b4447a6c1c9d148f4c8ef42ffac 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 <cinttypes>
+
 #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 &params, const sptr<IDScreenSourceCallback> &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");
@@ -103,11 +106,8 @@ int32_t DScreenSourceService::ReleaseSource()
 int32_t DScreenSourceService::RegisterDistributedHardware(const std::string &devId, const std::string &dhId,
     const EnableParam &param, const std::string &reqId)
 {
-    DHLOGI("RegisterDistributedHardware");
     std::string version = param.version;
     std::string attrs = param.attrs;
-    DHLOGD("enable distributedScreen. devId: %s, dhId: %s, reqId: %s, attrs: %s, version: %s",
-        GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str(), attrs.c_str(), version.c_str());
     int ret = DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, attrs, reqId);
     if (ret != DH_SUCCESS) {
         DHLOGE("enable distributedScreen failed. devId: %s, dhId: %s, reqId: %s, attrs: %s",
@@ -122,7 +122,6 @@ int32_t DScreenSourceService::RegisterDistributedHardware(const std::string &dev
 int32_t DScreenSourceService::UnregisterDistributedHardware(const std::string &devId, const std::string &dhId,
     const std::string &reqId)
 {
-    DHLOGI("UnregisterDistributedHardware");
     int ret = DScreenManager::GetInstance().DisableDistributedScreen(devId, dhId, reqId);
     if (ret != DH_SUCCESS) {
         DHLOGE("disable distributedScreen failed. devId: %s, dhId: %s, reqId: %s",
@@ -137,14 +136,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 bb03193cf419c94a5c8740d947d03414d2e244b5..d15449bf8206b4f65f97ff899b0160bcda8c69f4 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;
@@ -35,15 +34,9 @@ DScreenSourceStub::DScreenSourceStub()
     memberFuncMap_[DSCREEN_NOTIFY] = &DScreenSourceStub::DScreenNotifyInner;
 }
 
-DScreenSourceStub::~DScreenSourceStub()
-{
-    DHLOGI("DScreenSourceStub deconstruct.");
-}
-
 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 +56,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<IRemoteObject> remoteObject = data.ReadRemoteObject();
     if (remoteObject == nullptr) {
@@ -80,7 +72,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 +80,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 +97,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 +109,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 +122,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();