diff --git a/common/BUILD.gn b/common/BUILD.gn
index 7dd03dcd631fe907e5d57d8a7e6079f71e38c6f3..48c87145b9b5b89389941db2ebb3da6d180ac45e 100644
--- a/common/BUILD.gn
+++ b/common/BUILD.gn
@@ -13,35 +13,34 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 ohos_shared_library("distributed_screen_utils") {
-    include_dirs = [
-        "//utils/native/base/include",
-        "include",
-    ]
-
-    sources = [
-        "src/dscreen_util.cpp",
-        "src/dscreen_log.cpp",
-    ]
-
-    deps = [
-        "//utils/native/base:utils",
-    ]
-
-    external_deps = [
-        "dsoftbus_standard:softbus_client",
-        "hiviewdfx_hilog_native:libhilog",
-    ]
-
-    defines = [
-        "HI_LOG_ENABLE",
-        "DH_LOG_TAG=\"dscreenutil\"",
-        "LOG_DOMAIN=0xD004100",
-    ]
-
-    subsystem_name = "distributedhardware"
-
-    part_name = "distributed_screen"
-}
\ No newline at end of file
+  include_dirs = [
+    "//utils/native/base/include",
+    "include",
+  ]
+
+  sources = [
+    "src/dscreen_log.cpp",
+    "src/dscreen_util.cpp",
+  ]
+
+  deps = [ "//utils/native/base:utils" ]
+
+  external_deps = [
+    "dsoftbus_standard:softbus_client",
+    "hiviewdfx_hilog_native:libhilog",
+  ]
+
+  defines = [
+    "HI_LOG_ENABLE",
+    "DH_LOG_TAG=\"dscreenutil\"",
+    "LOG_DOMAIN=0xD004100",
+  ]
+
+  subsystem_name = "distributedhardware"
+
+  part_name = "distributed_screen"
+}
diff --git a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp
index c9ac9a53a5102d3c7218b43f13a3280bbf532f2d..4ec6a3f71747fff7c52df75850513055573dec09 100644
--- a/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp
+++ b/interfaces/innerkits/native_cpp/screen_source/src/callback/dscreen_source_callback_stub.cpp
@@ -70,7 +70,7 @@ int32_t DScreenSourceCallbackStub::OnNotifyUnregResultInner(MessageParcel &data,
     std::string reqId = data.ReadString();
     int32_t status = data.ReadInt32();
     std::string resultData = data.ReadString();
-    int32_t ret = OnNotifyRegResult(devId, dhId, reqId, status, resultData);
+    int32_t ret = OnNotifyUnregResult(devId, dhId, reqId, status, resultData);
     return ret;
 }
 }
diff --git a/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp
index d6e73fdbbbe5acd7a50999de017b9dede06e7f7c..5e43589aeb85b6eba50a263b948517ca485143ff 100644
--- a/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp
+++ b/services/screenservice/sourceservice/dscreenmgr/src/dscreen.cpp
@@ -279,7 +279,6 @@ void DScreen::HandleDisable(const std::string &taskId)
 {
     DHLOGI("HandleDisable, devId: %s, dhId: %s", GetAnonyString(devId_).c_str(), GetAnonyString(dhId_).c_str());
     SetState(DISABLING);
-    Stop();
     int32_t ret = ScreenMgrAdapter::GetInstance().RemoveVirtualScreen(screenId_);
     if (ret != DH_SUCCESS) {
         DHLOGE("remove virtual screen failed.");
diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp
index 23630c5a99b00dcdf3d693e888ea704a5582229a..bb03193cf419c94a5c8740d947d03414d2e244b5 100644
--- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp
+++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp
@@ -107,7 +107,7 @@ int32_t DScreenSourceStub::RegisterDistributedHardwareInner(MessageParcel &data,
 int32_t DScreenSourceStub::UnregisterDistributedHardwareInner(MessageParcel &data, MessageParcel &reply,
     MessageOption &option)
 {
-    DHLOGI("RegisterDistributedHardwareInner");
+    DHLOGI("UnregisterDistributedHardwareInner");
     std::string devId = data.ReadString();
     std::string dhId = data.ReadString();
     std::string reqId = data.ReadString();
diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn
index 0db390a50bc0c5c0a81abbbf80db273960759b06..e0a631f40970b76574d604928abcd91ef9146b97 100644
--- a/services/screentransport/screensinktrans/BUILD.gn
+++ b/services/screentransport/screensinktrans/BUILD.gn
@@ -13,7 +13,8 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 ohos_shared_library("distributed_screen_sinktrans") {
   include_dirs = [
@@ -36,14 +37,14 @@ ohos_shared_library("distributed_screen_sinktrans") {
   ]
 
   sources = [
-    "./src/screen_sink_trans.cpp",
     "${services_path}/common/databuffer/src/data_buffer.cpp",
     "${services_path}/common/utils/src/video_param.cpp",
     "${services_path}/screentransport/screendatachannel/src/screen_data_channel_impl.cpp",
-    "${services_path}/screentransport/screensinkprocessor/src/image_sink_processor.cpp",
-    "${services_path}/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp",
     "${services_path}/screentransport/screensinkprocessor/decoder/src/image_decoder_callback.cpp",
+    "${services_path}/screentransport/screensinkprocessor/decoder/src/image_sink_decoder.cpp",
+    "${services_path}/screentransport/screensinkprocessor/src/image_sink_processor.cpp",
     "${services_path}/softbusadapter/src/softbus_adapter.cpp",
+    "./src/screen_sink_trans.cpp",
   ]
 
   deps = [
@@ -67,4 +68,4 @@ ohos_shared_library("distributed_screen_sinktrans") {
   subsystem_name = "distributedhardware"
 
   part_name = "distributed_screen"
-}
\ No newline at end of file
+}
diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn
index 09e5afa141078e7cf1337a8e545b7fd8220eb7b6..a8e5ae18b0ed62d5a0c0bfd8b2695d5972b4be09 100644
--- a/services/screentransport/screensourcetrans/BUILD.gn
+++ b/services/screentransport/screensourcetrans/BUILD.gn
@@ -13,7 +13,8 @@
 
 import("//build/ohos.gni")
 import("//build/ohos_var.gni")
-import("//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
+import(
+    "//foundation/distributedhardware/distributedscreen/distributedscreen.gni")
 
 ohos_shared_library("distributed_screen_sourcetrans") {
   include_dirs = [
@@ -35,14 +36,14 @@ ohos_shared_library("distributed_screen_sourcetrans") {
   ]
 
   sources = [
-    "./src/screen_source_trans.cpp",
     "${services_path}/common/databuffer/src/data_buffer.cpp",
     "${services_path}/common/utils/src/video_param.cpp",
     "${services_path}/screentransport/screendatachannel/src/screen_data_channel_impl.cpp",
-    "${services_path}/screentransport/screensourceprocessor/src/image_source_processor.cpp",
-    "${services_path}/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp",
     "${services_path}/screentransport/screensourceprocessor/encoder/src/image_encoder_callback.cpp",
+    "${services_path}/screentransport/screensourceprocessor/encoder/src/image_source_encoder.cpp",
+    "${services_path}/screentransport/screensourceprocessor/src/image_source_processor.cpp",
     "${services_path}/softbusadapter/src/softbus_adapter.cpp",
+    "./src/screen_source_trans.cpp",
   ]
 
   deps = [
@@ -66,4 +67,4 @@ ohos_shared_library("distributed_screen_sourcetrans") {
   subsystem_name = "distributedhardware"
 
   part_name = "distributed_screen"
-}
\ No newline at end of file
+}