fwk仓独立编译问题解决

Signed-off-by: li-tiangang4 <litiangang4@h-partners.com>

dfx_utils/include/hidumper.h

@@ -26,7 +26,7 @@
 #include <sys/inotify.h>
 
 #include "constants_dinput.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 
 namespace OHOS {
 namespace DistributedHardware {
@@ -51,7 +51,7 @@ struct SessionInfo {
 };
 
 class HiDumper {
-DECLARE_SINGLE_INSTANCE_BASE(HiDumper);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(HiDumper);
 
 public:
     bool HiDump(const std::vector<std::string> &args, std::string &result);

dfx_utils/include/hisysevent_util.h

@@ -18,7 +18,7 @@
 
 #include <cstring>
 
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 #include "hisysevent.h"
 #include "constants_dinput.h"
 
@@ -39,7 +39,7 @@ const std::string DINPUT_OPT_FAIL = "DINPUT_OPT_FAIL";
 const std::string DINPUT_UNREGISTER_FAIL = "DINPUT_UNREGISTER_FAIL";
 
 class HisyseventUtil {
-DECLARE_SINGLE_INSTANCE_BASE(HisyseventUtil);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(HisyseventUtil);
 public:
     void SysEventWriteBehavior(std::string status, std::string msg);
     void SysEventWriteBehavior(std::string status, std::string devId, std::string msg);

dfx_utils/src/hidumper.cpp

@@ -23,7 +23,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(HiDumper);
+FWK_IMPLEMENT_SINGLE_INSTANCE(HiDumper);
 namespace {
     const std::string ARGS_HELP = "-h";
     const std::string ARGS_NODE_INFO = "-nodeinfo";

dfx_utils/src/hisysevent_util.cpp

@@ -22,7 +22,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(HisyseventUtil);
+FWK_IMPLEMENT_SINGLE_INSTANCE(HisyseventUtil);
 
 void HisyseventUtil::SysEventWriteBehavior(std::string status, std::string msg)
 {

inputdevicehandler/include/distributed_input_handler.h

@@ -25,7 +25,7 @@
 #include <linux/input.h>
 
 #include "ihardware_handler.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 
 #include "constants_dinput.h"
 #include "input_hub.h"
@@ -38,7 +38,7 @@ namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
 class DistributedInputHandler : public IHardwareHandler {
-DECLARE_SINGLE_INSTANCE_BASE(DistributedInputHandler);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(DistributedInputHandler);
 public:
     API_EXPORT int32_t Initialize() override;
     API_EXPORT virtual std::vector<DHItem> QueryMeta() override;

inputdevicehandler/src/distributed_input_handler.cpp

@@ -40,7 +40,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DistributedInputHandler);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DistributedInputHandler);
 DistributedInputHandler::DistributedInputHandler()
     : collectThreadID_(-1), isCollectingEvents_(false), isStartCollectEventThread_(false)
 {

interfaces/ipc/include/dinput_sa_manager.h

@@ -22,7 +22,7 @@
 
 #include "i_distributed_source_input.h"
 #include "i_distributed_sink_input.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 #include "system_ability_status_change_stub.h"
 
 #include "idistributed_hardware_source.h"
@@ -37,7 +37,7 @@ const uint32_t DINPUT_CLIENT_CHECK_SINK_CALLBACK_REGISTER_MSG = 2;
 const uint32_t DINPUT_CLIENT_CLEAR_SOURCE_CALLBACK_REGISTER_MSG = 3;
 const uint32_t DINPUT_CLIENT_CLEAR_SINK_CALLBACK_REGISTER_MSG = 4;
 class DInputSAManager {
-DECLARE_SINGLE_INSTANCE_BASE(DInputSAManager);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(DInputSAManager);
 public:
     void Init();
     bool GetDInputSourceProxy();

interfaces/ipc/src/dinput_sa_manager.cpp

@@ -25,7 +25,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DInputSAManager);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DInputSAManager);
 const uint32_t DINPUT_CLIENT_HANDLER_MSG_DELAY_TIME = 100; // million seconds
 void DInputSAManager::SystemAbilityListener::OnRemoveSystemAbility(int32_t systemAbilityId, const std::string &deviceId)
 {

interfaces/ipc/test/clientunittest/mock_samanager.cpp

@@ -27,7 +27,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DInputSAManager);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DInputSAManager);
 
 void DInputSAManager::SystemAbilityListener::OnRemoveSystemAbility(int32_t systemAbilityId, const std::string &deviceId)
 {}

services/source/sourcemanager/include/distributed_input_source_sa_cli_mgr.h

@@ -24,13 +24,13 @@
 #include "event_handler.h"
 
 #include "i_distributed_source_input.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
 class DInputSourceSACliMgr {
-DECLARE_SINGLE_INSTANCE_BASE(DInputSourceSACliMgr);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(DInputSourceSACliMgr);
 public:
     DInputSourceSACliMgr();
     virtual ~DInputSourceSACliMgr();

services/source/sourcemanager/src/distributed_input_source_sa_cli_mgr.cpp

@@ -25,7 +25,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DInputSourceSACliMgr);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DInputSourceSACliMgr);
 DInputSourceSACliMgr::DInputSourceSACliMgr()
 {
     DHLOGI("Ctor DInputSourceSACliMgr");

services/state/include/dinput_sink_state.h

@@ -23,7 +23,7 @@
 #include <linux/input.h>
 
 #include "constants_dinput.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 #include "touchpad_event_fragment_mgr.h"
 
 namespace OHOS {
@@ -40,7 +40,7 @@ enum class DhIdState {
 };
 
 class DInputSinkState {
-    DECLARE_SINGLE_INSTANCE_BASE(DInputSinkState);
+    FWK_DECLARE_SINGLE_INSTANCE_BASE(DInputSinkState);
 public:
     int32_t Init();
     int32_t Release();

services/state/src/dinput_sink_state.cpp

@@ -31,7 +31,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DInputSinkState);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DInputSinkState);
 DInputSinkState::~DInputSinkState()
 {
     Release();

services/transportbase/include/distributed_input_transport_base.h

@@ -29,7 +29,7 @@
 #include "event_handler.h"
 #include "nlohmann/json.hpp"
 #include "securec.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 
 #include "socket.h"
 #include "softbus_bus_center.h"
@@ -44,7 +44,7 @@ namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
 class DistributedInputTransportBase {
-    DECLARE_SINGLE_INSTANCE_BASE(DistributedInputTransportBase);
+    FWK_DECLARE_SINGLE_INSTANCE_BASE(DistributedInputTransportBase);
 public:
     int32_t Init();
     int32_t StartSession(const std::string &remoteDevId);

services/transportbase/src/distributed_input_transport_base.cpp

@@ -48,7 +48,7 @@ static QosTV g_qosInfo[] = {
 };
 static uint32_t g_QosTV_Param_Index = static_cast<uint32_t>(sizeof(g_qosInfo) / sizeof(g_qosInfo[0]));
 }
-IMPLEMENT_SINGLE_INSTANCE(DistributedInputTransportBase);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DistributedInputTransportBase);
 DistributedInputTransportBase::~DistributedInputTransportBase()
 {
     DHLOGI("Release Transport Session");

sinkhandler/include/distributed_input_sink_handler.h

@@ -22,7 +22,7 @@
 
 #include "idistributed_hardware_sink.h"
 #include "iservice_registry.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 #include "system_ability_definition.h"
 #include "system_ability_load_callback_stub.h"
 
@@ -33,7 +33,7 @@ namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
 class DistributedInputSinkHandler : public IDistributedHardwareSink {
-DECLARE_SINGLE_INSTANCE_BASE(DistributedInputSinkHandler);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(DistributedInputSinkHandler);
 public:
     int32_t InitSink(const std::string &params) override;
     int32_t ReleaseSink() override;

sinkhandler/src/distributed_input_sink_handler.cpp

@@ -24,7 +24,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DistributedInputSinkHandler);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DistributedInputSinkHandler);
 
 DistributedInputSinkHandler::DistributedInputSinkHandler()
 {

sourcehandler/include/distributed_input_source_handler.h

@@ -22,7 +22,7 @@
 
 #include "idistributed_hardware_source.h"
 #include "iservice_registry.h"
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 #include "system_ability_load_callback_stub.h"
 #include "system_ability_definition.h"
 
@@ -35,7 +35,7 @@ namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
 class DistributedInputSourceHandler : public IDistributedHardwareSource {
-DECLARE_SINGLE_INSTANCE_BASE(DistributedInputSourceHandler);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(DistributedInputSourceHandler);
 public:
     int32_t InitSource(const std::string &params) override;
     int32_t ReleaseSource() override;

sourcehandler/src/distributed_input_source_handler.cpp

@@ -24,7 +24,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DistributedInputSourceHandler);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DistributedInputSourceHandler);
 
 DistributedInputSourceHandler::DistributedInputSourceHandler()
 {

utils/include/dinput_context.h

@@ -25,7 +25,7 @@
 
 #include <refbase.h>
 
-#include "single_instance.h"
+#include "dhfwk_single_instance.h"
 
 #include "constants.h"
 #include "device_type.h"
@@ -51,7 +51,7 @@ const nlohmann::json DISABLE_LOW_LATENCY = {
     {LOW_LATENCY_ENABLE, false},
 };
 class DInputContext {
-DECLARE_SINGLE_INSTANCE_BASE(DInputContext);
+FWK_DECLARE_SINGLE_INSTANCE_BASE(DInputContext);
 public:
     std::string GetScreenInfoKey(const std::string &devId, const uint64_t sourceWinId);
     int32_t RemoveSinkScreenInfo(const std::string &screenInfoKey);

utils/src/dinput_context.cpp

@@ -23,7 +23,7 @@
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-IMPLEMENT_SINGLE_INSTANCE(DInputContext);
+FWK_IMPLEMENT_SINGLE_INSTANCE(DInputContext);
 
 DInputContext::~DInputContext()
 {