diff --git a/README_ZH.md b/README_ZH.md index b2223c472272f2b36821fe0ea1febbe4ac8b92c1..a22043e3cfc9f48e042c6cc216b159e231930af8 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -2,7 +2,7 @@ ## **简介** -分布式屏幕是一种屏幕虚拟化能力，支持用户指定任意设备的屏幕作为Display的显示区域。在分布式硬件子系统中，分布式屏幕提供跨设备屏幕能力调用，为OpenHarmony操作系统提供系统投屏、屏幕镜像、屏幕分割等能力的实现。 +分布式屏幕是一种屏幕虚拟化能力，支持用户指定组网认证过的其他OpenHarmony设备的屏幕作为Display的显示区域。在分布式硬件子系统中，分布式屏幕组件提供跨设备屏幕能力调用，为OpenHarmony操作系统提供系统投屏、屏幕镜像、屏幕分割等能力的实现。 系统架构如下图所示： @@ -63,6 +63,9 @@ ### **接口说明** 分布式屏幕实现分布式硬件管理框架提供的接口，由分布式硬件管理框架统一调用接口实现虚拟屏幕硬件的创建和注册功能。 +### **场景说明** +设备组网认证后，主控端设备可以指定被控端设备的屏幕来显示Display绘制的内容。 + ### **流程说明** #### **1. 设备开机启动** 系统拉起分布式屏幕的SA服务，Source侧被初始化，相关模块被初始化。 @@ -83,5 +86,8 @@ ## **涉及仓** **** -**分布式屏幕** -[distributed_screen](https://gitee.com/openharmony/distributed_screen) \ No newline at end of file +**分布式屏幕** +[distributed_screen](https://gitee.com/openharmony/distributed_screen) + +**分布式硬件管理框架** +[distributed_hardware_fwk](https://gitee.com/openharmony/distributed_hardware_fwk) \ No newline at end of file diff --git a/figures/distributedscreen_arch.png b/figures/distributedscreen_arch.png index e4c0deb8bb27e9718ef77cd0a9e4736e5d53ff66..b0fc39e9c986d143aeedc2bdb2944d791fc6430a 100644 Binary files a/figures/distributedscreen_arch.png and b/figures/distributedscreen_arch.png differ diff --git a/services/common/test/unittest/databuffer/data_buffer_test.cpp b/services/common/test/unittest/databuffer/data_buffer_test.cpp index fec3459934fceae34344dc9d975a322f39fd92bf..b1828d2beb4a444e168935abd6aace86e9162a1f 100644 --- a/services/common/test/unittest/databuffer/data_buffer_test.cpp +++ b/services/common/test/unittest/databuffer/data_buffer_test.cpp @@ -55,5 +55,5 @@ HWTEST_F(DataBufferTest, Data_001, TestSize.Level1) uint8_t *actual = dataBuffer_->Data(); EXPECT_NE(nullptr, actual); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/common/test/unittest/databuffer/data_buffer_test.h b/services/common/test/unittest/databuffer/data_buffer_test.h index aa75c15dc91fc4af665278c23a4f512146c86a58..4f0a72ba0babfdb90ebeebd81394e7e4ca27828f 100644 --- a/services/common/test/unittest/databuffer/data_buffer_test.h +++ b/services/common/test/unittest/databuffer/data_buffer_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_DATA_BUFFER_TEST_H +#define OHOS_DATA_BUFFER_TEST_H + #include #include @@ -29,5 +32,6 @@ public: size_t capacity = 1; std::shared_ptr dataBuffer_ = nullptr; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/common/test/unittest/utils/dscreen_maprelation_test.cpp b/services/common/test/unittest/utils/dscreen_maprelation_test.cpp index ec0078f53576f23a884f547ede6782deeb2ea6a8..0e4304e56f187c2de67de41875be97c5faf5b8ac 100644 --- a/services/common/test/unittest/utils/dscreen_maprelation_test.cpp +++ b/services/common/test/unittest/utils/dscreen_maprelation_test.cpp @@ -93,5 +93,5 @@ void DScreenMapRelationTest::TearDown() {} ScreenRect actual = dscreenMapRelation->GetScreenRect(); EXPECT_EQ(startX, actual.startX); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/common/test/unittest/utils/dscreen_maprelation_test.h b/services/common/test/unittest/utils/dscreen_maprelation_test.h index 9806911444001380981ad52f38ba6f6f89bd7c7a..935814764656f00a345bb893f60e9a468f52a04d 100644 --- a/services/common/test/unittest/utils/dscreen_maprelation_test.h +++ b/services/common/test/unittest/utils/dscreen_maprelation_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_DSCREEN_MAPRELATION_TEST_H +#define OHOS_DSCREEN_MAPRELATION_TEST_H + #include #include "dscreen_constants.h" @@ -31,5 +34,6 @@ public: void TearDown(); std::shared_ptr dscreenMapRelation = nullptr; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/common/test/unittest/utils/video_param_test.cpp b/services/common/test/unittest/utils/video_param_test.cpp index 78052b97ee8d2d4c43a02d86009ad2cf2a32a7f8..23bd135787eb17c316ad438b5c2495f97c8d9a21 100644 --- a/services/common/test/unittest/utils/video_param_test.cpp +++ b/services/common/test/unittest/utils/video_param_test.cpp @@ -131,5 +131,5 @@ HWTEST_F(VideoParamTest, GetVideoFormat_001, TestSize.Level1) uint8_t actual = videoParam_->GetVideoFormat(); EXPECT_EQ(videoFormat, actual); } -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS \ No newline at end of file diff --git a/services/common/test/unittest/utils/video_param_test.h b/services/common/test/unittest/utils/video_param_test.h index d58777991152016fd2707982bb44770bc134cc01..f21586980b5eaf3396a2a4e2b95066277358cbfd 100644 --- a/services/common/test/unittest/utils/video_param_test.h +++ b/services/common/test/unittest/utils/video_param_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_VIDEO_PARAM_TEST_H +#define OHOS_VIDEO_PARAM_TEST_H + #include #include "dscreen_constants.h" @@ -31,5 +34,6 @@ public: void TearDown(); std::shared_ptr videoParam_ = nullptr; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screenclient/test/unittest/include/screen_client_test.h b/services/screenclient/test/unittest/include/screen_client_test.h index d085267a8ea5190225b0d12ca72b77f07bfbbc9a..465c22dbdc6f40c108a5dcb5a675eb2c33197219 100644 --- a/services/screenclient/test/unittest/include/screen_client_test.h +++ b/services/screenclient/test/unittest/include/screen_client_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_SCREEN_CLIENT_TEST_H +#define OHOS_SCREEN_CLIENT_TEST_H + #include #include "dscreen_errcode.h" @@ -29,5 +32,6 @@ public: void SetUp(); void TearDown(); }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h b/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h index 1b222a5efe32fab58e5372b9f401d6f21e613698..68467e77427a19918a5d95aaec89d95cbfdc1f7f 100644 --- a/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h +++ b/services/screenclient/test/unittest/include/screen_client_window_adapter_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_SCREEN_CLIENT_WINDOW_ADAPTER_TEST_H +#define OHOS_SCREEN_CLIENT_WINDOW_ADAPTER_TEST_H + #include #include "rs_surface_node.h" @@ -33,5 +36,6 @@ public: void SetUp(); void TearDown(); }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screendatachannel/include/screen_data_channel_impl_test.h b/services/screentransport/test/unittest/screendatachannel/include/screen_data_channel_impl_test.h index f5c34dbbead786b2ec5ebd972442ce15b29857c9..c2bdc60f9d9bd4665e1d84d7ac533689206f79fb 100644 --- a/services/screentransport/test/unittest/screendatachannel/include/screen_data_channel_impl_test.h +++ b/services/screentransport/test/unittest/screendatachannel/include/screen_data_channel_impl_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_SCREEN_DATA_CHANNEL_IMPL_TEST_H +#define OHOS_SCREEN_DATA_CHANNEL_IMPL_TEST_H + #include #include #include @@ -35,5 +38,6 @@ public: void TearDown(); std::shared_ptr dataChannelImpl_ = nullptr; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h index 4d6f2f3b3eb153a4f6da16539a5effa0b0ff601d..77a9bcc7c0d70ce0a3ecd83a242cd046d6c1d5d0 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h +++ b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_decoder_test.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef IMAGE_SINK_DECODER_TEST_H -#define IMAGE_SINK_DECODER_TEST_H +#ifndef OHOS_IMAGE_SINK_DECODER_TEST_H +#define OHOS_IMAGE_SINK_DECODER_TEST_H #include @@ -37,6 +37,6 @@ public: std::shared_ptr imageDecoder_ = nullptr; std::shared_ptr imageListener_ = nullptr; }; -} -} +} // namespace DistributedHardware +} // namespace OHOS #endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h index b6db96db19950f96651a19f1b76911f233e8ed84..a56bf79a6f63c722ac874b2034a9e03d7ec36f02 100644 --- a/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h +++ b/services/screentransport/test/unittest/screensinkprocessor/include/image_sink_processor_test.h @@ -13,16 +13,16 @@ * limitations under the License. */ -#ifndef IMAGE_SINK_DECODER_TEST_H -#define IMAGE_SINK_DECODER_TEST_H +#ifndef OHOS_IMAGE_SINK_DECODER_TEST_H +#define OHOS_IMAGE_SINK_DECODER_TEST_H #include #define private public #include "image_sink_processor.h" #undef private -#include "screentrans_test_utils.h" #include "iscreen_channel_listener.h" +#include "screentrans_test_utils.h" namespace OHOS { namespace DistributedHardware { @@ -37,6 +37,6 @@ public: std::shared_ptr processor_; std::shared_ptr imageListener_; }; -} -} +} // namespace DistributedHardware +} // namespace OHOS #endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screensinktrans/include/screen_sink_trans_test.h b/services/screentransport/test/unittest/screensinktrans/include/screen_sink_trans_test.h index 7ad2db3e4a78c2818438b7168a9852a27e971e4a..6210ae38978839f06965fbce6eb5a023a3ec6404 100644 --- a/services/screentransport/test/unittest/screensinktrans/include/screen_sink_trans_test.h +++ b/services/screentransport/test/unittest/screensinktrans/include/screen_sink_trans_test.h @@ -13,16 +13,15 @@ * limitations under the License. */ -#ifndef SCREEN_SINK_TRANS_TEST_H -#define SCREEN_SINK_TRANS_TEST_H +#ifndef OHOS_SCREEN_SINK_TRANS_TEST_H +#define OHOS_SCREEN_SINK_TRANS_TEST_H #include +#include "iscreen_sink_trans_callback.h" #define private public #include "screen_sink_trans.h" #undef private - -#include "iscreen_sink_trans_callback.h" #include "screentrans_test_utils.h" namespace OHOS { @@ -38,6 +37,6 @@ public: VideoParam param_; std::string peerDevId_; }; -} -} +} // namespace DistributedHardware +} // namespace OHOS #endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screensourceprocessor/include/image_source_encoder_test.h b/services/screentransport/test/unittest/screensourceprocessor/include/image_source_encoder_test.h index f9d3fadd968d86db76b7af7c856ba28b29aeb957..12d3d4d8342c4614c7d96a75ebf7794f9a53c329 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/include/image_source_encoder_test.h +++ b/services/screentransport/test/unittest/screensourceprocessor/include/image_source_encoder_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_IMAGE_SOURCE_ENCODER_TEST_H +#define OHOS_IMAGE_SOURCE_ENCODER_TEST_H + #include #include @@ -34,5 +37,6 @@ public: std::shared_ptr encoder = nullptr; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screensourceprocessor/include/image_source_processor_test.h b/services/screentransport/test/unittest/screensourceprocessor/include/image_source_processor_test.h index 3dfafb36daac2d26397d62f40c55c2d9302ace8f..ce6f62a41dc900e7ad4344134766c5eb0a8f8e44 100644 --- a/services/screentransport/test/unittest/screensourceprocessor/include/image_source_processor_test.h +++ b/services/screentransport/test/unittest/screensourceprocessor/include/image_source_processor_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_IMAGE_SOURCE_PROCESSOR_TEST_H +#define OHOS_IMAGE_SOURCE_PROCESSOR_TEST_H + #include #include "dscreen_errcode.h" @@ -32,5 +35,6 @@ public: ImageSourceProcessor processor; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screensourcetrans/include/screen_source_trans_test.h b/services/screentransport/test/unittest/screensourcetrans/include/screen_source_trans_test.h index 333cb9edabaa74ea13c5cbb590ab9c9f3d50addc..cae500ca8ae5eb60c069996dc96a21f6dcf79b7c 100644 --- a/services/screentransport/test/unittest/screensourcetrans/include/screen_source_trans_test.h +++ b/services/screentransport/test/unittest/screensourcetrans/include/screen_source_trans_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_SCREEN_SOURCE_TRANS_TEST_H +#define OHOS_SCREEN_SOURCE_TRANS_TEST_H + #include #include @@ -35,5 +38,6 @@ public: std::shared_ptr trans = nullptr; }; -} -} +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file diff --git a/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h b/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h index 407b54133069e9c9ff3a38561c9fda63b5eda939..b38537d3a1c1310386c4807209308c14f151b88f 100644 --- a/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h +++ b/services/screentransport/test/unittest/screentranstestutils/include/screentrans_test_utils.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef SCREENTRANS_TEST_UTILS_H -#define SCREENTRANS_TEST_UTILS_H +#ifndef OHOS_SCREEN_TRANS_TEST_UTILS_H +#define OHOS_SCREEN_TRANS_TEST_UTILS_H #include "dscreen_errcode.h" #include "dscreen_log.h" @@ -76,6 +76,6 @@ public: void OnSessionClosed() override {} void OnDataReceived(const std::shared_ptr &data) override {} }; -} -} +} // namespace DistributedHardware +} // namespace OHOS #endif \ No newline at end of file diff --git a/services/softbusadapter/test/unittest/include/softbus_adapter_test.h b/services/softbusadapter/test/unittest/include/softbus_adapter_test.h index 3f494d4f480bb650dfb824bc4466e71b59783a22..10b0cc7521ad2a78a5b1211e751391f8a3aaf6fc 100644 --- a/services/softbusadapter/test/unittest/include/softbus_adapter_test.h +++ b/services/softbusadapter/test/unittest/include/softbus_adapter_test.h @@ -13,6 +13,9 @@ * limitations under the License. */ +#ifndef OHOS_SOFTBUS_ADAPTER_TEST_H +#define OHOS_SOFTBUS_ADAPTER_TEST_H + #include #include @@ -36,5 +39,6 @@ public: SoftbusAdapter softbusAdapter; }; -} -} \ No newline at end of file +} // namespace DistributedHardware +} // namespace OHOS +#endif \ No newline at end of file