From 84c9be0c6bed45c13f6b0016d378d701b81c4c9d Mon Sep 17 00:00:00 2001 From: sin_dzzeng <13277932042@163.com> Date: Mon, 7 Mar 2022 17:44:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A8=8B=E5=BA=8F=E6=A1=86?= =?UTF-8?q?=E6=9E=B6UI=E8=A7=A3=E8=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: sin_dzzeng <13277932042@163.com> --- bundle.json | 2 +- devicemanager.gni | 3 +++ ext/pin_auth/BUILD.gn | 21 +++++++++++++------ ext/pin_auth/src/pin_auth.cpp | 8 +++++++ services/devicemanagerservice/BUILD.gn | 13 +++++++++--- .../src/authentication/dm_auth_manager.cpp | 8 +++++++ 6 files changed, 45 insertions(+), 10 deletions(-) diff --git a/bundle.json b/bundle.json index 06952ef47..242e4dcd9 100644 --- a/bundle.json +++ b/bundle.json @@ -14,7 +14,7 @@ "name": "device_manager_base", "subsystem": "distributedhardware", "syscap":[ "SystemCapability.DistributedHardware.DeviceManager" ], - "features":[], + "features":[ "device_manager_base_graphics" ], "adapted_system_type": [ "standard", "small" ], "rom": "2M", "ram": "16M", diff --git a/devicemanager.gni b/devicemanager.gni index 7487a8b32..a3b1c931b 100644 --- a/devicemanager.gni +++ b/devicemanager.gni @@ -26,3 +26,6 @@ ext_path = "${devicemanager_path}/ext" #----------------------compilation options--------------------------# dm_ldflags = [ "-lpthread" ] +declare_args() { + device_manager_base_graphics = true +} diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 41bfe4589..0255ec14e 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -16,7 +16,6 @@ if (defined(ohos_lite)) { } else { import("//build/ohos.gni") } - import("//foundation/distributedhardware/devicemanager/devicemanager.gni") if (defined(ohos_lite)) { @@ -62,21 +61,20 @@ if (defined(ohos_lite)) { sources = [ "src/ability/standard/dm_ability_manager.cpp", "src/pin_auth.cpp", - "src/pin_auth_ui.cpp", ] + if (device_manager_base_graphics) { + sources += [ "src/pin_auth_ui.cpp" ] + } + deps = [ - "${ext_path}/input_pin_dialog/dialog_ui/js:dialog_js_files_etc", - "${ext_path}/show_pin_dialog/dialog_ui/js:dialog_js_files_etc", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/security/deviceauth/services:deviceauth_sdk", "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", "//foundation/distributedhardware/devicemanager/services/devicemanagerservice:devicemanagerservice", - "//foundation/windowmanager/wm:libwm", "//utils/native/base:utils", ] @@ -100,6 +98,17 @@ if (defined(ohos_lite)) { "LOG_DOMAIN=0xD004100", ] + if (device_manager_base_graphics) { + defines += [ "SUPPORT_GRAPHICS" ] + + deps += [ + "${ext_path}/input_pin_dialog/dialog_ui/js:dialog_js_files_etc", + "${ext_path}/show_pin_dialog/dialog_ui/js:dialog_js_files_etc", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "//foundation/windowmanager/wm:libwm", + ] + } + subsystem_name = "distributedhardware" part_name = "device_manager_base" diff --git a/ext/pin_auth/src/pin_auth.cpp b/ext/pin_auth/src/pin_auth.cpp index 15c52772c..2fbedbd58 100644 --- a/ext/pin_auth/src/pin_auth.cpp +++ b/ext/pin_auth/src/pin_auth.cpp @@ -35,6 +35,7 @@ PinAuth::~PinAuth() int32_t PinAuth::ShowAuthInfo(std::string &authToken, std::shared_ptr authManager) { +#ifdef SUPPORT_GRAPHICS nlohmann::json jsonObject = nlohmann::json::parse(authToken, nullptr, false); if (jsonObject.is_discarded()) { LOGE("DecodeRequestAuth jsonStr error"); @@ -45,10 +46,14 @@ int32_t PinAuth::ShowAuthInfo(std::string &authToken, std::shared_ptrShowPinDialog(jsonObject[PIN_CODE_KEY], authManager); +#else + return DM_OK; +#endif } int32_t PinAuth::StartAuth(std::string &authToken, std::shared_ptr authManager) { +#ifdef SUPPORT_GRAPHICS nlohmann::json jsonObject = nlohmann::json::parse(authToken, nullptr, false); if (jsonObject.is_discarded()) { LOGE("DecodeRequestAuth jsonStr error"); @@ -59,6 +64,9 @@ int32_t PinAuth::StartAuth(std::string &authToken, std::shared_ptrInputPinDialog(jsonObject[PIN_CODE_KEY], authManager); +#else + return DM_OK; +#endif } int32_t PinAuth::VerifyAuthentication(std::string &authToken, const std::string &authParam) diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index ba6da08e0..2055bc3fa 100755 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -93,7 +93,6 @@ if (defined(ohos_lite)) { ] deps = [ - "${common_path}/include/dialog_ui/js:dialog_js_files_etc", "${innerkits_path}/native_cpp:devicemanagersdk", "${utils_path}:devicemanagerutils", "//base/account/os_account/frameworks/osaccount/native:os_account_innerkits", @@ -101,10 +100,18 @@ if (defined(ohos_lite)) { "//foundation/aafwk/standard/interfaces/innerkits/ability_manager:ability_manager", "//foundation/aafwk/standard/interfaces/innerkits/want:want", "//foundation/aafwk/standard/services/abilitymgr:abilityms", - "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", - "//foundation/windowmanager/wm:libwm", ] + if (device_manager_base_graphics) { + defines += [ "SUPPORT_GRAPHICS" ] + + deps += [ + "//foundation/windowmanager/wm:libwm", + "//foundation/ace/ace_engine/interfaces/innerkits/ui_service_manager:ui_service_mgr", + "${common_path}/include/dialog_ui/js:dialog_js_files_etc", + ] + } + external_deps = [ "ability_runtime:app_manager", "bundle_framework:appexecfwk_base", diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index 359721a01..6cd5f3386 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -25,9 +25,11 @@ #include "multiple_user_connector.h" #include "nlohmann/json.hpp" #include "parameter.h" +#ifdef SUPPORT_GRAPHICS #include "ui_service_mgr_client.h" #include "dialog_callback_stub.h" #include "dialog_callback.h" +#endif namespace OHOS { namespace DistributedHardware { @@ -540,7 +542,9 @@ int32_t DmAuthManager::AddMember(const std::string &deviceId) return DM_FAILED; } LOGI("DmAuthManager::authRequestContext CancelDisplay start"); +#ifdef SUPPORT_GRAPHICS Ace::UIServiceMgrClient::GetInstance()->CancelDialog(authResponseContext_->pageId); +#endif return DM_OK; } @@ -568,6 +572,7 @@ int32_t DmAuthManager::JoinNetwork() void DmAuthManager::AuthenticateFinish() { LOGI("DmAuthManager::AuthenticateFinish start"); +#ifdef SUPPORT_GRAPHICS if (authResponseState_ != nullptr) { if (authResponseState_->GetStateType() == AuthState::AUTH_RESPONSE_FINISH) { Ace::UIServiceMgrClient::GetInstance()->CancelDialog(authResponseContext_->pageId); @@ -617,6 +622,7 @@ void DmAuthManager::AuthenticateFinish() authRequestState_ = nullptr; authMessageProcessor_ = nullptr; } +#endif LOGI("DmAuthManager::AuthenticateFinish complete"); } @@ -689,6 +695,7 @@ int32_t DmAuthManager::GetPinCode() void DmAuthManager::ShowConfigDialog() { +#ifdef SUPPORT_GRAPHICS LOGI("ShowConfigDialog start"); nlohmann::json jsonObj; jsonObj[TAG_AUTH_TYPE] = AUTH_TYPE_PIN; @@ -709,6 +716,7 @@ void DmAuthManager::ShowConfigDialog() authMgr_->StartAuthProcess(atoi(params.c_str())); }); LOGI("ShowConfigDialog end"); +#endif } void DmAuthManager::ShowAuthInfoDialog() -- Gitee