diff --git a/distributedscreen.gni b/distributedscreen.gni
index a36a7301a2427e3cebb1d9fc0e8de15c9089d495..eccf2eb22ccbb671b43fdfb14429c2792e4abc81 100644
--- a/distributedscreen.gni
+++ b/distributedscreen.gni
@@ -18,7 +18,6 @@ windowmanager_path = "//foundation/window/window_manager"
 mediastandard_path = "//foundation/multimedia/player_framework"
 driver_path = "//drivers/peripheral/display"
 ipc_path = "//foundation/communication/ipc"
-graphicstandard_path = "//foundation/graphic/graphic_2d"
 common_path = "${distributedscreen_path}/common"
 services_path = "${distributedscreen_path}/services"
 interfaces_path = "${distributedscreen_path}/interfaces"
@@ -26,7 +25,6 @@ fwk_utils_path = "${distributedhardwarefwk_path}/utils"
 fwk_common_path = "${distributedhardwarefwk_path}/common"
 fwk_services_path = "${distributedhardwarefwk_path}/services"
 fwk_interfaces_path = "${distributedhardwarefwk_path}/interfaces"
-av_transport_path = "${distributedhardwarefwk_path}/av_transport"
 ipc_interfaces_path = "${ipc_path}/interfaces"
 build_flags = [ "-Werror" ]
 
