fix conflict

Signed-off-by: wuliangdong <wuliangdong1@huawei.com>
Change-Id: I90efd54fd1e6667dcb1cebc8fc5ae3832eb09d5b

frameworks/native/src/devicestatus_callback_proxy.cpp

@@ -20,6 +20,7 @@
 
 #include "devicestatus_common.h"
 #include "devicestatus_callback_proxy.h"
+#include "devicestatus_client.h"
 #include "devicestatus_define.h"
 
 namespace OHOS {

interfaces/innerkits/BUILD.gn

@@ -31,6 +31,8 @@ config("devicestatus_public_config") {
     "${device_status_interfaces_path}/innerkits/include",
     "${device_status_interfaces_path}/innerkits/interaction/include",
     "${device_status_root_path}/utils/ipc/include",
+    "${device_status_root_path}/services/communication/base/",
+    "${device_status_root_path}/services/communication/client/include",
     "//foundation/multimedia/image_framework/interfaces/innerkits/include"
   ]
 
@@ -47,8 +49,8 @@ ohos_shared_library("devicestatus_client") {
     "${device_status_frameworks_path}/native/src/devicestatus_callback_proxy.cpp",
     "${device_status_frameworks_path}/native/src/devicestatus_callback_stub.cpp",
     "${device_status_frameworks_path}/native/src/devicestatus_client.cpp",
-    "${device_status_frameworks_path}/native/src/devicestatus_srv_proxy.cpp",
     "${device_status_frameworks_path}/native/src/fd_listener.cpp",
+    "${device_status_root_path}/services/communication/client/src/devicestatus_srv_proxy.cpp",
   ]
 
   if (fusion_interaction_coordination) {

interfaces/innerkits/include/devicestatus_callback_proxy.h

@@ -21,7 +21,6 @@
 
 #include "idevicestatus_callback.h"
 #include "devicestatus_data_utils.h"
-#include "devicestatus_client.h"
 
 namespace OHOS {
 namespace Msdp {

services/BUILD.gn

@@ -32,6 +32,8 @@ config("devicestatus_services_private_config") {
     "${device_status_service_path}//interaction/drag/include",
     "//utils/system/safwk/native/include",
     "//foundation/multimedia/image_framework/interfaces/innerkits/include",
+    "communication/base",
+    "communication/service/include",
   ]
 
   defines = device_status_default_defines
@@ -54,6 +56,7 @@ ohos_shared_library("devicestatus_service") {
   include_dirs = [ "//third_party/cJSON" ]
 
   sources = [
+    "communication/service/src/devicestatus_srv_stub.cpp",
     "delegate_task/src/delegate_tasks.cpp",
     "device_manager/src/device.cpp",
     "device_manager/src/device_manager.cpp",
@@ -64,7 +67,6 @@ ohos_shared_library("devicestatus_service") {
     "native/src/devicestatus_manager.cpp",
     "native/src/devicestatus_msdp_client_impl.cpp",
     "native/src/devicestatus_service.cpp",
-    "native/src/devicestatus_srv_stub.cpp",
     "native/src/stream_server.cpp",
     "timer_manager/src/timer_manager.cpp",
   ]

services/communication/client/src/devicestatus_srv_proxy.cpp

@@ -362,7 +362,7 @@ int32_t DeviceStatusSrvProxy::StopDrag(int32_t dragResult)
 }
 
 int32_t DeviceStatusSrvProxy::AllocSocketFd(const std::string &programName, const int32_t moduleType,
-        int32_t &socketFd, int32_t &tokenType)
+    int32_t &socketFd, int32_t &tokenType)
 {
     CALL_DEBUG_ENTER;
     MessageParcel data;

services/native/test/unittest/BUILD.gn

@@ -24,6 +24,7 @@ config("module_private_config") {
     "//utils/system/safwk/native/include",
     "//base/msdp/device_status/libs/interface",
     "//base/msdp/device_status/services/delegate_task/include",
+    "../../../communication/service/include",
   ]
 }