diff --git a/common/include/test/whitelistunittest/BUILD.gn b/common/include/test/whitelistunittest/BUILD.gn index 29d7486..234b99e 100644 --- a/common/include/test/whitelistunittest/BUILD.gn +++ b/common/include/test/whitelistunittest/BUILD.gn @@ -64,7 +64,7 @@ ohos_unittest("distributed_input_white_list_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/inputdevicehandler/BUILD.gn b/inputdevicehandler/BUILD.gn index 5828323..1450568 100644 --- a/inputdevicehandler/BUILD.gn +++ b/inputdevicehandler/BUILD.gn @@ -40,7 +40,7 @@ ohos_shared_library("libdinput_handler") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//third_party/openssl:libcrypto_static", diff --git a/inputdevicehandler/include/distributed_input_handler.h b/inputdevicehandler/include/distributed_input_handler.h index 5689521..ccb6ed8 100644 --- a/inputdevicehandler/include/distributed_input_handler.h +++ b/inputdevicehandler/include/distributed_input_handler.h @@ -47,8 +47,6 @@ private: int32_t GetDeviceInfo(std::string& deviceId); std::shared_ptr m_listener; bool InitCollectEventsThread(); - bool Init(); - bool Release(); void NotifyHardWare(int iCnt); pthread_t collectThreadID_; diff --git a/inputdevicehandler/src/distributed_input_handler.cpp b/inputdevicehandler/src/distributed_input_handler.cpp index 0856ff0..8dd9f09 100644 --- a/inputdevicehandler/src/distributed_input_handler.cpp +++ b/inputdevicehandler/src/distributed_input_handler.cpp @@ -33,6 +33,18 @@ namespace OHOS { namespace DistributedHardware { namespace DistributedInput { IMPLEMENT_SINGLE_INSTANCE(DistributedInputHandler); +DistributedInputHandler::DistributedInputHandler() + : collectThreadID_(-1), isCollectingEvents_(false), + isStartCollectEventThread(false) +{ + inputHub_ = std::make_unique(); + this->m_listener = nullptr; +} + +DistributedInputHandler::~DistributedInputHandler() +{ + StopInputMonitorDeviceThread(); +} void DistributedInputHandler::StructTransJson(const InputDevice& pBuf, std::string& strDescriptor) { @@ -56,24 +68,6 @@ void DistributedInputHandler::StructTransJson(const InputDevice& pBuf, std::stri return; } -DistributedInputHandler::DistributedInputHandler() - : collectThreadID_(-1), isCollectingEvents_(false), - isStartCollectEventThread(false) -{ - Init(); -} - -DistributedInputHandler::~DistributedInputHandler() -{ - Release(); -} - -bool DistributedInputHandler::Release() -{ - StopInputMonitorDeviceThread(); - return true; -} - int32_t DistributedInputHandler::Initialize() { if (!isStartCollectEventThread) { @@ -83,13 +77,6 @@ int32_t DistributedInputHandler::Initialize() return SUCCESS; } -bool DistributedInputHandler::Init() -{ - inputHub_ = std::make_unique(); - this->m_listener = nullptr; - return true; -} - std::vector DistributedInputHandler::Query() { std::vector retInfos; diff --git a/interfaces/inner_kits/test/unittest/BUILD.gn b/interfaces/inner_kits/test/unittest/BUILD.gn index 42300c8..304432a 100644 --- a/interfaces/inner_kits/test/unittest/BUILD.gn +++ b/interfaces/inner_kits/test/unittest/BUILD.gn @@ -84,7 +84,7 @@ ohos_unittest("distributed_input_inner_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", ] diff --git a/services/sink/inputcollector/BUILD.gn b/services/sink/inputcollector/BUILD.gn index 4532268..466eaf5 100644 --- a/services/sink/inputcollector/BUILD.gn +++ b/services/sink/inputcollector/BUILD.gn @@ -39,7 +39,7 @@ ohos_shared_library("libdinput_collector") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//third_party/openssl:libcrypto_static", diff --git a/services/sink/inputcollector/include/distributed_input_collector.h b/services/sink/inputcollector/include/distributed_input_collector.h index 9c5889d..b01bbc5 100644 --- a/services/sink/inputcollector/include/distributed_input_collector.h +++ b/services/sink/inputcollector/include/distributed_input_collector.h @@ -39,8 +39,6 @@ private: ~DistributedInputCollector(); bool InitCollectEventsThread(); - bool Initialize(); - bool Release(); static void *CollectEventsThread(void *param); void StartCollectEventsThread(); void StopCollectEventsThread(); diff --git a/services/sink/inputcollector/src/distributed_input_collector.cpp b/services/sink/inputcollector/src/distributed_input_collector.cpp index d49d841..78de8bf 100644 --- a/services/sink/inputcollector/src/distributed_input_collector.cpp +++ b/services/sink/inputcollector/src/distributed_input_collector.cpp @@ -38,18 +38,12 @@ DistributedInputCollector::DistributedInputCollector() : collectThreadID_(-1), isCollectingEvents_(false), isStartGetDeviceHandlerThread(false), input_types_(0) { - Initialize(); + inputHub_ = std::make_unique(); } DistributedInputCollector::~DistributedInputCollector() -{ - Release(); -} - -bool DistributedInputCollector::Release() { StopCollectEventsThread(); - return true; } DistributedInputCollector &DistributedInputCollector::GetInstance() @@ -72,12 +66,6 @@ int32_t DistributedInputCollector::Init(std::shared_ptr(); - return true; -} - bool DistributedInputCollector::InitCollectEventsThread() { pthread_attr_t attr; diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index a9a18ea..a908e0b 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -52,7 +52,7 @@ ohos_shared_library("libdinput_sink") { deps = [ "//foundation/distributedhardware/distributedinput/interfaces/inner_kits:libdinput_sdk", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/distributedhardware/distributedinput/services/sink/transport:libdinput_sink_trans", diff --git a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp index 00313be..4e24273 100644 --- a/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp +++ b/services/sink/sinkmanager/src/distributed_input_sink_manager.cpp @@ -232,10 +232,6 @@ bool DistributedInputSinkManager::InitAuto() } handler_ = std::make_shared(runner_); - if (handler_ == nullptr) { - return false; - } - DHLOGI("init success"); return true; } diff --git a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn index d66c63b..b2a0c4b 100644 --- a/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn +++ b/services/sink/sinkmanager/test/sinkmanagerunittest/BUILD.gn @@ -75,7 +75,7 @@ ohos_unittest("distributed_input_sinkmanager_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/services/sink/transport/BUILD.gn b/services/sink/transport/BUILD.gn index c3f2cf0..a2ae6c9 100644 --- a/services/sink/transport/BUILD.gn +++ b/services/sink/transport/BUILD.gn @@ -41,7 +41,7 @@ ohos_shared_library("libdinput_sink_trans") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//foundation/distributedschedule/samgr/interfaces/innerkits/samgr_proxy:samgr_proxy", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", diff --git a/services/sink/transport/src/distributed_input_sink_switch.cpp b/services/sink/transport/src/distributed_input_sink_switch.cpp index c55fd6a..3ccfa00 100644 --- a/services/sink/transport/src/distributed_input_sink_switch.cpp +++ b/services/sink/transport/src/distributed_input_sink_switch.cpp @@ -21,12 +21,6 @@ namespace OHOS { namespace DistributedHardware { namespace DistributedInput { -DistributedInputSinkSwitch &DistributedInputSinkSwitch::GetInstance() -{ - static DistributedInputSinkSwitch instance; - return instance; -} - DistributedInputSinkSwitch::DistributedInputSinkSwitch() { InitSwitch(); @@ -38,6 +32,12 @@ DistributedInputSinkSwitch::~DistributedInputSinkSwitch() InitSwitch(); } +DistributedInputSinkSwitch &DistributedInputSinkSwitch::GetInstance() +{ + static DistributedInputSinkSwitch instance; + return instance; +} + void DistributedInputSinkSwitch::InitSwitch() { DHLOGI("InitSwitch."); @@ -57,8 +57,7 @@ int32_t DistributedInputSinkSwitch::StartSwitch(int32_t sessionId) if ((*it).sessionId == sessionId) { (*it).switchState = true; findOld = true; - } else { - (*it).switchState = false; + break; } } diff --git a/services/sink/transport/src/distributed_input_sink_transport.cpp b/services/sink/transport/src/distributed_input_sink_transport.cpp index f72051f..0e322e5 100644 --- a/services/sink/transport/src/distributed_input_sink_transport.cpp +++ b/services/sink/transport/src/distributed_input_sink_transport.cpp @@ -23,6 +23,26 @@ namespace OHOS { namespace DistributedHardware { namespace DistributedInput { +DistributedInputSinkTransport::DistributedInputSinkTransport() +{ + std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); + eventHandler_ = std::make_shared(runner); + mySessionName_ = ""; + DHLOGI("DistributedInputSinkTransport eventHandler_"); +} + +DistributedInputSinkTransport::~DistributedInputSinkTransport() +{ + DHLOGI("~DistributedInputSinkTransport"); + sessionDevMap_.clear(); + (void)RemoveSessionServer(DINPUT_PKG_NAME.c_str(), mySessionName_.c_str()); +} + +DistributedInputSinkTransport::DInputSinkEventHandler::DInputSinkEventHandler( + const std::shared_ptr &runner) : AppExecFwk::EventHandler(runner) +{ +} + static int32_t SessionOpened(int32_t sessionId, int32_t result) { return DistributedInput::DistributedInputSinkTransport::GetInstance().OnSessionOpened(sessionId, result); @@ -61,26 +81,6 @@ DistributedInputSinkTransport &DistributedInputSinkTransport::GetInstance() return instance; } -DistributedInputSinkTransport::DistributedInputSinkTransport() -{ - std::shared_ptr runner = AppExecFwk::EventRunner::Create(true); - eventHandler_ = std::make_shared(runner); - mySessionName_ = ""; - DHLOGI("DistributedInputSinkTransport eventHandler_"); -} - -DistributedInputSinkTransport::~DistributedInputSinkTransport() -{ - DHLOGI("~DistributedInputSinkTransport"); - sessionDevMap_.clear(); - (void)RemoveSessionServer(DINPUT_PKG_NAME.c_str(), mySessionName_.c_str()); -} - -DistributedInputSinkTransport::DInputSinkEventHandler::DInputSinkEventHandler( - const std::shared_ptr &runner) : AppExecFwk::EventHandler(runner) -{ -} - void DistributedInputSinkTransport::DInputSinkEventHandler::ProcessEvent(const AppExecFwk::InnerEvent::Pointer &event) { DHLOGI("ProcessEvent"); @@ -119,12 +119,7 @@ int32_t DistributedInputSinkTransport::Init() .OnStreamReceived = StreamReceived }; auto localNode = std::make_unique(); - if (localNode == nullptr) { - DHLOGE("Init unique_ptr localNode nullptr."); - return FAILURE; - } int32_t retCode = GetLocalNodeDeviceInfo(DINPUT_PKG_NAME.c_str(), localNode.get()); - if (retCode != SUCCESS) { DHLOGE("Init could not get local device id."); return FAILURE; @@ -133,7 +128,6 @@ int32_t DistributedInputSinkTransport::Init() DHLOGI("Init device networkId is %s", networkId.c_str()); mySessionName_ = SESSION_NAME_SINK + networkId.substr(0, INTERCEPT_STRING_LENGTH); - int32_t ret = CreateSessionServer(DINPUT_PKG_NAME.c_str(), mySessionName_.c_str(), &iSessionListener); if (ret != SUCCESS) { DHLOGE("Init CreateSessionServer failed, error code %d.", ret); diff --git a/services/sink/transport/test/sinktransunittest/BUILD.gn b/services/sink/transport/test/sinktransunittest/BUILD.gn index fbc6208..77952fa 100644 --- a/services/sink/transport/test/sinktransunittest/BUILD.gn +++ b/services/sink/transport/test/sinktransunittest/BUILD.gn @@ -60,7 +60,7 @@ ohos_unittest("distributed_input_sinktrans_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/services/source/inputinject/BUILD.gn b/services/source/inputinject/BUILD.gn index 91ce00e..b46e733 100644 --- a/services/source/inputinject/BUILD.gn +++ b/services/source/inputinject/BUILD.gn @@ -43,7 +43,7 @@ ohos_shared_library("libdinput_inject") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//third_party/openssl:libcrypto_static", diff --git a/services/source/inputinject/include/distributed_input_inject.h b/services/source/inputinject/include/distributed_input_inject.h index 93df5a8..3949992 100644 --- a/services/source/inputinject/include/distributed_input_inject.h +++ b/services/source/inputinject/include/distributed_input_inject.h @@ -32,8 +32,6 @@ public: int32_t UnregisterDistributedHardware(const std::string& devId, const std::string& dhId); int32_t PrepareRemoteInput(); - int32_t Init(); - bool Release(); int32_t RegisterDistributedEvent(RawEvent* buffer, size_t bufferSize); int32_t StructTransJson(const InputDevice& pBuf, std::string& strDescriptor); diff --git a/services/source/inputinject/include/distributed_input_node_manager.h b/services/source/inputinject/include/distributed_input_node_manager.h index dfca6d8..344315e 100644 --- a/services/source/inputinject/include/distributed_input_node_manager.h +++ b/services/source/inputinject/include/distributed_input_node_manager.h @@ -35,15 +35,12 @@ public: int32_t openDevicesNode(const std::string& devId, const std::string& dhId, const std::string& parameters); - int32_t Init(); - int32_t getDevice(const std::string& dhId, VirtualDevice*& device); void ReportEvent(const RawEvent rawEvent); int32_t CloseDeviceLocked(const std::string& dhId); void StartInjectThread(); private: - bool Release(); void AddDeviceLocked(const std::string& dhId, std::unique_ptr device); int32_t CreateHandle(InputDevice event, const std::string& devId); void CloseAllDevicesLocked(); diff --git a/services/source/inputinject/src/distributed_input_inject.cpp b/services/source/inputinject/src/distributed_input_inject.cpp index 0c97bf1..4a836e1 100644 --- a/services/source/inputinject/src/distributed_input_inject.cpp +++ b/services/source/inputinject/src/distributed_input_inject.cpp @@ -25,7 +25,12 @@ namespace DistributedInput { DistributedInputInject::DistributedInputInject() : isStartInjectThread_(false) { - Init(); + inputNodeManager_ = std::make_unique(); +} + +DistributedInputInject::~DistributedInputInject() +{ + isStartInjectThread_ = false; } DistributedInputInject &DistributedInputInject::GetInstance() @@ -34,23 +39,6 @@ DistributedInputInject &DistributedInputInject::GetInstance() return instance; } -int32_t DistributedInputInject::Init() -{ - inputNodeManager_ = std::make_unique(); - return SUCCESS; -} - -DistributedInputInject::~DistributedInputInject() -{ - Release(); -} - -bool DistributedInputInject::Release() -{ - isStartInjectThread_ = false; - return true; -} - int32_t DistributedInputInject::RegisterDistributedHardware(const std::string& devId, const std::string& dhId, const std::string& parameters) { diff --git a/services/source/inputinject/src/distributed_input_node_manager.cpp b/services/source/inputinject/src/distributed_input_node_manager.cpp index 45374ed..40d007d 100644 --- a/services/source/inputinject/src/distributed_input_node_manager.cpp +++ b/services/source/inputinject/src/distributed_input_node_manager.cpp @@ -34,23 +34,11 @@ static const uint32_t INPUT_DEVICE_CLASS_TOUCH = static_cast(DeviceCla Distributed_input_node_manager::Distributed_input_node_manager() { - Init(); -} - -int32_t Distributed_input_node_manager::Init() -{ - return SUCCESS; } Distributed_input_node_manager::~Distributed_input_node_manager() -{ - Release(); -} - -bool Distributed_input_node_manager::Release() { CloseAllDevicesLocked(); - return true; } int32_t Distributed_input_node_manager::openDevicesNode(const std::string& devId, const std::string& dhId, diff --git a/services/source/inputinject/src/virtual_device.cpp b/services/source/inputinject/src/virtual_device.cpp index 62c5c63..d0dfa6c 100644 --- a/services/source/inputinject/src/virtual_device.cpp +++ b/services/source/inputinject/src/virtual_device.cpp @@ -23,16 +23,6 @@ namespace OHOS { namespace DistributedHardware { namespace DistributedInput { -bool VirtualDevice::DoIoctl(int32_t fd, int32_t request, const uint32_t value) -{ - int32_t rc = ioctl(fd, request, value); - if (rc < 0) { - DHLOGE("%s ioctl failed", __func__); - return false; - } - return true; -} - VirtualDevice::VirtualDevice() : deviceName_(""), netWorkId_(""), busTtype_(0), vendorId_(0), productId_(0), version_(0) { @@ -53,6 +43,16 @@ VirtualDevice::~VirtualDevice() } } +bool VirtualDevice::DoIoctl(int32_t fd, int32_t request, const uint32_t value) +{ + int32_t rc = ioctl(fd, request, value); + if (rc < 0) { + DHLOGE("%s ioctl failed", __func__); + return false; + } + return true; +} + bool VirtualDevice::CreateKey() { auto fun = [&](int32_t uiSet, const std::vector& list) -> bool { diff --git a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn index 15db3c8..f5cfe06 100644 --- a/services/source/inputinject/test/sourceinjectunittest/BUILD.gn +++ b/services/source/inputinject/test/sourceinjectunittest/BUILD.gn @@ -69,7 +69,7 @@ ohos_unittest("distributed_input_inner_sourceinject_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/services/source/sourcemanager/BUILD.gn b/services/source/sourcemanager/BUILD.gn index c8ebab4..11d98ce 100644 --- a/services/source/sourcemanager/BUILD.gn +++ b/services/source/sourcemanager/BUILD.gn @@ -72,7 +72,7 @@ ohos_shared_library("libdinput_source") { deps = [ "//foundation/distributedhardware/distributedinput/interfaces/inner_kits:libdinput_sdk", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/distributedhardware/distributedinput/services/source/transport:libdinput_source_trans", diff --git a/services/source/sourcemanager/src/distributed_input_source_manager.cpp b/services/source/sourcemanager/src/distributed_input_source_manager.cpp index 54bf213..a26cfb7 100644 --- a/services/source/sourcemanager/src/distributed_input_source_manager.cpp +++ b/services/source/sourcemanager/src/distributed_input_source_manager.cpp @@ -262,9 +262,6 @@ bool DistributedInputSourceManager::InitAuto() } handler_ = std::make_shared(runner_); - if (handler_ == nullptr) { - return false; - } DHLOGI("init success"); @@ -483,7 +480,7 @@ int32_t DistributedInputSourceManager::Init() } statuslistener_ = std::make_shared(this); - DistributedInputSourceTransport::GetInstance().RegisteSourceRespCallback(statuslistener_); + DistributedInputSourceTransport::GetInstance().RegisterSourceRespCallback(statuslistener_); serviceRunningState_ = ServiceSourceRunningState::STATE_RUNNING; return SUCCESS; @@ -514,11 +511,6 @@ int32_t DistributedInputSourceManager::Release() // 3. isstart callback std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("Release jsonArrayMsg is null."); - return FAILURE; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_RESULT] = static_cast(DInputServerType::NULL_SERVER_TYPE); jsonArrayMsg->push_back(tmpJson); @@ -623,11 +615,6 @@ void DistributedInputSourceManager::handleStartServerCallback(const std::string& } if (isAllDevSwitchOff) { std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("handleStartServerCallback jsonArrayMsg is null."); - return; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_RESULT] = static_cast(DInputServerType::NULL_SERVER_TYPE); jsonArrayMsg->push_back(tmpJson); @@ -665,11 +652,6 @@ int32_t DistributedInputSourceManager::RemoveInputNode(const std::string& devId, int32_t DistributedInputSourceManager::DeleteDevice(const std::string& devId, const std::string& dhId) { std::shared_ptr jsonArrayMsg = std::make_shared(); - if (jsonArrayMsg == nullptr) { - DHLOGE("UnregisterDistributedHardware jsonArrayMsg is null."); - return FAILURE; - } - nlohmann::json tmpJson; tmpJson[INPUT_SOURCEMANAGER_KEY_DEVID] = devId; tmpJson[INPUT_SOURCEMANAGER_KEY_HWID] = dhId; diff --git a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn index 5ee688f..0512283 100644 --- a/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn +++ b/services/source/sourcemanager/test/sourcemanagerunittest/BUILD.gn @@ -99,7 +99,7 @@ ohos_unittest("distributed_input_sourcemanager_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index 332abd8..b87c5f6 100644 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -41,7 +41,7 @@ ohos_shared_library("libdinput_source_trans") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/services/source/transport/include/distributed_input_source_transport.h b/services/source/transport/include/distributed_input_source_transport.h index 802861e..083cce7 100644 --- a/services/source/transport/include/distributed_input_source_transport.h +++ b/services/source/transport/include/distributed_input_source_transport.h @@ -39,7 +39,7 @@ public: int32_t Init(); int32_t OpenInputSoftbus(const std::string &remoteDevId, const std::string &hwId); void CloseInputSoftbus(const std::string &remoteDevId, const std::string &hwId); - void RegisteSourceRespCallback(std::shared_ptr callback); + void RegisterSourceRespCallback(std::shared_ptr callback); int32_t PrepareRemoteInput(const std::string& deviceId); int32_t UnprepareRemoteInput(const std::string& deviceId); diff --git a/services/source/transport/src/distributed_input_source_transport.cpp b/services/source/transport/src/distributed_input_source_transport.cpp index 5f1892a..a65ce70 100644 --- a/services/source/transport/src/distributed_input_source_transport.cpp +++ b/services/source/transport/src/distributed_input_source_transport.cpp @@ -41,6 +41,19 @@ static SessionAttribute g_sessionAttr = { } }; +DistributedInputSourceTransport::~DistributedInputSourceTransport() +{ + std::unique_lock sessionLock(operationMutex_); + std::map::iterator iter = sessionDevMap_.begin(); + while (iter != sessionDevMap_.end()) { + CloseSession(iter->second); + } + sessionDevMap_.clear(); + devHardwareMap_.clear(); + + (void)RemoveSessionServer(DINPUT_PKG_NAME.c_str(), mySessionName_.c_str()); +} + static int32_t SessionOpened(int32_t sessionId, int32_t result) { return DistributedInput::DistributedInputSourceTransport::GetInstance().OnSessionOpened(sessionId, result); @@ -108,18 +121,6 @@ int32_t DistributedInputSourceTransport::Init() return SUCCESS; } -DistributedInputSourceTransport::~DistributedInputSourceTransport() -{ - std::map::iterator iter = sessionDevMap_.begin(); - while (iter != sessionDevMap_.end()) { - CloseSession(iter->second); - } - sessionDevMap_.clear(); - devHardwareMap_.clear(); - - (void)RemoveSessionServer(DINPUT_PKG_NAME.c_str(), mySessionName_.c_str()); -} - int32_t DistributedInputSourceTransport::CheckDeviceSessionState(const std::string &devId, const std::string &hwId) { std::unique_lock sessionLock(operationMutex_); @@ -224,9 +225,9 @@ void DistributedInputSourceTransport::CloseInputSoftbus(const std::string &remot } } -void DistributedInputSourceTransport::RegisteSourceRespCallback(std::shared_ptr callback) +void DistributedInputSourceTransport::RegisterSourceRespCallback(std::shared_ptr callback) { - DHLOGI("RegisteSourceRespCallback"); + DHLOGI("RegisterSourceRespCallback"); callback_ = callback; } diff --git a/services/source/transport/test/sourcetransunittest/BUILD.gn b/services/source/transport/test/sourcetransunittest/BUILD.gn index 806522e..7b246ee 100644 --- a/services/source/transport/test/sourcetransunittest/BUILD.gn +++ b/services/source/transport/test/sourcetransunittest/BUILD.gn @@ -60,7 +60,7 @@ ohos_unittest("distributed_input_sourcetrans_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", diff --git a/sinkhandler/BUILD.gn b/sinkhandler/BUILD.gn index 4daf24f..974e6b4 100644 --- a/sinkhandler/BUILD.gn +++ b/sinkhandler/BUILD.gn @@ -45,7 +45,7 @@ ohos_shared_library("libdinput_sink_handler") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", diff --git a/sinkhandler/src/distributed_input_sink_handler.cpp b/sinkhandler/src/distributed_input_sink_handler.cpp index 6253c1d..5919926 100644 --- a/sinkhandler/src/distributed_input_sink_handler.cpp +++ b/sinkhandler/src/distributed_input_sink_handler.cpp @@ -48,7 +48,7 @@ int32_t DistributedInputSinkHandler::InitSink(const std::string ¶ms) } auto waitStatus = proxyConVar_.wait_for(lock, std::chrono::milliseconds(INPUT_LOADSA_TIMEOUT_MS), - [this]() { return (DistributedInputClient::GetInstance().HasDInputSinkProxy()); }); + [this]() { return (DistributedInputClient::GetInstance().HasDInputSinkProxy()); }); if (!waitStatus) { DHLOGE("dinput load sa timeout."); return FAILURE_DIS; @@ -86,13 +86,13 @@ void DistributedInputSinkHandler::SALoadSinkCb::OnLoadSystemAbilitySuccess(int32 { currSystemAbilityId = systemAbilityId; currRemoteObject = remoteObject; - DHLOGI("DistributedInputSinkHandler OnLoadSystemAbilitySuccess"); + DHLOGI("DistributedInputSinkHandler OnLoadSystemAbilitySuccess. systemAbilityId=%d", systemAbilityId); } void DistributedInputSinkHandler::SALoadSinkCb::OnLoadSystemAbilityFail(int32_t systemAbilityId) { currSystemAbilityId = systemAbilityId; - DHLOGE("DistributedInputSinkHandler OnLoadSystemAbilityFail"); + DHLOGE("DistributedInputSinkHandler OnLoadSystemAbilityFail. systemAbilityId=%d", systemAbilityId); } IDistributedHardwareSink *GetSinkHardwareHandler() diff --git a/sinkhandler/test/unittest/BUILD.gn b/sinkhandler/test/unittest/BUILD.gn index 96006e7..c1ef5b1 100644 --- a/sinkhandler/test/unittest/BUILD.gn +++ b/sinkhandler/test/unittest/BUILD.gn @@ -63,7 +63,7 @@ ohos_unittest("distributed_input_sink_handler_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", diff --git a/sourcehandler/BUILD.gn b/sourcehandler/BUILD.gn index b3418b2..c204c03 100644 --- a/sourcehandler/BUILD.gn +++ b/sourcehandler/BUILD.gn @@ -45,7 +45,7 @@ ohos_shared_library("libdinput_source_handler") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", diff --git a/sourcehandler/src/distributed_input_source_handler.cpp b/sourcehandler/src/distributed_input_source_handler.cpp index 614cc73..613e780 100644 --- a/sourcehandler/src/distributed_input_source_handler.cpp +++ b/sourcehandler/src/distributed_input_source_handler.cpp @@ -48,7 +48,7 @@ int32_t DistributedInputSourceHandler::InitSource(const std::string ¶ms) } auto waitStatus = proxyConVar_.wait_for(lock, std::chrono::milliseconds(INPUT_LOADSA_TIMEOUT_MS), - [this]() { return (DistributedInputClient::GetInstance().HasDInputSourceProxy()); }); + [this]() { return (DistributedInputClient::GetInstance().HasDInputSourceProxy()); }); if (!waitStatus) { DHLOGE("dinput load sa timeout."); return FAILURE_DIS; @@ -94,11 +94,13 @@ void DistributedInputSourceHandler::SALoadSourceCb::OnLoadSystemAbilitySuccess(i { currSystemAbilityId = systemAbilityId; currRemoteObject = remoteObject; + DHLOGI("DistributedInputSourceHandler OnLoadSystemAbilitySuccess. systemAbilityId=%d", systemAbilityId); } void DistributedInputSourceHandler::SALoadSourceCb::OnLoadSystemAbilityFail(int32_t systemAbilityId) { currSystemAbilityId = systemAbilityId; + DHLOGE("DistributedInputSourceHandler OnLoadSystemAbilityFail. systemAbilityId=%d", systemAbilityId); } IDistributedHardwareSource *GetSourceHardwareHandler() diff --git a/sourcehandler/test/unittest/BUILD.gn b/sourcehandler/test/unittest/BUILD.gn index 772cec0..a7b4b35 100644 --- a/sourcehandler/test/unittest/BUILD.gn +++ b/sourcehandler/test/unittest/BUILD.gn @@ -65,7 +65,7 @@ ohos_unittest("distributed_input_source_handler_test") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "${innerkits_path}:libdinput_sdk", diff --git a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn index 370f939..6cda278 100644 --- a/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputclient_fuzzer/BUILD.gn @@ -65,7 +65,7 @@ ohos_fuzztest("DistributedInputClientFuzzTest") { "${distributedinput_path}/sourcehandler:libdinput_source_handler", "${distributedinput_path}/sinkhandler:libdinput_sink_handler", "${distributedinput_path}/inputdevicehandler:libdinput_handler", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", ] diff --git a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn index 1028c1d..bf1365a 100644 --- a/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputkit_fuzzer/BUILD.gn @@ -65,7 +65,7 @@ ohos_fuzztest("DistributedInputKitFuzzTest") { "${distributedinput_path}/sourcehandler:libdinput_source_handler", "${distributedinput_path}/sinkhandler:libdinput_sink_handler", "${distributedinput_path}/inputdevicehandler:libdinput_handler", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", ] diff --git a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn index d60a61b..da170ed 100644 --- a/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsinktransport_fuzzer/BUILD.gn @@ -47,7 +47,7 @@ ohos_fuzztest("DistributedInputSinkTransportFuzzTest") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/communication/dsoftbus/sdk:softbus_client", diff --git a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn index bf0970c..913807d 100644 --- a/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn +++ b/test/fuzztest/distributedinputsourcetransport_fuzzer/BUILD.gn @@ -49,7 +49,7 @@ ohos_fuzztest("DistributedInputSourceTransportFuzzTest") { ] deps = [ - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", "//foundation/distributedhardware/devicemanager/interfaces/inner_kits/native_cpp:devicemanagersdk", diff --git a/test/system/BUILD.gn b/test/system/BUILD.gn index a54f5d4..86d1bcc 100644 --- a/test/system/BUILD.gn +++ b/test/system/BUILD.gn @@ -79,7 +79,7 @@ ohos_unittest("distributed_input_test") { "${distributedinput_path}/sourcehandler:libdinput_source_handler", "${distributedinput_path}/sinkhandler:libdinput_sink_handler", "${distributedinput_path}/inputdevicehandler:libdinput_handler", - "//foundation/appexecfwk/standard/interfaces/innerkits/libeventhandler:libeventhandler", + "//foundation/bundlemanager/bundle_framework/interfaces/innerkits/libeventhandler:libeventhandler", "//utils/native/base:utils", "${fwk_utils_path}:distributedhardwareutils", ]