diff --git a/services/common/test/unittest/utils/BUILD.gn b/services/common/test/unittest/utils/BUILD.gn
index 7134be765a3bd507280ee70f2a121164ada97ca8..b83013b82110ee8c46f4801d7af44aff55743ccc 100644
--- a/services/common/test/unittest/utils/BUILD.gn
+++ b/services/common/test/unittest/utils/BUILD.gn
@@ -21,7 +21,6 @@ config("module_private_config") {
   visibility = [ ":*" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${fwk_common_path}/log/include",
@@ -55,7 +54,10 @@ ohos_unittest("UtilsTest") {
     "//third_party/googletest:gtest_main",
   ]
 
-  external_deps = [ "distributed_hardware_fwk:libdhfwk_sdk" ]
+  external_deps = [
+    "distributed_hardware_fwk:distributed_av_sender",
+    "distributed_hardware_fwk:libdhfwk_sdk",
+  ]
 }
 
 group("utils_test") {
diff --git a/services/screenservice/sinkservice/BUILD.gn b/services/screenservice/sinkservice/BUILD.gn
index 6036e236ef9a333e60573c5ba2c005b3d7ab5695..6103376ca6425eeafc25a728c4dc2c751941cfea 100644
--- a/services/screenservice/sinkservice/BUILD.gn
+++ b/services/screenservice/sinkservice/BUILD.gn
@@ -18,7 +18,6 @@ import(
 
 ohos_shared_library("distributed_screen_sink") {
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${distributedhardwarefwk_path}/interfaces/inner_kits/include",
@@ -51,11 +50,13 @@ ohos_shared_library("distributed_screen_sink") {
     "./dscreenservice/src/dscreen_sink_stub.cpp",
     "./screenregionmgr/1.0/src/screenregion.cpp",
     "./screenregionmgr/1.0/src/screenregionmgr.cpp",
+    "./screenregionmgr/2.0/src/av_receiver_engine_adapter.cpp",
+    "./screenregionmgr/2.0/src/screenregion.cpp",
+    "./screenregionmgr/2.0/src/screenregionmgr.cpp",
   ]
 
   deps = [
     "${common_path}:distributed_screen_utils",
-    "${graphicstandard_path}/frameworks/surface:surface",
     "${services_path}/screenclient:distributed_screen_client",
     "${services_path}/screentransport/screensinktrans:distributed_screen_sinktrans",
   ]
@@ -68,6 +69,7 @@ ohos_shared_library("distributed_screen_sink") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_standard:libgraphic_utils",
     "graphic_standard:surface",
diff --git a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h
index 21f36d33473f8b03528b5006be264215ea7a2600..876a964f62985be1b1cb4e65d4a6d3da68e9345f 100644
--- a/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h
+++ b/services/screenservice/sinkservice/dscreenservice/include/dscreen_sink_service.h
@@ -21,6 +21,7 @@
 
 #include "dscreen_sink_stub.h"
 #include "1.0/include/screenregionmgr.h"
+#include "2.0/include/screenregionmgr.h"
 
 namespace OHOS {
 namespace DistributedHardware {
diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp
index 8396dae9454af0520befb17d8da99c46a69d83b9..28f379de0a7dcd549c4116efdf96a4995f5f209c 100644
--- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp
+++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_service.cpp
@@ -69,14 +69,25 @@ bool DScreenSinkService::Init()
 int32_t DScreenSinkService::InitSink(const std::string &params)
 {
     DHLOGI("InitSink");
-    (void)params;
+    version_ = params;
+    DHLOGI("InitSink params: %s, version_: %s", params.c_str(), version_.c_str());
+    if (version_ == "3.0") {
+        int32_t ret = V2_0::ScreenRegionManager::GetInstance().Initialize();
+        if (ret != DH_SUCCESS) {
+        DHLOGE("Init ScreenRegionManager3.0 failed. err: %d", ret);
+    }
+    }
     return DH_SUCCESS;
 }
 
 int32_t DScreenSinkService::ReleaseSink()
 {
     DHLOGI("ReleaseSink");
-    V1_0::ScreenRegionManager::GetInstance().ReleaseAllRegions();
+    if (version_ == "2.0") {
+        V1_0::ScreenRegionManager::GetInstance().ReleaseAllRegions();
+    } else if (version_ == "3.0") {
+        V2_0::ScreenRegionManager::GetInstance().Release();
+    }
     DHLOGI("exit sink sa process");
     auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     if (systemAbilityMgr == nullptr) {
@@ -111,7 +122,9 @@ void DScreenSinkService::DScreenNotify(const std::string &devId, int32_t eventCo
 {
     DHLOGI("DScreenNotify, devId:%s, eventCode: %" PRId32 ", eventContent:%s", GetAnonyString(devId).c_str(),
         eventCode, eventContent.c_str());
-    V1_0::ScreenRegionManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent);
+    if (version_ == "2.0") {
+        V1_0::ScreenRegionManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent);
+    }
 }
 
 int32_t DScreenSinkService::Dump(int32_t fd, const std::vector<std::u16string>& args)
@@ -119,7 +132,11 @@ int32_t DScreenSinkService::Dump(int32_t fd, const std::vector<std::u16string>&
     DHLOGI("DScreenSinkService  Dump.");
     (void)args;
     std::string result;
-    V1_0::ScreenRegionManager::GetInstance().GetScreenDumpInfo(result);
+    if (version_ == "2.0") {
+        V1_0::ScreenRegionManager::GetInstance().GetScreenDumpInfo(result);
+    } else if (version_ == "3.0") {
+        V2_0::ScreenRegionManager::GetInstance().GetScreenDumpInfo(result);
+    }
     int ret = dprintf(fd, "%s\n", result.c_str());
     if (ret < 0) {
         DHLOGE("dprintf error");
diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp
index 3dc7883059a7e433b19c9d09b36cbf5898450742..f5359ea00e26490cdbaedebd60afaf6baa08e950 100644
--- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp
+++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregion.cpp
@@ -151,11 +151,11 @@ int32_t ScreenRegion::SetUp(const std::string &content)
     }
     std::string codecType;
     if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H265) {
-        codecType = MINE_VIDEO_H265;
+        codecType = MIME_VIDEO_H265;
     } else if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H264) {
-        codecType = MINE_VIDEO_H264;
+        codecType = MIME_VIDEO_H264;
     } else {
-        codecType = MINE_VIDEO_RAW;
+        codecType = MIME_VIDEO_RAW;
     }
     std::string pixelFormat;
     if (videoParam_->GetVideoFormat() == VIDEO_DATA_FORMAT_YUVI420) {
diff --git a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregionmgr.cpp b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregionmgr.cpp
index d68b14a96f99a0ea52e028282fa494e320286518..05d755d1010a76105a1457a4e6d7948bb0a2df12 100644
--- a/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregionmgr.cpp
+++ b/services/screenservice/sinkservice/screenregionmgr/2.0/src/screenregionmgr.cpp
@@ -64,6 +64,7 @@ ScreenRegionManager::~ScreenRegionManager()
 
 int32_t ScreenRegionManager::Initialize()
 {
+    DHLOGI("Inter ScreenRegionManager::Initialize 2.0");
     int32_t ret = LoadAVReceiverEngineProvider();
     if ((ret != DH_SUCCESS) || (providerPtr_ == nullptr)) {
         DHLOGE("Load av transport receiver engine provider failed.");
diff --git a/services/screenservice/sourceservice/BUILD.gn b/services/screenservice/sourceservice/BUILD.gn
index 2073703b56826dafa033f56191dc5122927edcb2..8f1519bf8b6e5328b3157e6ab392e9a3d1929c50 100644
--- a/services/screenservice/sourceservice/BUILD.gn
+++ b/services/screenservice/sourceservice/BUILD.gn
@@ -1,4 +1,4 @@
-# Copyright (c) 2023 Huawei Device Co., Ltd.
+# Copyright (c) 2022-2023 Huawei Device Co., Ltd.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -18,7 +18,6 @@ import(
 
 ohos_shared_library("distributed_screen_source") {
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "//third_party/libjpeg-turbo",
     "${distributedhardwarefwk_path}/interfaces/inner_kits/include",
@@ -53,6 +52,9 @@ ohos_shared_library("distributed_screen_source") {
     "${services_path}/common/utils/src/video_param.cpp",
     "./dscreenmgr/1.0/src/dscreen.cpp",
     "./dscreenmgr/1.0/src/dscreen_manager.cpp",
+    "./dscreenmgr/2.0/src/av_sender_engine_adapter.cpp",
+    "./dscreenmgr/2.0/src/dscreen.cpp",
+    "./dscreenmgr/2.0/src/dscreen_manager.cpp",
     "./dscreenmgr/common/src/screen_manager_adapter.cpp",
     "./dscreenservice/src/callback/dscreen_source_callback_proxy.cpp",
     "./dscreenservice/src/dscreen_source_service.cpp",
@@ -72,6 +74,7 @@ ohos_shared_library("distributed_screen_source") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "graphic_standard:libcomposer",
     "graphic_standard:surface",
diff --git a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp
index c72f342110e30840216e6c0726b2bb4f4285d795..4b1bd4aded943ecf7abef9072cab384b478cca86 100644
--- a/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp
+++ b/services/screenservice/sourceservice/dscreenmgr/1.0/src/dscreen_manager.cpp
@@ -123,7 +123,7 @@ void DScreenManager::HandleScreenChange(const std::shared_ptr<DScreen> &changedS
     }
 
     uint64_t screenId = changedScreen->GetScreenId();
-    DHLOGI("DScreenManager::HandleScreenChange, screenId: %u, changeEvent: %", screenId, event);
+    DHLOGI("DScreenManager::HandleScreenChange, screenId: %u, changeEvent: %u", screenId, event);
     if (event == Rosen::ScreenGroupChangeEvent::ADD_TO_GROUP) {
         if (AddToGroup(changedScreen, screenId) != DH_SUCCESS) {
             DHLOGE("AddToGroup failed.");
diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h
index 8b43e91711062db28ca74d5317b6213af35281b1..51a92ef80d1ba9b4edb346f43dcdd871951a6b60 100644
--- a/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h
+++ b/services/screenservice/sourceservice/dscreenmgr/2.0/include/av_sender_engine_adapter.h
@@ -57,7 +57,7 @@ public:
     int32_t SetParameter(const AVTransTag &tag, const std::string &param);
     int32_t PushData(const VideoData &video);
     int32_t SendMessageToRemote(const std::shared_ptr<AVTransMessage> &message);
-    int32_t CreateControlChannel(const std::string& peerDevId);
+    int32_t CreateControlChannel(const std::string &peerDevId);
     int32_t RegisterAdapterCallback(const std::shared_ptr<AVSenderAdapterCallback> &callback);
 
     // interfaces from IAVSenderEngineCallback
diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h
index 9d0c3d77487f736a52b281af14715dfb4d646c2f..dc6cb63b5cabf493ac2d2bb1cc98b563c3f2475d 100644
--- a/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h
+++ b/services/screenservice/sourceservice/dscreenmgr/2.0/include/dscreen.h
@@ -20,6 +20,7 @@
 #include <mutex>
 #include <queue>
 #include <thread>
+#include "sync_fence.h"
 
 #include "surface.h"
 #include "iconsumer_surface.h"
@@ -128,6 +129,7 @@ private:
     std::queue<std::shared_ptr<Task>> taskQueue_;
     bool taskThreadRunning_;
     std::shared_ptr<AVTransSenderAdapter> senderAdapter_;
+    OHOS::sptr<OHOS::SyncFence> syncFence_ = SyncFence::INVALID_FENCE;
 };
 } // namespace V2_0
 } // namespace DistributedHardware
diff --git a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp
index 805b96e7e61af830580c922b2670e269c61b21a3..0619f73307bfd2fdc495e0f712ae6883f6f5d4a0 100644
--- a/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp
+++ b/services/screenservice/sourceservice/dscreenmgr/2.0/src/dscreen.cpp
@@ -285,12 +285,19 @@ void DScreen::ConsumeSurface()
         return;
     }
     sptr<SurfaceBuffer> surfaceBuffer = nullptr;
-    int32_t fence = -1;
+    syncFence_ = SyncFence::INVALID_FENCE;
     int64_t timestamp = 0;
     OHOS::Rect damage = {0, 0, 0, 0};
-    SurfaceError surfaceErr = consumerSurface_->AcquireBuffer(surfaceBuffer, fence, timestamp, damage);
+    SurfaceError surfaceErr = consumerSurface_->AcquireBuffer(surfaceBuffer, syncFence_, timestamp, damage);
     if (surfaceErr != SURFACE_ERROR_OK) {
         DHLOGE("consumerSurface_ acquire buffer failed, errcode: %d", surfaceErr);
+        consumerSurface_->ReleaseBuffer(surfaceBuffer, -1);
+        return;
+    }
+    int32_t retcode = syncFence_->Wait(SURFACE_SYNC_FENCE_TIMEOUT);
+    if (retcode == -ETIME) {
+        DHLOGE("%s: Sync fence wait timeout, retcode is %." PRId32, retcode);
+        consumerSurface_->ReleaseBuffer(surfaceBuffer, -1);
         return;
     }
     uint32_t surBufSize = surfaceBuffer->GetSize();
@@ -368,11 +375,11 @@ int32_t DScreen::StopSenderEngine()
 void DScreen::ChooseParameter(std::string &codecType, std::string &pixelFormat)
 {
     if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H265) {
-        codecType = MINE_VIDEO_H265;
+        codecType = MIME_VIDEO_H265;
     } else if (videoParam_->GetCodecType() == VIDEO_CODEC_TYPE_VIDEO_H264) {
-        codecType = MINE_VIDEO_H264;
+        codecType = MIME_VIDEO_H264;
     } else {
-        codecType = MINE_VIDEO_RAW;
+        codecType = MIME_VIDEO_RAW;
     }
     if (videoParam_->GetVideoFormat() == VIDEO_DATA_FORMAT_YUVI420) {
         pixelFormat = VIDEO_FORMAT_YUVI420;
diff --git a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h
index 3fe2abc2867f7dbe5899e28f6b6901ec3daf5498..163a8b0512e0a6abb5b4d28e19faa56131bc8a7f 100644
--- a/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h
+++ b/services/screenservice/sourceservice/dscreenservice/include/dscreen_source_service.h
@@ -20,6 +20,7 @@
 #include "ipc_object_stub.h"
 
 #include "1.0/include/dscreen_manager.h"
+#include "2.0/include/dscreen_manager.h"
 #include "dscreen_source_stub.h"
 #include "idscreen_source_callback.h"
 
diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp
index a307390d56e27227f566e96968ecd6ad77b3ff34..96024f1e101295569b8894291322590487c25391 100644
--- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp
+++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_service.cpp
@@ -46,7 +46,12 @@ void DScreenSourceService::OnStart()
 void DScreenSourceService::OnStop()
 {
     DHLOGI("dscreen source service stop.");
-    int32_t ret = V1_0::DScreenManager::GetInstance().UnInit();
+    int32_t ret = -1;
+    if (version_ == "2.0") {
+        ret = V1_0::DScreenManager::GetInstance().UnInit();
+    } else if (version_ == "3.0") {
+        ret = V2_0::DScreenManager::GetInstance().Release();
+    }
     if (ret != DH_SUCCESS) {
         DHLOGE("UnInit V1_0::DScreenManager failed. err: %" PRId32, ret);
     }
@@ -75,23 +80,43 @@ int32_t DScreenSourceService::InitSource(const std::string &params, const sptr<I
         return ERR_DH_SCREEN_SA_INIT_SOURCE_FAIL;
     }
     DHLOGI("InitSource");
-    int32_t ret = V1_0::DScreenManager::GetInstance().Init();
-    if (ret != DH_SUCCESS) {
-        DHLOGE("Init V1_0::DScreenManager failed. err: %" PRId32, ret);
-        return ret;
+    version_ = params;
+    DHLOGI("InitSource params: %s, version_: %s", params.c_str(), version_.c_str());
+
+    if (version_ == "2.0") {
+        int32_t ret = V1_0::DScreenManager::GetInstance().Init();
+        if (ret != DH_SUCCESS) {
+            DHLOGE("Init V1_0::DScreenManager failed. err: %" PRId32, ret);
+            return ret;
+        }
+        V1_0::DScreenManager::GetInstance().RegisterDScreenCallback(callback);
+    } else if (version_ == "3.0") {
+        int32_t ret = V2_0::DScreenManager::GetInstance().Initialize();
+        if (ret != DH_SUCCESS) {
+            DHLOGE("Init V2_0::DScreenManager failed. err: %" PRId32, ret);
+            return ret;
+        }
+        V2_0::DScreenManager::GetInstance().RegisterDScreenCallback(callback);
     }
-
-    V1_0::DScreenManager::GetInstance().RegisterDScreenCallback(callback);
     return DH_SUCCESS;
 }
 
 int32_t DScreenSourceService::ReleaseSource()
 {
     DHLOGI("ReleaseSource");
-    int32_t ret = V1_0::DScreenManager::GetInstance().UnInit();
-    if (ret != DH_SUCCESS) {
-        DHLOGE("UnInit V1_0::DScreenManager failed. err: %" PRId32, ret);
-        return ret;
+    int32_t ret = -1;
+    if (version_ == "2.0") {
+        ret = V1_0::DScreenManager::GetInstance().UnInit();
+        if (ret != DH_SUCCESS) {
+            DHLOGE("UnInit V1_0::DScreenManager failed. err: %" PRId32, ret);
+            return ret;
+        }
+    } else if (version_ == "3.0") {
+        ret = V2_0::DScreenManager::GetInstance().Release();
+        if (ret != DH_SUCCESS) {
+            DHLOGE("UnInit V2_0::DScreenManager failed. err: %" PRId32, ret);
+            return ret;
+        }
     }
     DHLOGI("exit source sa process");
     auto systemAbilityMgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
@@ -112,9 +137,15 @@ int32_t DScreenSourceService::RegisterDistributedHardware(const std::string &dev
     const EnableParam &param, const std::string &reqId)
 {
     std::string attrs = param.attrs;
-    std::string version = param.version;
-    V1_0::DScreenManager::GetInstance().SetScreenVersion(version);
-    int ret = V1_0::DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, attrs, reqId);
+    version_ = param.version;
+    int32_t ret = -1;
+    DHLOGI("Source RegisterDistributedHardware params.version: %s", param.version.c_str());
+    if (version_ == "2.0") {
+        V1_0::DScreenManager::GetInstance().SetScreenVersion(version_);
+        ret = V1_0::DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, attrs, reqId);
+    } else if (version_ == "3.0") {
+        ret = V2_0::DScreenManager::GetInstance().EnableDistributedScreen(devId, dhId, attrs, reqId);
+    }
     if (ret != DH_SUCCESS) {
         DHLOGE("enable distributedScreen failed. devId: %s, dhId: %s, reqId: %s, attrs: %s",
             GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str(), attrs.c_str());
@@ -128,7 +159,12 @@ int32_t DScreenSourceService::RegisterDistributedHardware(const std::string &dev
 int32_t DScreenSourceService::UnregisterDistributedHardware(const std::string &devId, const std::string &dhId,
     const std::string &reqId)
 {
-    int ret = V1_0::DScreenManager::GetInstance().DisableDistributedScreen(devId, dhId, reqId);
+    int ret = -1;
+    if (version_ == "2.0") {
+        ret = V1_0::DScreenManager::GetInstance().DisableDistributedScreen(devId, dhId, reqId);
+    } else if (version_ == "3.0") {
+        ret = V2_0::DScreenManager::GetInstance().DisableDistributedScreen(devId, dhId, reqId);
+    }
     if (ret != DH_SUCCESS) {
         DHLOGE("disable distributedScreen failed. devId: %s, dhId: %s, reqId: %s",
             GetAnonyString(devId).c_str(), GetAnonyString(dhId).c_str(), reqId.c_str());
@@ -153,7 +189,9 @@ void DScreenSourceService::DScreenNotify(const std::string &devId, const int32_t
     const std::string &eventContent)
 {
     DHLOGI("DScreenNotify, devId: %s, eventCode: %" PRId32, GetAnonyString(devId).c_str(), eventCode);
-    V1_0::DScreenManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent);
+    if (version_ == "2.0") {
+        V1_0::DScreenManager::GetInstance().HandleDScreenNotify(devId, eventCode, eventContent);
+    }
 }
 
 int32_t DScreenSourceService::Dump(int32_t fd, const std::vector<std::u16string>& args)
@@ -161,7 +199,11 @@ int32_t DScreenSourceService::Dump(int32_t fd, const std::vector<std::u16string>
     DHLOGI("DScreenSourceService  Dump.");
     (void)args;
     std::string result;
-    V1_0::DScreenManager::GetInstance().GetScreenDumpInfo(result);
+    if (version_ == "2.0") {
+        V1_0::DScreenManager::GetInstance().GetScreenDumpInfo(result);
+    } else if (version_ == "3.0") {
+        V2_0::DScreenManager::GetInstance().GetScreenDumpInfo(result);
+    }
     int ret = dprintf(fd, "%s\n", result.c_str());
     if (ret < 0) {
         DHLOGE("dprintf error");
diff --git a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
index ae9e0976578dfa3e66fb8ea89eeb193cc92b07dd..4ee209e91379f7f337a36c8efe0d1475135270ca 100644
--- a/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
+++ b/services/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer/BUILD.gn
@@ -23,7 +23,6 @@ ohos_fuzztest("OnChangeFuzzTest") {
   fuzz_config_file = "${services_path}/screenservice/test/fuzztest/sourceservice/dscreenmgr/onchange_fuzzer"
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${distributedhardwarefwk_path}/interfaces/inner_kits/include",
     "${fwk_common_path}/utils/include",
     "${windowmanager_path}/interfaces/innerkits/wm",
@@ -61,6 +60,7 @@ ohos_fuzztest("OnChangeFuzzTest") {
   ]
 
   external_deps = [
+    "distributed_hardware_fwk:distributed_av_sender",
     "graphic_standard:surface",
     "window_manager:libdm",
   ]
diff --git a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
index 188fa070d5aee33b1ffc56e8b0b9e9b482398132..8426c8f29a4211334cddc287d6ae7777e12d55a6 100644
--- a/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
+++ b/services/screenservice/test/unittest/sinkservice/screenregionmgr/BUILD.gn
@@ -20,7 +20,6 @@ module_out_path = "distributed_screen/dscreen_sink_service_test"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "${fwk_common_path}/utils/include",
     "${distributedhardwarefwk_path}/interfaces/inner_kits/include",
@@ -64,6 +63,7 @@ ohos_unittest("DscreenRegionMgrTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
     "graphic_standard:libgraphic_utils",
     "graphic_standard:surface",
     "hisysevent_native:libhisysevent",
diff --git a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
index 4b31c1eb8aaa846c8b639797a196aa2918b654f5..0deacdb947467d97d2b04ae165d466dd7460358a 100644
--- a/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
+++ b/services/screenservice/test/unittest/sourceservice/dscreenmgr/BUILD.gn
@@ -20,12 +20,8 @@ module_out_path = "distributed_screen/DscreenMgrTest"
 config("module_private_config") {
   visibility = [ ":*" ]
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "${driver_path}/interfaces/include",
-    "${graphicstandard_path}/interfaces/inner_api/surface",
-    "${graphicstandard_path}/interfaces/inner_api/common",
-    "${graphicstandard_path}/utils/buffer_handle/export",
     "${distributedhardwarefwk_path}/interfaces/inner_kits/include",
     "${distributedhardwarefwk_path}/common/utils/include",
     "${mediastandard_path}/interfaces/inner_api/native",
@@ -72,6 +68,9 @@ ohos_unittest("DscreenMgrTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
+    "graphic_standard:libcomposer",
+    "graphic_standard:surface",
     "graphic_standard:sync_fence",
     "hdf_core:libhdi",
     "player_framework:media_client",
diff --git a/services/screentransport/screensinktrans/BUILD.gn b/services/screentransport/screensinktrans/BUILD.gn
index c6b59a4aa79c063c68c9ee885a2c2c88be0d4b8e..c0cf6d2a80140f9c70a218eb8bed7b6074b6b673 100644
--- a/services/screentransport/screensinktrans/BUILD.gn
+++ b/services/screentransport/screensinktrans/BUILD.gn
@@ -18,7 +18,6 @@ import(
 
 ohos_shared_library("distributed_screen_sinktrans") {
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "//third_party/libjpeg",
     "${fwk_common_path}/utils/include",
@@ -74,6 +73,7 @@ ohos_shared_library("distributed_screen_sinktrans") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "graphic_standard:surface",
diff --git a/services/screentransport/screensourcetrans/BUILD.gn b/services/screentransport/screensourcetrans/BUILD.gn
index bde09a007be8500a5de7ae41ae305a8933e6b584..6243f2a609ae91d5fecadfeefbcc550f8916e1ac 100644
--- a/services/screentransport/screensourcetrans/BUILD.gn
+++ b/services/screentransport/screensourcetrans/BUILD.gn
@@ -18,7 +18,6 @@ import(
 
 ohos_shared_library("distributed_screen_sourcetrans") {
   include_dirs = [
-    "${av_transport_path}/common/include",
     "//third_party/json/include",
     "//third_party/libjpeg-turbo",
     "${fwk_common_path}/utils/include",
@@ -73,6 +72,7 @@ ohos_shared_library("distributed_screen_sourcetrans") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_sender",
     "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
     "graphic_standard:surface",
diff --git a/services/softbusadapter/test/fuzztest/softbusonbytesreceived_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusonbytesreceived_fuzzer/BUILD.gn
index da20ac0d89cff42bda2e67bb1eb4ad92100f5bb7..2204e46596ba1c7d88dc03f3cad03018784dda00 100644
--- a/services/softbusadapter/test/fuzztest/softbusonbytesreceived_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusonbytesreceived_fuzzer/BUILD.gn
@@ -30,7 +30,6 @@ ohos_fuzztest("SoftbusOnBytesReceivedFuzzTest") {
   sources = [ "softbusonbytesreceived_fuzzer.cpp" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${common_path}/include",
     "${services_path}/common/databuffer/include",
     "${services_path}/common/screen_channel/include",
@@ -46,6 +45,8 @@ ohos_fuzztest("SoftbusOnBytesReceivedFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
   ]
 
diff --git a/services/softbusadapter/test/fuzztest/softbusonmessagereceived_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusonmessagereceived_fuzzer/BUILD.gn
index a45d99e45757fd0b02a6d5993bd94a71ac82dc2d..38c9b989f742d7e88fa5ae2c4524d6104eda0707 100644
--- a/services/softbusadapter/test/fuzztest/softbusonmessagereceived_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusonmessagereceived_fuzzer/BUILD.gn
@@ -30,7 +30,6 @@ ohos_fuzztest("SoftbusOnMessageReceivedFuzzTest") {
   sources = [ "softbusonmessagereceived_fuzzer.cpp" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${common_path}/include",
     "${services_path}/common/databuffer/include",
     "${services_path}/common/screen_channel/include",
@@ -46,6 +45,8 @@ ohos_fuzztest("SoftbusOnMessageReceivedFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
   ]
 
diff --git a/services/softbusadapter/test/fuzztest/softbusonqosevent_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusonqosevent_fuzzer/BUILD.gn
index 89eabc1ac40d2687ee86abb9c946737a09c616b4..b58af2ee2541107fcef19d1c2b2fd6bb1d93c6d1 100644
--- a/services/softbusadapter/test/fuzztest/softbusonqosevent_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusonqosevent_fuzzer/BUILD.gn
@@ -31,7 +31,6 @@ ohos_fuzztest("SoftbusOnQosEventFuzzTest") {
   sources = [ "softbusonqosevent_fuzzer.cpp" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${common_path}/include",
     "${services_path}/common/databuffer/include",
     "${services_path}/common/screen_channel/include",
@@ -47,6 +46,8 @@ ohos_fuzztest("SoftbusOnQosEventFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
   ]
 
diff --git a/services/softbusadapter/test/fuzztest/softbusonsessionclosed_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusonsessionclosed_fuzzer/BUILD.gn
index 3e155b99c7663bcea239d3bed6328415d8eb886e..ada1fa0df920d94386ca601a8c6925e47bcf11bf 100644
--- a/services/softbusadapter/test/fuzztest/softbusonsessionclosed_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusonsessionclosed_fuzzer/BUILD.gn
@@ -30,7 +30,6 @@ ohos_fuzztest("SoftbusOnSessionClosedFuzzTest") {
   sources = [ "softbusonsessionclosed_fuzzer.cpp" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${common_path}/include",
     "${services_path}/common/databuffer/include",
     "${services_path}/common/screen_channel/include",
@@ -46,6 +45,8 @@ ohos_fuzztest("SoftbusOnSessionClosedFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
   ]
 
diff --git a/services/softbusadapter/test/fuzztest/softbusonsessionopened_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusonsessionopened_fuzzer/BUILD.gn
index 9fe272c76a040dc1a5e355efcad851aed2e528b1..67ae86989b34e0a7007e0678cff324fa7c5840c7 100644
--- a/services/softbusadapter/test/fuzztest/softbusonsessionopened_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusonsessionopened_fuzzer/BUILD.gn
@@ -30,7 +30,6 @@ ohos_fuzztest("SoftbusOnSessionOpenedFuzzTest") {
   sources = [ "softbusonsessionopened_fuzzer.cpp" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${common_path}/include",
     "${services_path}/common/databuffer/include",
     "${services_path}/common/screen_channel/include",
@@ -46,6 +45,8 @@ ohos_fuzztest("SoftbusOnSessionOpenedFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
   ]
 
diff --git a/services/softbusadapter/test/fuzztest/softbusonstreamreceived_fuzzer/BUILD.gn b/services/softbusadapter/test/fuzztest/softbusonstreamreceived_fuzzer/BUILD.gn
index 9dab5d47cc40d15c9aec3fea11b95762f52da0b1..8c971a6f31bbe59a3317bd30e2e78e0d6d48c0f1 100644
--- a/services/softbusadapter/test/fuzztest/softbusonstreamreceived_fuzzer/BUILD.gn
+++ b/services/softbusadapter/test/fuzztest/softbusonstreamreceived_fuzzer/BUILD.gn
@@ -30,7 +30,6 @@ ohos_fuzztest("SoftbusOnStreamReceivedFuzzTest") {
   sources = [ "softbusonstreamreceived_fuzzer.cpp" ]
 
   include_dirs = [
-    "${av_transport_path}/common/include",
     "${common_path}/include",
     "${services_path}/common/databuffer/include",
     "${services_path}/common/screen_channel/include",
@@ -46,6 +45,8 @@ ohos_fuzztest("SoftbusOnStreamReceivedFuzzTest") {
 
   external_deps = [
     "c_utils:utils",
+    "distributed_hardware_fwk:distributed_av_receiver",
+    "distributed_hardware_fwk:libdhfwk_sdk",
     "dsoftbus:softbus_client",
   ]