From d67e952168afe349d166935dbb6a1256de90c161 Mon Sep 17 00:00:00 2001
From: lcaidm <lichen139@huawei.com>
Date: Mon, 7 Feb 2022 20:07:53 +0800
Subject: [PATCH] =?UTF-8?q?bug-fix/ace=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: lcaidm <lichen139@huawei.com>
---
 .../dialog_ui/js/pages/index/index.hml        |  4 +--
 .../dialog_ui/js/pages/index/index.js         | 35 +++++++++++--------
 .../src/authentication/dm_auth_manager.cpp    |  4 +--
 .../dependency/hichain/hichain_connector.cpp  |  1 +
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml
index 1515226bc..c8edca3fb 100644
--- a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml
+++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml
@@ -5,9 +5,7 @@
     <text class="title-list">
         请输入另一个设备显示的PIN码进行验证
     </text>
-
-    <input class="title-pin" id="input" type="number" value=""></input>
-
+    <input class="title-pin" id="input" type="number" onchange="onChange"></input>
     <div class="but">
         <button class="but1" onclick="onCancel">
             取消
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 fc6a23af6..c68e1a3dd 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
@@ -1,29 +1,34 @@
 import router from '@ohos.router';
 
 var numbs = 0;
+var code = 0;
+var inputVal = 0;
 export default {
     data: {
         pincode: router.getParams().pinCode,
     },
     onInit() {
-        console.info('getParams: ' + router.getParams());
+        code = router.getParams().pinCode;
     },
+    onChange(e){ 
+        inputVal = e.value; 
+    }, 
     onConfirm() {
-        console.info('click inpout confirm numbs'+ numbs);
-        console.info('click inpout confirm');
         numbs = numbs + 1;
-        console.info('click inpout confirm numbs'+ numbs);
-        console.info('click confirm start');
-        var input=  this.$element('input').value;
-        console.info('click confirm end');
-        console.info('input: ' + input);
-        console.info('pincode: ' + pincode);
-        if (input == pincode){
-            console.info('pincode: = input');
-            callNativeHandler(input, "0");
-        } else {
-            console.info('pincode: != input');
-        }
+        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");
+            }else{
+            console.info('click cancel code != inputVal');
+            }
+        }else{
+            console.info('click cancel numbs > 3 ');
+            callNativeHandler("EVENT_CONFIRM", "1");
+        }       
     },
     onCancel() {
         console.info('click cancel');
diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
index 6bc37f975..fba292bf6 100644
--- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
+++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp
@@ -325,6 +325,7 @@ void DmAuthManager::OnGroupCreated(int64_t requestId, const std::string &groupId
         softbusConnector_->GetSoftbusSession()->SendData(authResponseContext_->sessionId, message);
         return;
     }
+    authResponseContext_->code = GeneratePincode();
     authResponseContext_->groupId = groupId;
     authMessageProcessor_->SetResponseContext(authResponseContext_);
     std::string message = authMessageProcessor_->CreateSimpleMessage(MSG_TYPE_RESP_AUTH);
@@ -680,7 +681,6 @@ void DmAuthManager::ShowConfigDialog()
 void DmAuthManager::ShowAuthInfoDialog()
 {
     LOGI("DmAuthManager::ShowAuthInfoDialog start");
-    authResponseContext_->code = GeneratePincode();
     std::shared_ptr<IAuthentication> ptr;
     if (authenticationMap_.find(1) == authenticationMap_.end()) {
         LOGE("DmAuthManager::authenticationMap_ is null");
@@ -709,7 +709,7 @@ int32_t DmAuthManager::GetAuthenticationParam(DmAuthParam &authParam)
         LOGI("dmAbilityMgr_ is nullptr");
         return DM_POINT_NULL;
     }
-
+    
     dmAbilityMgr_->StartAbilityDone();
     AbilityRole role = dmAbilityMgr_->GetAbilityRole();
     authParam.direction = (int32_t)role;
diff --git a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp
index ab7b0d162..f1ce2b3ce 100644
--- a/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp
+++ b/services/devicemanagerservice/src/dependency/hichain/hichain_connector.cpp
@@ -196,6 +196,7 @@ int32_t HiChainConnector::AddMember(std::string deviceId, std::string &connectIn
     std::string tmpStr = jsonObj.dump();
     int64_t requestId = jsonObject[TAG_REQUEST_ID];
     int32_t ret = deviceGroupManager_->addMemberToGroup(requestId, DM_PKG_NAME.c_str(), tmpStr.c_str());
+    LOGI("HiChainConnector::tmpStr ::%s", tmpStr.c_str());
     LOGI("HiChainConnector::AddMember completed");
     return ret;
 }
-- 
Gitee