From 0748f4857661cf0543262fa00e8f7623ea1aa876 Mon Sep 17 00:00:00 2001 From: lcaidm Date: Mon, 14 Feb 2022 18:42:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91/bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9/=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: lcaidm --- .../include/dialog_ui/js/pages/index/index.css | 17 ++++++++--------- .../include/dialog_ui/js/pages/index/index.hml | 2 +- .../include/dialog_ui/js/pages/index/index.js | 14 ++++++++++++++ .../dialog_ui/js/pages/index/index.css | 8 ++++---- .../dialog_ui/js/pages/index/index.hml | 7 +++++-- .../dialog_ui/js/pages/index/index.js | 16 ++++++++++++---- ext/pin_auth/src/pin_auth_ui.cpp | 11 ++++++++--- .../dialog_ui/js/pages/index/index.css | 4 ++-- .../src/authentication/dm_auth_manager.cpp | 4 +--- 9 files changed, 55 insertions(+), 28 deletions(-) diff --git a/common/include/dialog_ui/js/pages/index/index.css b/common/include/dialog_ui/js/pages/index/index.css index 997f0c8af..024615c38 100644 --- a/common/include/dialog_ui/js/pages/index/index.css +++ b/common/include/dialog_ui/js/pages/index/index.css @@ -7,35 +7,34 @@ } .title { - font-size: 80px; + font-size: 70px; line-height: 150px; font-weight: 800; } .but { - width: 85%; + width: 90%; margin-top: 10%; text-align: center; height: 100px; } .but1 { - width: 30%; + width: 70%; height: 80px; - font-size: 50px; - margin-left: 10%; + font-size: 40px; } .but2 { width: 30%; height: 80px; - font-size: 50px; - margin-left: 55%; + font-size: 40px; + margin-left: 10%; } .title-list { - font-size: 70px; + font-size: 60px; line-height: 100px; - font-weight: 800; + font-weight: 500; } diff --git a/common/include/dialog_ui/js/pages/index/index.hml b/common/include/dialog_ui/js/pages/index/index.hml index 0ab94e3af..4a689e272 100644 --- a/common/include/dialog_ui/js/pages/index/index.hml +++ b/common/include/dialog_ui/js/pages/index/index.hml @@ -7,7 +7,7 @@
-
diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js index c68e1a3dd..514b6ec77 100644 --- a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js +++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js @@ -6,24 +6,32 @@ var inputVal = 0; export default { data: { pincode: router.getParams().pinCode, + isShow:false, + isTimes:3, }, onInit() { code = router.getParams().pinCode; + callNativeHandler("EVENT_CONFIRM", "2"); }, onChange(e){ inputVal = e.value; }, onConfirm() { numbs = numbs + 1; - if(numbs < 3){ + if(numbs <= 3){ console.info('click cancel numbs < 3 '); console.info('code: ' + code); console.info('inputVal: ' + inputVal); if(code == inputVal){ - console.info('click cancel code == inputVal'); - callNativeHandler("EVENT_INPUT", "0"); + console.info('click cancel code == inputVal'); + callNativeHandler("EVENT_INPUT", "0"); }else{ - console.info('click cancel code != inputVal'); + if(numbs == 3){ + callNativeHandler("EVENT_CONFIRM", "1"); + } + console.info('click cancel code != inputVal'); + this.isShow = true; + this.isTimes = 3 - numbs; } }else{ console.info('click cancel numbs > 3 '); diff --git a/ext/pin_auth/src/pin_auth_ui.cpp b/ext/pin_auth/src/pin_auth_ui.cpp index 51f76bdb4..9fc3459cd 100644 --- a/ext/pin_auth/src/pin_auth_ui.cpp +++ b/ext/pin_auth/src/pin_auth_ui.cpp @@ -68,9 +68,14 @@ int32_t PinAuthUi::InputPinDialog(int32_t code, std::shared_ptr a OHOS::Rosen::WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW, ACE_X, ACE_Y, ACE_WIDTH, ACE_HEIGHT, [authManager](int32_t id, const std::string& event, const std::string& params) { - Ace::UIServiceMgrClient::GetInstance()->CancelDialog(id); - LOGI("CancelDialog start id:%d,event:%s,parms:%s", id, event.c_str(), params.c_str()); - authManager->VerifyPinAuthAuthentication(params.c_str()); + if (strcmp(params.c_str(), "2") == 0) { + authManager->ClosePage(id); + } + if (strcmp(params.c_str(), "0") == 0 || strcmp(params.c_str(), "1") == 0) { + Ace::UIServiceMgrClient::GetInstance()->CancelDialog(id); + LOGI("CancelDialog start id:%d,event:%s,parms:%s", id, event.c_str(), params.c_str()); + authManager->VerifyPinAuthAuthentication(params.c_str()); + } }); LOGI("ShowConfigDialog end"); return DM_OK; diff --git a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css index 4e83197eb..08279e9a3 100644 --- a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css @@ -15,7 +15,7 @@ .title-list { font-size: 60px; line-height: 100px; - font-weight: 800; + font-weight: 600; } .title-pin { @@ -26,6 +26,6 @@ .but { width: 30%; - font-size: 50px; + font-size: 40px; height: 80px; } \ No newline at end of file diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index 2805e98ab..777697438 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -335,8 +335,6 @@ void DmAuthManager::OnGroupCreated(int64_t requestId, const std::string &groupId void DmAuthManager::OnMemberJoin(int64_t requestId, int32_t status) { - LOGI("DmAuthManager OnMemberJoin start"); - CancelDisplay(); LOGE("DmAuthManager OnMemberJoin start"); if (authRequestState_ != nullptr) { timerMap_[ADD_TIMEOUT_TASK]->Stop(SESSION_CANCEL_TIMEOUT); @@ -570,7 +568,7 @@ void DmAuthManager::AuthenticateFinish() } if (authResponseContext_->state == AuthState::AUTH_REQUEST_INPUT) { - CancelDisplay(); + Ace::UIServiceMgrClient::GetInstance()->CancelDialog(authResponseContext_->aceId); } listener_->OnAuthResult(authRequestContext_->hostPkgName, authRequestContext_->deviceId, -- Gitee