From 0c7135936b837e80c5e906dbc0816fb803eae04e Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Thu, 19 Sep 2024 13:44:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=93=9D=E9=BB=84=E5=B7=AE=E5=BC=82=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: li-tiangang4 --- bundle.json | 3 +-- dfx_utils/BUILD.gn | 1 - interfaces/ipc/src/distributed_input_client.cpp | 4 ++-- services/sink/sinkmanager/BUILD.gn | 2 -- services/source/transport/BUILD.gn | 2 -- services/state/BUILD.gn | 1 - 6 files changed, 3 insertions(+), 10 deletions(-) diff --git a/bundle.json b/bundle.json index 0c80f8b..265b5bb 100755 --- a/bundle.json +++ b/bundle.json @@ -44,8 +44,7 @@ "hitrace", "graphic_surface", "window_manager", - "openssl", - "graphic_2d" + "openssl" ] }, "build": { diff --git a/dfx_utils/BUILD.gn b/dfx_utils/BUILD.gn index 5ed35ce..fe8af2d 100755 --- a/dfx_utils/BUILD.gn +++ b/dfx_utils/BUILD.gn @@ -59,7 +59,6 @@ ohos_shared_library("libdinput_dfx_utils") { "hilog:libhilog", "hisysevent:libhisysevent", "ipc:ipc_core", - "json:nlohmann_json_static", "safwk:system_ability_fwk", "samgr:samgr_proxy", ] diff --git a/interfaces/ipc/src/distributed_input_client.cpp b/interfaces/ipc/src/distributed_input_client.cpp index a1faa31..adc0307 100644 --- a/interfaces/ipc/src/distributed_input_client.cpp +++ b/interfaces/ipc/src/distributed_input_client.cpp @@ -58,7 +58,7 @@ void DistributedInputClient::RegisterDInputCb::OnResult( DistributedInputClient::GetInstance().dHardWareFwkRstInfos.begin(); iter != DistributedInputClient::GetInstance().dHardWareFwkRstInfos.end(); ++iter) { - if (iter->devId == devId && iter->dhId == dhId && (iter->callback != nullptr)) { + if (iter->devId == devId && iter->dhId == dhId && iter->callback != nullptr) { iter->callback->OnRegisterResult(devId, dhId, status, ""); DistributedInputClient::GetInstance().dHardWareFwkRstInfos.erase(iter); return; @@ -74,7 +74,7 @@ void DistributedInputClient::UnregisterDInputCb::OnResult( DistributedInputClient::GetInstance().dHardWareFwkUnRstInfos.begin(); iter != DistributedInputClient::GetInstance().dHardWareFwkUnRstInfos.end(); ++iter) { - if (iter->devId == devId && iter->dhId == dhId && (iter->callback != nullptr)) { + if (iter->devId == devId && iter->dhId == dhId && iter->callback != nullptr) { iter->callback->OnUnregisterResult(devId, dhId, status, ""); DistributedInputClient::GetInstance().dHardWareFwkUnRstInfos.erase(iter); return; diff --git a/services/sink/sinkmanager/BUILD.gn b/services/sink/sinkmanager/BUILD.gn index 0c65940..a8122e3 100644 --- a/services/sink/sinkmanager/BUILD.gn +++ b/services/sink/sinkmanager/BUILD.gn @@ -80,9 +80,7 @@ ohos_shared_library("libdinput_sink") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", - "graphic_2d:librender_service_base", "graphic_surface:surface", "hilog:libhilog", "hisysevent:libhisysevent", diff --git a/services/source/transport/BUILD.gn b/services/source/transport/BUILD.gn index f5431b6..2d97d2a 100755 --- a/services/source/transport/BUILD.gn +++ b/services/source/transport/BUILD.gn @@ -64,11 +64,9 @@ ohos_shared_library("libdinput_source_trans") { "distributed_hardware_fwk:distributed_av_sender", "distributed_hardware_fwk:distributedhardwareutils", "distributed_hardware_fwk:libdhfwk_sdk", - "dsoftbus:softbus_client", "eventhandler:libeventhandler", "hilog:libhilog", "hitrace:hitrace_meter", - "ipc:ipc_core", "json:nlohmann_json_static", "libevdev:libevdev", "samgr:samgr_proxy", diff --git a/services/state/BUILD.gn b/services/state/BUILD.gn index 20e77df..0e83172 100644 --- a/services/state/BUILD.gn +++ b/services/state/BUILD.gn @@ -70,7 +70,6 @@ ohos_shared_library("libdinput_sink_state") { "hilog:libhilog", "hitrace:hitrace_meter", "ipc:ipc_core", - "json:nlohmann_json_static", "libevdev:libevdev", "safwk:system_ability_fwk", "samgr:samgr_proxy", -- Gitee