From e461c122802bcb1d3a573ef24cd8451b720cd6d7 Mon Sep 17 00:00:00 2001 From: zero-cyc Date: Tue, 25 Jan 2022 11:08:31 +0800 Subject: [PATCH 1/6] chenlien@huawei.com Signed-off-by: zero-cyc Change-Id: Ia02be93740de700ffe9a4dac7b66082cc71b302b --- services/devicemanagerservice/BUILD.gn | 2 +- test/unittest/BUILD.gn | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index ea83ecfab..8d9799369 100644 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -102,12 +102,12 @@ if (defined(ohos_lite)) { external_deps = [ "ability_runtime:app_manager", - "appexecfwk_standard:libeventhandler", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "dsoftbus_standard:softbus_client", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", diff --git a/test/unittest/BUILD.gn b/test/unittest/BUILD.gn index e0c86fdd8..fd0d387c7 100644 --- a/test/unittest/BUILD.gn +++ b/test/unittest/BUILD.gn @@ -358,12 +358,12 @@ ohos_static_library("device_manager_test") { ] external_deps = [ - "appexecfwk_standard:libeventhandler", "bundle_framework:appexecfwk_base", "bundle_framework:appexecfwk_core", "ces_standard:cesfwk_core", "ces_standard:cesfwk_innerkits", "dsoftbus_standard:softbus_client", + "eventhandler:libeventhandler", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", -- Gitee From eec664abec919d4006549cc316db8177cd6c415b Mon Sep 17 00:00:00 2001 From: puhui Date: Tue, 25 Jan 2022 17:54:51 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- .../src/authentication/dm_auth_manager.cpp | 2 +- .../dependency/softbus/softbus_connector.cpp | 7 +- .../UTTest_auth_message_processor.cpp | 120 ++++++----------- test/unittest/UTTest_auth_request_state.cpp | 123 ++++-------------- test/unittest/UTTest_auth_response_state.cpp | 80 +++--------- .../UTTest_device_manager_service.cpp | 20 --- ...UTTest_device_manager_service_listener.cpp | 6 +- test/unittest/UTTest_dm_auth_manager.cpp | 65 +++------ test/unittest/UTTest_hichain_connector.cpp | 3 +- test/unittest/UTTest_softbus_session.cpp | 3 +- 10 files changed, 118 insertions(+), 311 deletions(-) diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index 0f11031b5..cde8a2e3c 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -97,7 +97,7 @@ int32_t DmAuthManager::AuthenticateDevice(const std::string &pkgName, int32_t au } if (extra.empty()) { LOGE("AuthenticateDevice failed, extra is empty"); - listener_->OnAuthResult(pkgName, deviceId, "", AuthState::AUTH_REQUEST_INIT, DM_AUTH_BUSINESS_BUSY); + listener_->OnAuthResult(pkgName, deviceId, "", AuthState::AUTH_REQUEST_INIT, DM_INPUT_PARA_EMPTY); return DM_INPUT_PARA_EMPTY; } diff --git a/services/devicemanagerservice/src/dependency/softbus/softbus_connector.cpp b/services/devicemanagerservice/src/dependency/softbus/softbus_connector.cpp index bc012d3f3..413733922 100644 --- a/services/devicemanagerservice/src/dependency/softbus/softbus_connector.cpp +++ b/services/devicemanagerservice/src/dependency/softbus/softbus_connector.cpp @@ -443,14 +443,15 @@ void SoftbusConnector::OnSoftBusDeviceOnline(NodeBasicInfo *info) return; } - if (discoveryDeviceInfoMap_.empty()) { - return; - } DmDeviceInfo dmDeviceInfo; CovertNodeBasicInfoToDmDevice(*info, dmDeviceInfo); for (auto &iter : stateCallbackMap_) { iter.second->OnDeviceOnline(iter.first, dmDeviceInfo); } + + if (discoveryDeviceInfoMap_.empty()) { + return; + } // remove the discovery node map uint8_t udid[UDID_BUF_LEN] = {0}; int32_t ret = diff --git a/test/unittest/UTTest_auth_message_processor.cpp b/test/unittest/UTTest_auth_message_processor.cpp index 2aa55bf3f..e6199f77e 100644 --- a/test/unittest/UTTest_auth_message_processor.cpp +++ b/test/unittest/UTTest_auth_message_processor.cpp @@ -37,6 +37,10 @@ void AuthMessageProcessorTest::TearDownTestCase() } namespace { + +std::shared_ptr softbusConnector = std::make_shared(); +std::shared_ptr listener = std::make_shared(); +std::shared_ptr hiChainConnector_ = std::make_shared(); /** * @tc.name: AuthMessageProcessor::CreateNegotiateMessage_001 * @tc.desc: 1 set cryptoAdapter_ to null @@ -47,10 +51,7 @@ namespace { */ HWTEST_F(AuthMessageProcessorTest, CreateNegotiateMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -73,7 +74,6 @@ HWTEST_F(AuthMessageProcessorTest, CreateNegotiateMessage_001, testing::ext::Tes jsonObject[TAG_LOCAL_DEVICE_ID] = authMessageProcessor->authResponseContext_->localDeviceId; std::string str2 = jsonObject.dump(); ASSERT_EQ(str1, str2); - sleep(15); } /** @@ -84,10 +84,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateNegotiateMessage_001, testing::ext::Tes */ HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authRequestContext_ = std::make_shared(); nlohmann::json jsona; @@ -102,7 +100,6 @@ HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::Tes std::string str1 = jsona.dump(); std::string str2 = jsonObj.dump(); ASSERT_EQ(str1, str2); - sleep(15); } /** @@ -113,10 +110,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::Tes */ HWTEST_F(AuthMessageProcessorTest, CreateResponseAuthMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); nlohmann::json jsona; @@ -143,7 +138,6 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseAuthMessage_001, testing::ext:: std::string str1 = jsona.dump(); std::string str2 = jsonObj.dump(); ASSERT_EQ(str1, str2); - sleep(15); } /** @@ -154,9 +148,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseAuthMessage_001, testing::ext:: */ HWTEST_F(AuthMessageProcessorTest, CreateResponseFinishMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); nlohmann::json jsona; @@ -167,7 +160,6 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseFinishMessage_001, testing::ext std::string str1 = jsona.dump(); std::string str2 = jsonObj.dump(); ASSERT_EQ(str1, str2); - sleep(15); } /** @@ -178,9 +170,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseFinishMessage_001, testing::ext */ HWTEST_F(AuthMessageProcessorTest, ParseResponseFinishMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -190,7 +181,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseResponseFinishMessage_001, testing::ext: authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseResponseFinishMessage(jsonObj); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -201,9 +191,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseResponseFinishMessage_001, testing::ext: */ HWTEST_F(AuthMessageProcessorTest, ParseAuthResponseMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); nlohmann::json jsona; @@ -226,7 +215,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthResponseMessage_001, testing::ext::T authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseAuthResponseMessage(jsona); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -237,9 +225,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthResponseMessage_001, testing::ext::T */ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -262,7 +249,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_001, testing::ext::Te authMessageProcessor->authSplitJsonList_.push_back(jsonThumbnail); int32_t ret = authMessageProcessor->ParseAuthRequestMessage(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -273,9 +259,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_001, testing::ext::Te */ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -298,7 +283,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_002, testing::ext::Te authMessageProcessor->authSplitJsonList_.push_back(jsonThumbnail); int32_t ret = authMessageProcessor->ParseAuthRequestMessage(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -309,9 +293,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_002, testing::ext::Te */ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -327,7 +310,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::Test authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseNegotiateMessage(jsonObj); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -338,9 +320,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::Test */ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -356,7 +337,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::Test authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseNegotiateMessage(jsonObj); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -367,9 +347,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::Test */ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -385,7 +364,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::Test authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseNegotiateMessage(jsonObj); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -396,9 +374,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::Test */ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -414,7 +391,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::Test authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseNegotiateMessage(jsonObj); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -425,9 +401,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::Test */ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -443,7 +418,6 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::Test authMessageProcessor->SetResponseContext(authResponseContext); authMessageProcessor->ParseNegotiateMessage(jsonObj); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -454,14 +428,12 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::Test */ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authRequestContext = std::make_shared(); authMessageProcessor->SetRequestContext(authRequestContext); ASSERT_EQ(authMessageProcessor->authRequestContext_, authRequestContext); - sleep(15); } /** @@ -472,14 +444,12 @@ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_001, testing::ext::TestSize */ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authRequestContext = std::make_shared(); authMessageProcessor->SetRequestContext(nullptr); ASSERT_EQ(authMessageProcessor->authRequestContext_, nullptr); - sleep(15); } /** @@ -490,14 +460,12 @@ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_002, testing::ext::TestSize */ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); ASSERT_EQ(authMessageProcessor->authResponseContext_, authResponseContext); - sleep(15); } /** @@ -508,14 +476,12 @@ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_001, testing::ext::TestSiz */ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(nullptr); ASSERT_EQ(authMessageProcessor->authResponseContext_, nullptr); - sleep(15); } /** @@ -526,14 +492,12 @@ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_002, testing::ext::TestSiz */ HWTEST_F(AuthMessageProcessorTest, GetResponseContext_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseContext = authMessageProcessor->GetResponseContext(); ASSERT_EQ(authResponseContext, authMessageProcessor->authResponseContext_); - sleep(15); } /** @@ -544,14 +508,12 @@ HWTEST_F(AuthMessageProcessorTest, GetResponseContext_001, testing::ext::TestSiz */ HWTEST_F(AuthMessageProcessorTest, GetResponseContext_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr hiChainConnector_ = std::make_shared(); + std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseContext = authMessageProcessor->GetResponseContext(); ASSERT_NE(authResponseContext, nullptr); - sleep(15); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_auth_request_state.cpp b/test/unittest/UTTest_auth_request_state.cpp index 92cf2951f..887022005 100644 --- a/test/unittest/UTTest_auth_request_state.cpp +++ b/test/unittest/UTTest_auth_request_state.cpp @@ -41,6 +41,9 @@ std::string CONFIRM_TIMEOUT_TASK = "confirmTimeoutTask"; std::string INPUT_TIMEOUT_TASK = "inputTimeoutTask"; std::string ADD_TIMEOUT_TASK = "addTimeoutTask"; +std::shared_ptr softbusConnector = std::make_shared(); +std::shared_ptr listener = std::make_shared(); +std::shared_ptr hiChainConnector = std::make_shared(); /** * @tc.name: AuthRequestInitState::SetAuthManager_001 * @tc.desc: 1 set authManager not null @@ -51,11 +54,7 @@ std::string ADD_TIMEOUT_TASK = "addTimeoutTask"; */ HWTEST_F(AuthRequestStateTest, SetAuthManager_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = - std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->authManager_.use_count(); @@ -90,15 +89,12 @@ HWTEST_F(AuthRequestStateTest, SetAuthManager_002, testing::ext::TestSize.Level0 */ HWTEST_F(AuthRequestStateTest, TransitionTo_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager = nullptr; authRequestState->authManager_ = authManager; int32_t ret = authRequestState->TransitionTo(std::make_shared()); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -111,9 +107,7 @@ HWTEST_F(AuthRequestStateTest, TransitionTo_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, TransitionTo_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr context = std::make_shared(); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr negotiateStartTimer = std::make_shared(NEGOTIATE_TIMEOUT_TASK); @@ -126,11 +120,11 @@ HWTEST_F(AuthRequestStateTest, TransitionTo_002, testing::ext::TestSize.Level0) authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); context->sessionId = 123456; authManager->SetAuthRequestState(authRequestState); + authManager->softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authManager); authRequestState->SetAuthContext(context); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->TransitionTo(std::make_shared()); ASSERT_EQ(ret, DM_OK); - sleep(20); } /** @@ -145,7 +139,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_001, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_INIT); - sleep(15); } /** @@ -158,15 +151,12 @@ HWTEST_F(AuthRequestStateTest, GetStateType_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager = nullptr; authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -179,9 +169,7 @@ HWTEST_F(AuthRequestStateTest, Enter_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -192,7 +180,6 @@ HWTEST_F(AuthRequestStateTest, Enter_002, testing::ext::TestSize.Level0) authRequestState->SetAuthContext(context); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -207,7 +194,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_002, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_NEGOTIATE); - sleep(15); } /** @@ -220,14 +206,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_002, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_003, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -240,11 +223,8 @@ HWTEST_F(AuthRequestStateTest, Enter_003, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_004, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -259,7 +239,6 @@ HWTEST_F(AuthRequestStateTest, Enter_004, testing::ext::TestSize.Level0) authRequestState->SetAuthContext(context); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -274,7 +253,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_003, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_NEGOTIATE_DONE); - sleep(15); } /** @@ -287,14 +265,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_003, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_005, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -307,11 +282,8 @@ HWTEST_F(AuthRequestStateTest, Enter_005, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_006, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr negotiateStartTimer = std::make_shared(NEGOTIATE_TIMEOUT_TASK); authManager->timerMap_[NEGOTIATE_TIMEOUT_TASK] = negotiateStartTimer; authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -319,6 +291,7 @@ HWTEST_F(AuthRequestStateTest, Enter_006, testing::ext::TestSize.Level0) authManager->authRequestContext_ = std::make_shared(); authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); authManager->authMessageProcessor_->SetResponseContext(authManager->authResponseContext_); + authManager->softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authManager); authManager->SetAuthRequestState(authRequestState); authRequestState->SetAuthManager(authManager); std::shared_ptr context = std::make_shared(); @@ -326,7 +299,6 @@ HWTEST_F(AuthRequestStateTest, Enter_006, testing::ext::TestSize.Level0) authRequestState->SetAuthContext(context); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -341,7 +313,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_004, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_REPLY); - sleep(15); } /** @@ -354,14 +325,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_004, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_007, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -374,11 +342,8 @@ HWTEST_F(AuthRequestStateTest, Enter_007, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_008, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr inputStartTimer = std::make_shared(CONFIRM_TIMEOUT_TASK); authManager->timerMap_[CONFIRM_TIMEOUT_TASK] = inputStartTimer; authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -395,7 +360,6 @@ HWTEST_F(AuthRequestStateTest, Enter_008, testing::ext::TestSize.Level0) authRequestState->SetAuthContext(context); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -410,7 +374,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_005, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_INPUT); - sleep(15); } /** @@ -423,14 +386,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_005, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_009, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -443,14 +403,11 @@ HWTEST_F(AuthRequestStateTest, Enter_009, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_010, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -465,7 +422,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_006, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_JOIN); - sleep(15); } /** @@ -478,14 +434,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_006, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_011, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -498,10 +451,7 @@ HWTEST_F(AuthRequestStateTest, Enter_011, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_012, testing::ext::TestSize.Level0) { - printf("1\n"); - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -511,18 +461,16 @@ HWTEST_F(AuthRequestStateTest, Enter_012, testing::ext::TestSize.Level0) authManager->authResponseContext_->code = 123; authManager->authResponseContext_->requestId = 234; authManager->authResponseContext_->deviceId = "234"; - printf("3\n"); authRequestState->SetAuthManager(authManager); authManager->SetAuthRequestState(authRequestState); + authManager->hiChainConnector_->RegisterHiChainCallback(authManager); + authManager->softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authManager); std::shared_ptr context = std::make_shared(); - printf("4\n"); context->deviceId = "44444"; context->sessionId = 55555; authRequestState->SetAuthContext(context); - printf("5\n"); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -537,7 +485,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_007, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_NETWORK); - sleep(15); } /** @@ -550,14 +497,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_007, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_013, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -570,10 +514,7 @@ HWTEST_F(AuthRequestStateTest, Enter_013, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_014, testing::ext::TestSize.Level0) { - printf("1\n"); - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr authenticateStartTimer = std::make_shared(AUTHENTICATE_TIMEOUT_TASK); authManager->timerMap_[AUTHENTICATE_TIMEOUT_TASK] = authenticateStartTimer; @@ -583,13 +524,11 @@ HWTEST_F(AuthRequestStateTest, Enter_014, testing::ext::TestSize.Level0) authManager->authRequestState_ = std::make_shared(); authManager->authMessageProcessor_->SetResponseContext(authManager->authResponseContext_); authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); + authManager->softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authManager); authManager->SetAuthRequestState(authRequestState); - printf("3\n"); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->Enter(); - printf("4\n"); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -604,7 +543,6 @@ HWTEST_F(AuthRequestStateTest, GetStateType_008, testing::ext::TestSize.Level0) std::shared_ptr authRequestState = std::make_shared(); int32_t ret = authRequestState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_REQUEST_FINISH); - sleep(15); } /** @@ -617,14 +555,11 @@ HWTEST_F(AuthRequestStateTest, GetStateType_008, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_015, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -637,11 +572,8 @@ HWTEST_F(AuthRequestStateTest, Enter_015, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_016, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); std::shared_ptr inputStartTimer = std::make_shared(CONFIRM_TIMEOUT_TASK); authManager->timerMap_[CONFIRM_TIMEOUT_TASK] = inputStartTimer; authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -659,7 +591,6 @@ HWTEST_F(AuthRequestStateTest, Enter_016, testing::ext::TestSize.Level0) authRequestState->SetAuthContext(context); int32_t ret = authRequestState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_auth_response_state.cpp b/test/unittest/UTTest_auth_response_state.cpp index ace33012d..a90c2b075 100644 --- a/test/unittest/UTTest_auth_response_state.cpp +++ b/test/unittest/UTTest_auth_response_state.cpp @@ -37,6 +37,9 @@ void AuthResponseStateTest::TearDownTestCase() } namespace { +std::shared_ptr softbusConnector = std::make_shared(); +std::shared_ptr listener = std::make_shared(); +std::shared_ptr hiChainConnector = std::make_shared(); /** * @tc.name: AuthResponseInitState::SetAuthManager_001 * @tc.desc: 1 set authManager not null @@ -47,14 +50,11 @@ namespace { */ HWTEST_F(AuthResponseStateTest, SetAuthManager_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->authManager_.use_count(); ASSERT_EQ(ret, 1); - sleep(15); } /** @@ -71,7 +71,6 @@ HWTEST_F(AuthResponseStateTest, SetAuthManager_002, testing::ext::TestSize.Level authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->authManager_.use_count(); ASSERT_EQ(ret, 0); - sleep(15); } /** @@ -84,15 +83,12 @@ HWTEST_F(AuthResponseStateTest, SetAuthManager_002, testing::ext::TestSize.Level */ HWTEST_F(AuthResponseStateTest, TransitionTo_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager = nullptr; authResponseState->authManager_ = authManager; int32_t ret = authResponseState->TransitionTo(std::make_shared()); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -105,9 +101,7 @@ HWTEST_F(AuthResponseStateTest, TransitionTo_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, TransitionTo_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr context = std::make_shared(); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseState_ = std::make_shared(); @@ -118,7 +112,6 @@ HWTEST_F(AuthResponseStateTest, TransitionTo_002, testing::ext::TestSize.Level0) authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->TransitionTo(std::make_shared()); ASSERT_EQ(ret, DM_OK); - sleep(20); } /** @@ -133,7 +126,6 @@ HWTEST_F(AuthResponseStateTest, GetStateType_001, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_RESPONSE_INIT); - sleep(15); } /** @@ -148,7 +140,6 @@ HWTEST_F(AuthResponseStateTest, Enter_001, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -163,7 +154,6 @@ HWTEST_F(AuthResponseStateTest, GetStateType_002, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_RESPONSE_NEGOTIATE); - sleep(15); } /** @@ -176,15 +166,12 @@ HWTEST_F(AuthResponseStateTest, GetStateType_002, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager = nullptr; authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -197,11 +184,8 @@ HWTEST_F(AuthResponseStateTest, Enter_002, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_003, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); - std::shared_ptr hiChainConnector = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -211,6 +195,7 @@ HWTEST_F(AuthResponseStateTest, Enter_003, testing::ext::TestSize.Level0) authManager->authResponseContext_->localDeviceId = "222"; authManager->authMessageProcessor_->SetResponseContext(authManager->authResponseContext_); authManager->authMessageProcessor_->SetRequestContext(authManager->authRequestContext_); + authManager->softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authManager); authResponseState->SetAuthManager(authManager); std::shared_ptr context = std::make_shared(); context->deviceId = "123456"; @@ -232,7 +217,6 @@ HWTEST_F(AuthResponseStateTest, GetStateType_003, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_RESPONSE_CONFIRM); - sleep(15); } /** @@ -245,14 +229,11 @@ HWTEST_F(AuthResponseStateTest, GetStateType_003, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_004, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -265,14 +246,11 @@ HWTEST_F(AuthResponseStateTest, Enter_004, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_005, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -287,7 +265,6 @@ HWTEST_F(AuthResponseStateTest, GetStateType_004, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_RESPONSE_GROUP); - sleep(15); } /** @@ -300,14 +277,11 @@ HWTEST_F(AuthResponseStateTest, GetStateType_004, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_006, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -320,19 +294,13 @@ HWTEST_F(AuthResponseStateTest, Enter_006, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_007, testing::ext::TestSize.Level0) { - printf("1\n"); - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); - printf("2\n"); authResponseState->SetAuthManager(authManager); - printf("3\n"); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -347,7 +315,6 @@ HWTEST_F(AuthResponseStateTest, GetStateType_005, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_RESPONSE_SHOW); - sleep(15); } /** @@ -360,14 +327,11 @@ HWTEST_F(AuthResponseStateTest, GetStateType_005, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_008, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -380,14 +344,11 @@ HWTEST_F(AuthResponseStateTest, Enter_008, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_009, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } /** @@ -402,7 +363,6 @@ HWTEST_F(AuthResponseStateTest, GetStateType_006, testing::ext::TestSize.Level0) std::shared_ptr authResponseState = std::make_shared(); int32_t ret = authResponseState->GetStateType(); ASSERT_EQ(ret, AuthState::AUTH_RESPONSE_FINISH); - sleep(15); } /** @@ -415,14 +375,11 @@ HWTEST_F(AuthResponseStateTest, GetStateType_006, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_010, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_FAILED); - sleep(15); } /** @@ -435,9 +392,7 @@ HWTEST_F(AuthResponseStateTest, Enter_010, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_011, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager->authRequestState_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); @@ -457,7 +412,6 @@ HWTEST_F(AuthResponseStateTest, Enter_011, testing::ext::TestSize.Level0) authResponseState->SetAuthContext(context); int32_t ret = authResponseState->Enter(); ASSERT_EQ(ret, DM_OK); - sleep(15); } } // namespace } // namespace DistributedHardware diff --git a/test/unittest/UTTest_device_manager_service.cpp b/test/unittest/UTTest_device_manager_service.cpp index 3a995051d..28256c67f 100644 --- a/test/unittest/UTTest_device_manager_service.cpp +++ b/test/unittest/UTTest_device_manager_service.cpp @@ -337,26 +337,6 @@ HWTEST_F(DeviceManagerServiceTest, VerifyAuthentication_001, testing::ext::TestS int ret = DeviceManagerService::GetInstance().VerifyAuthentication(authParam); EXPECT_EQ(ret, DM_NOT_INIT); } - -/** - * @tc.name: VerifyAuthentication_002 - * @tc.desc:Set intFlag for VerifyAuthentication to true and set authParam = "jdjjjj"，The return value is DM_OK - * @tc.type: FUNC - * @tc.require: AR000GHSJK - */ -HWTEST_F(DeviceManagerServiceTest, VerifyAuthentication_002, testing::ext::TestSize.Level0) -{ - DeviceManagerService::GetInstance().intFlag_ = true; - std::string authParam = "jdjjjj"; - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener_ = std::make_shared(); - DeviceManagerService::GetInstance().authMgr_ = - std::make_shared(softbusConnector, listener_, nullptr); - std::shared_ptr inputStartTimer = std::make_shared(INPUT_TIMEOUT_TASK); - DeviceManagerService::GetInstance().authMgr_->timerMap_[INPUT_TIMEOUT_TASK] = inputStartTimer; - int ret = DeviceManagerService::GetInstance().VerifyAuthentication(authParam); - EXPECT_EQ(ret, DM_FAILED); -} } // namespace } // namespace DistributedHardware } // namespace OHOS diff --git a/test/unittest/UTTest_device_manager_service_listener.cpp b/test/unittest/UTTest_device_manager_service_listener.cpp index 3cef42c3f..8f85f3dd6 100644 --- a/test/unittest/UTTest_device_manager_service_listener.cpp +++ b/test/unittest/UTTest_device_manager_service_listener.cpp @@ -63,7 +63,7 @@ HWTEST_F(DeviceManagerServiceListenerTest, OnDeviceStateChange_001, testing::ext std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); int32_t dmState = pReq->GetDeviceState(); - EXPECT_EQ(1, dmState); + EXPECT_EQ(0, dmState); } /** @@ -83,7 +83,7 @@ HWTEST_F(DeviceManagerServiceListenerTest, OnAuthResult_001, testing::ext::TestS listener_->OnAuthResult(pkgName, deviceId, token, status, reason); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); - std ::string ret = pReq->GetPkgName(); + std::string ret = pReq->GetPkgName(); EXPECT_EQ(ret, pkgName); } @@ -104,7 +104,7 @@ HWTEST_F(DeviceManagerServiceListenerTest, OnVerifyAuthResult_001, testing::ext: listener_->OnVerifyAuthResult(pkgName, deviceId, resultCode, flag); std::shared_ptr pReq = std::static_pointer_cast(listener_->ipcServerListener_.req_); - std ::string ret = pReq->GetDeviceId(); + std::string ret = pReq->GetDeviceId(); EXPECT_EQ(ret, deviceId); } } // namespace diff --git a/test/unittest/UTTest_dm_auth_manager.cpp b/test/unittest/UTTest_dm_auth_manager.cpp index 651f58aff..2042836cd 100644 --- a/test/unittest/UTTest_dm_auth_manager.cpp +++ b/test/unittest/UTTest_dm_auth_manager.cpp @@ -44,6 +44,10 @@ std::string CONFIRM_TIMEOUT_TASK = "confirmTimeoutTask"; std::string INPUT_TIMEOUT_TASK = "inputTimeoutTask"; std::string ADD_TIMEOUT_TASK = "addTimeoutTask"; +std::shared_ptr softbusConnector = std::make_shared(); +std::shared_ptr listener = std::make_shared(); +std::shared_ptr hiChainConnector_ = std::make_shared(); + /** * @tc.name: DmAuthManager::UnAuthenticateDevice_001 * @tc.desc: Call unauthenticateddevice to check whether the return value is DM_ FAILED @@ -52,9 +56,7 @@ std::string ADD_TIMEOUT_TASK = "addTimeoutTask"; */ HWTEST_F(DmAuthManagerTest, UnAuthenticateDevice_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr sessionSession = std::shared_ptr(); std::shared_ptr authRequestContext = std::make_shared(); std::string pkgName = ""; @@ -71,9 +73,7 @@ HWTEST_F(DmAuthManagerTest, UnAuthenticateDevice_001, testing::ext::TestSize.Lev */ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -81,7 +81,7 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSiz authManager->authResponseContext_ = nullptr; authManager->SetAuthRequestState(authRequestState); int32_t ret = authManager->HandleAuthenticateTimeout(); - ASSERT_EQ(ret, DM_FAILED); + ASSERT_EQ(ret, DM_OK); } /** @@ -92,9 +92,7 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSiz */ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -112,9 +110,7 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_002, testing::ext::TestSiz */ HWTEST_F(DmAuthManagerTest, EstablishAuthChannel_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr sessionSession = std::shared_ptr(); std::shared_ptr authRequestContext = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); @@ -133,17 +129,16 @@ HWTEST_F(DmAuthManagerTest, EstablishAuthChannel_001, testing::ext::TestSize.Lev */ HWTEST_F(DmAuthManagerTest, StartAuthProcess_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); authManager->SetAuthResponseState(authResponseState); int32_t action = 0; - int32_t ret = authManager->StartAuthProcess(action); - ASSERT_EQ(ret, DM_FAILED); + authManager->StartAuthProcess(action); + bool ret = authManager->authRequestContext_->deviceName.empty(); + ASSERT_EQ(ret, true); } /** @@ -154,9 +149,7 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, StartAuthProcess_002, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -164,6 +157,7 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_002, testing::ext::TestSize.Level0) authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->SetAuthResponseState(authResponseState); authManager->authResponseContext_->sessionId = 111; + authManager->softbusConnector_->GetSoftbusSession()->RegisterSessionCallback(authManager); int32_t action = 1; int32_t ret = authManager->StartAuthProcess(action); ASSERT_EQ(ret, DM_OK); @@ -177,9 +171,7 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_002, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, CreateGroup_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); @@ -201,14 +193,10 @@ HWTEST_F(DmAuthManagerTest, CreateGroup_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); - std::shared_ptr joinStartTimer = std::make_shared(ADD_TIMEOUT_TASK); - authManager->timerMap_[ADD_TIMEOUT_TASK] = joinStartTimer; authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->authResponseContext_ = std::make_shared(); nlohmann::json jsonObject; @@ -217,12 +205,8 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) authManager->authResponseContext_->code = 123; authManager->authResponseContext_->requestId = 234; authManager->authResponseContext_->deviceId = "234"; - jsonObject[TAG_GROUP_ID] = authManager->authResponseContext_->groupId; - jsonObject[TAG_GROUP_NAME] = authManager->authResponseContext_->groupName; - jsonObject[PIN_CODE_KEY] = authManager->authResponseContext_->code; - jsonObject[TAG_REQUEST_ID] = authManager->authResponseContext_->requestId; - jsonObject[TAG_DEVICE_ID] = authManager->authResponseContext_->deviceId; std::string deviceId = "44444"; + authManager->hiChainConnector_->RegisterHiChainCallback(authManager); authManager->SetAuthResponseState(authResponseState); int32_t ret = authManager->AddMember(deviceId); ASSERT_EQ(ret, DM_OK); @@ -237,9 +221,7 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, JoinNetwork_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr authenticateStartTimer = std::make_shared(AUTHENTICATE_TIMEOUT_TASK); authManager->timerMap_[AUTHENTICATE_TIMEOUT_TASK] = authenticateStartTimer; @@ -260,9 +242,7 @@ HWTEST_F(DmAuthManagerTest, JoinNetwork_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, SetAuthResponseState_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseState_ = std::make_shared(); authManager->SetAuthResponseState(authResponseState); @@ -278,11 +258,8 @@ HWTEST_F(DmAuthManagerTest, SetAuthResponseState_001, testing::ext::TestSize.Lev */ HWTEST_F(DmAuthManagerTest, GetPinCode_001, testing::ext::TestSize.Level0) { - std::shared_ptr softbusConnector = std::make_shared(); - std::shared_ptr listener = std::make_shared(); - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, nullptr); + std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); authManager->authResponseContext_ = std::make_shared(); - ; int32_t ret = authManager->GetPinCode(); ASSERT_EQ(ret, authManager->authResponseContext_->code); } diff --git a/test/unittest/UTTest_hichain_connector.cpp b/test/unittest/UTTest_hichain_connector.cpp index 3e1ea6e67..b298f57ff 100644 --- a/test/unittest/UTTest_hichain_connector.cpp +++ b/test/unittest/UTTest_hichain_connector.cpp @@ -43,7 +43,8 @@ void HichainConnectorTest::TearDownTestCase() namespace { std::shared_ptr listener_ = std::make_shared(); std::shared_ptr softbusConnector = std::make_shared(); -std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_, nullptr); +std::shared_ptr hiChainConnector_ = std::make_shared(); +std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_,hiChainConnector_); /** * @tc.name: CreateGroup_001 diff --git a/test/unittest/UTTest_softbus_session.cpp b/test/unittest/UTTest_softbus_session.cpp index b0d6e66a3..a56afc6f4 100644 --- a/test/unittest/UTTest_softbus_session.cpp +++ b/test/unittest/UTTest_softbus_session.cpp @@ -40,7 +40,8 @@ namespace { std::shared_ptr softbusSession = std::make_shared(); std::shared_ptr listener_ = std::make_shared(); std::shared_ptr softbusConnector = std::make_shared(); -std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_, nullptr); +std::shared_ptr hiChainConnector = std::make_shared(); +std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_, hiChainConnector); /** * @tc.name: OpenAuthSession_001 -- Gitee From 035b6ad92b411be3958260485a58a52ac967e7ec Mon Sep 17 00:00:00 2001 From: puhui Date: Wed, 26 Jan 2022 10:09:10 +0800 Subject: [PATCH 3/6] =?UTF-8?q?UT=E7=94=A8=E4=BE=8B=E7=BC=96=E7=A8=8B?= =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- .../UTTest_auth_message_processor.cpp | 57 ++++++++++++------- test/unittest/UTTest_auth_request_state.cpp | 57 ++++++++++++------- test/unittest/UTTest_auth_response_state.cpp | 39 ++++++++----- test/unittest/UTTest_dm_auth_manager.cpp | 33 +++++++---- test/unittest/UTTest_hichain_connector.cpp | 6 +- test/unittest/UTTest_softbus_session.cpp | 3 +- 6 files changed, 129 insertions(+), 66 deletions(-) diff --git a/test/unittest/UTTest_auth_message_processor.cpp b/test/unittest/UTTest_auth_message_processor.cpp index e6199f77e..d231f96d4 100644 --- a/test/unittest/UTTest_auth_message_processor.cpp +++ b/test/unittest/UTTest_auth_message_processor.cpp @@ -51,7 +51,8 @@ std::shared_ptr hiChainConnector_ = std::make_shared data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -85,7 +86,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateNegotiateMessage_001, testing::ext::Tes HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authRequestContext_ = std::make_shared(); nlohmann::json jsona; @@ -111,7 +113,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateSyncGroupMessage_001, testing::ext::Tes HWTEST_F(AuthMessageProcessorTest, CreateResponseAuthMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); nlohmann::json jsona; @@ -149,7 +152,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseAuthMessage_001, testing::ext:: HWTEST_F(AuthMessageProcessorTest, CreateResponseFinishMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); nlohmann::json jsona; @@ -171,7 +175,8 @@ HWTEST_F(AuthMessageProcessorTest, CreateResponseFinishMessage_001, testing::ext HWTEST_F(AuthMessageProcessorTest, ParseResponseFinishMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -192,7 +197,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseResponseFinishMessage_001, testing::ext: HWTEST_F(AuthMessageProcessorTest, ParseAuthResponseMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); nlohmann::json jsona; @@ -226,7 +232,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthResponseMessage_001, testing::ext::T HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -260,7 +267,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_001, testing::ext::Te HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_002, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -294,7 +302,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseAuthRequestMessage_002, testing::ext::Te HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -321,7 +330,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_001, testing::ext::Test HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -348,7 +358,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_002, testing::ext::Test HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -375,7 +386,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_003, testing::ext::Test HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -402,7 +414,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_004, testing::ext::Test HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->authResponseContext_ = std::make_shared(); @@ -429,7 +442,8 @@ HWTEST_F(AuthMessageProcessorTest, ParseNegotiateMessage_005, testing::ext::Test HWTEST_F(AuthMessageProcessorTest, SetRequestContext_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authRequestContext = std::make_shared(); authMessageProcessor->SetRequestContext(authRequestContext); @@ -445,7 +459,8 @@ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_001, testing::ext::TestSize HWTEST_F(AuthMessageProcessorTest, SetRequestContext_002, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authRequestContext = std::make_shared(); authMessageProcessor->SetRequestContext(nullptr); @@ -461,7 +476,8 @@ HWTEST_F(AuthMessageProcessorTest, SetRequestContext_002, testing::ext::TestSize HWTEST_F(AuthMessageProcessorTest, SetResponseContext_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(authResponseContext); @@ -477,7 +493,8 @@ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_001, testing::ext::TestSiz HWTEST_F(AuthMessageProcessorTest, SetResponseContext_002, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); std::shared_ptr authResponseContext = std::make_shared(); authMessageProcessor->SetResponseContext(nullptr); @@ -493,7 +510,8 @@ HWTEST_F(AuthMessageProcessorTest, SetResponseContext_002, testing::ext::TestSiz HWTEST_F(AuthMessageProcessorTest, GetResponseContext_001, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseContext = authMessageProcessor->GetResponseContext(); @@ -509,7 +527,8 @@ HWTEST_F(AuthMessageProcessorTest, GetResponseContext_001, testing::ext::TestSiz HWTEST_F(AuthMessageProcessorTest, GetResponseContext_002, testing::ext::TestSize.Level0) { std::shared_ptr hiChainConnector_ = std::make_shared(); - std::shared_ptr data = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr data = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authMessageProcessor = std::make_shared(data); authMessageProcessor->authResponseContext_ = std::make_shared(); std::shared_ptr authResponseContext = authMessageProcessor->GetResponseContext(); diff --git a/test/unittest/UTTest_auth_request_state.cpp b/test/unittest/UTTest_auth_request_state.cpp index 887022005..bf554ee3b 100644 --- a/test/unittest/UTTest_auth_request_state.cpp +++ b/test/unittest/UTTest_auth_request_state.cpp @@ -54,7 +54,8 @@ std::shared_ptr hiChainConnector = std::make_shared authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->authManager_.use_count(); @@ -89,7 +90,8 @@ HWTEST_F(AuthRequestStateTest, SetAuthManager_002, testing::ext::TestSize.Level0 */ HWTEST_F(AuthRequestStateTest, TransitionTo_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager = nullptr; authRequestState->authManager_ = authManager; @@ -107,7 +109,8 @@ HWTEST_F(AuthRequestStateTest, TransitionTo_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, TransitionTo_002, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr context = std::make_shared(); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr negotiateStartTimer = std::make_shared(NEGOTIATE_TIMEOUT_TASK); @@ -151,7 +154,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager = nullptr; authRequestState->SetAuthManager(authManager); @@ -169,7 +173,8 @@ HWTEST_F(AuthRequestStateTest, Enter_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_002, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -206,7 +211,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_002, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_003, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -223,7 +229,8 @@ HWTEST_F(AuthRequestStateTest, Enter_003, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_004, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->authResponseContext_ = std::make_shared(); @@ -265,7 +272,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_003, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_005, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -282,7 +290,8 @@ HWTEST_F(AuthRequestStateTest, Enter_005, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_006, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr negotiateStartTimer = std::make_shared(NEGOTIATE_TIMEOUT_TASK); authManager->timerMap_[NEGOTIATE_TIMEOUT_TASK] = negotiateStartTimer; @@ -325,7 +334,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_004, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_007, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -342,7 +352,8 @@ HWTEST_F(AuthRequestStateTest, Enter_007, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_008, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr inputStartTimer = std::make_shared(CONFIRM_TIMEOUT_TASK); authManager->timerMap_[CONFIRM_TIMEOUT_TASK] = inputStartTimer; @@ -386,7 +397,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_005, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_009, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -403,7 +415,8 @@ HWTEST_F(AuthRequestStateTest, Enter_009, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_010, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(authManager); int32_t ret = authRequestState->Enter(); @@ -434,7 +447,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_006, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_011, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -451,7 +465,8 @@ HWTEST_F(AuthRequestStateTest, Enter_011, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_012, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); @@ -497,7 +512,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_007, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_013, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -514,7 +530,8 @@ HWTEST_F(AuthRequestStateTest, Enter_013, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_014, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr authenticateStartTimer = std::make_shared(AUTHENTICATE_TIMEOUT_TASK); authManager->timerMap_[AUTHENTICATE_TIMEOUT_TASK] = authenticateStartTimer; @@ -555,7 +572,8 @@ HWTEST_F(AuthRequestStateTest, GetStateType_008, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_015, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); authRequestState->SetAuthManager(nullptr); int32_t ret = authRequestState->Enter(); @@ -572,7 +590,8 @@ HWTEST_F(AuthRequestStateTest, Enter_015, testing::ext::TestSize.Level0) */ HWTEST_F(AuthRequestStateTest, Enter_016, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr inputStartTimer = std::make_shared(CONFIRM_TIMEOUT_TASK); authManager->timerMap_[CONFIRM_TIMEOUT_TASK] = inputStartTimer; diff --git a/test/unittest/UTTest_auth_response_state.cpp b/test/unittest/UTTest_auth_response_state.cpp index a90c2b075..625f34443 100644 --- a/test/unittest/UTTest_auth_response_state.cpp +++ b/test/unittest/UTTest_auth_response_state.cpp @@ -50,7 +50,8 @@ std::shared_ptr hiChainConnector = std::make_shared authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->authManager_.use_count(); @@ -83,7 +84,8 @@ HWTEST_F(AuthResponseStateTest, SetAuthManager_002, testing::ext::TestSize.Level */ HWTEST_F(AuthResponseStateTest, TransitionTo_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager = nullptr; authResponseState->authManager_ = authManager; @@ -101,7 +103,8 @@ HWTEST_F(AuthResponseStateTest, TransitionTo_001, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, TransitionTo_002, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr context = std::make_shared(); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseState_ = std::make_shared(); @@ -166,7 +169,8 @@ HWTEST_F(AuthResponseStateTest, GetStateType_002, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_002, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager = nullptr; authResponseState->SetAuthManager(authManager); @@ -184,7 +188,8 @@ HWTEST_F(AuthResponseStateTest, Enter_002, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_003, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager->authMessageProcessor_ = std::make_shared(authManager); authManager->authResponseContext_ = std::make_shared(); @@ -229,7 +234,8 @@ HWTEST_F(AuthResponseStateTest, GetStateType_003, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_004, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -246,7 +252,8 @@ HWTEST_F(AuthResponseStateTest, Enter_004, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_005, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); @@ -277,7 +284,8 @@ HWTEST_F(AuthResponseStateTest, GetStateType_004, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_006, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -294,7 +302,8 @@ HWTEST_F(AuthResponseStateTest, Enter_006, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_007, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); @@ -327,7 +336,8 @@ HWTEST_F(AuthResponseStateTest, GetStateType_005, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_008, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -344,7 +354,8 @@ HWTEST_F(AuthResponseStateTest, Enter_008, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_009, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(authManager); int32_t ret = authResponseState->Enter(); @@ -375,7 +386,8 @@ HWTEST_F(AuthResponseStateTest, GetStateType_006, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_010, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authResponseState->SetAuthManager(nullptr); int32_t ret = authResponseState->Enter(); @@ -392,7 +404,8 @@ HWTEST_F(AuthResponseStateTest, Enter_010, testing::ext::TestSize.Level0) */ HWTEST_F(AuthResponseStateTest, Enter_011, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector); std::shared_ptr authResponseState = std::make_shared(); authManager->authRequestState_ = std::make_shared(); authManager->authResponseState_ = std::make_shared(); diff --git a/test/unittest/UTTest_dm_auth_manager.cpp b/test/unittest/UTTest_dm_auth_manager.cpp index 2042836cd..65f845406 100644 --- a/test/unittest/UTTest_dm_auth_manager.cpp +++ b/test/unittest/UTTest_dm_auth_manager.cpp @@ -56,7 +56,8 @@ std::shared_ptr hiChainConnector_ = std::make_shared authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr sessionSession = std::shared_ptr(); std::shared_ptr authRequestContext = std::make_shared(); std::string pkgName = ""; @@ -73,7 +74,8 @@ HWTEST_F(DmAuthManagerTest, UnAuthenticateDevice_001, testing::ext::TestSize.Lev */ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -92,7 +94,8 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_001, testing::ext::TestSiz */ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_002, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -110,7 +113,8 @@ HWTEST_F(DmAuthManagerTest, HandleAuthenticateTimeout_002, testing::ext::TestSiz */ HWTEST_F(DmAuthManagerTest, EstablishAuthChannel_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr sessionSession = std::shared_ptr(); std::shared_ptr authRequestContext = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); @@ -129,7 +133,8 @@ HWTEST_F(DmAuthManagerTest, EstablishAuthChannel_001, testing::ext::TestSize.Lev */ HWTEST_F(DmAuthManagerTest, StartAuthProcess_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -149,7 +154,8 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, StartAuthProcess_002, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); @@ -171,7 +177,8 @@ HWTEST_F(DmAuthManagerTest, StartAuthProcess_002, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, CreateGroup_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); authManager->authResponseContext_ = std::make_shared(); @@ -193,7 +200,8 @@ HWTEST_F(DmAuthManagerTest, CreateGroup_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authRequestContext_ = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); @@ -221,7 +229,8 @@ HWTEST_F(DmAuthManagerTest, AddMember_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, JoinNetwork_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authRequestState = std::make_shared(); std::shared_ptr authenticateStartTimer = std::make_shared(AUTHENTICATE_TIMEOUT_TASK); authManager->timerMap_[AUTHENTICATE_TIMEOUT_TASK] = authenticateStartTimer; @@ -242,7 +251,8 @@ HWTEST_F(DmAuthManagerTest, JoinNetwork_001, testing::ext::TestSize.Level0) */ HWTEST_F(DmAuthManagerTest, SetAuthResponseState_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); std::shared_ptr authResponseState = std::make_shared(); authManager->authResponseState_ = std::make_shared(); authManager->SetAuthResponseState(authResponseState); @@ -258,7 +268,8 @@ HWTEST_F(DmAuthManagerTest, SetAuthResponseState_001, testing::ext::TestSize.Lev */ HWTEST_F(DmAuthManagerTest, GetPinCode_001, testing::ext::TestSize.Level0) { - std::shared_ptr authManager = std::make_shared(softbusConnector, listener, hiChainConnector_); + std::shared_ptr authManager = + std::make_shared(softbusConnector, listener, hiChainConnector_); authManager->authResponseContext_ = std::make_shared(); int32_t ret = authManager->GetPinCode(); ASSERT_EQ(ret, authManager->authResponseContext_->code); diff --git a/test/unittest/UTTest_hichain_connector.cpp b/test/unittest/UTTest_hichain_connector.cpp index b298f57ff..ae46c2514 100644 --- a/test/unittest/UTTest_hichain_connector.cpp +++ b/test/unittest/UTTest_hichain_connector.cpp @@ -44,7 +44,8 @@ namespace { std::shared_ptr listener_ = std::make_shared(); std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr hiChainConnector_ = std::make_shared(); -std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_,hiChainConnector_); +std::shared_ptr discoveryMgr_ = + std::make_shared(softbusConnector, listener_, hiChainConnector_); /** * @tc.name: CreateGroup_001 @@ -262,8 +263,7 @@ HWTEST_F(HichainConnectorTest, HiChainConnector_002, testing::ext::TestSize.Leve HWTEST_F(HichainConnectorTest, RegisterHiChainCallback_001, testing::ext::TestSize.Level0) { std::shared_ptr hichainConnector = std::make_shared(); - int ret = - hichainConnector->RegisterHiChainCallback(std::shared_ptr(discoveryMgr_)); + int ret = hichainConnector->RegisterHiChainCallback(std::shared_ptr(discoveryMgr_)); EXPECT_EQ(ret, DM_OK); } diff --git a/test/unittest/UTTest_softbus_session.cpp b/test/unittest/UTTest_softbus_session.cpp index a56afc6f4..8d14ff0e1 100644 --- a/test/unittest/UTTest_softbus_session.cpp +++ b/test/unittest/UTTest_softbus_session.cpp @@ -41,7 +41,8 @@ std::shared_ptr softbusSession = std::make_shared listener_ = std::make_shared(); std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr hiChainConnector = std::make_shared(); -std::shared_ptr discoveryMgr_ = std::make_shared(softbusConnector, listener_, hiChainConnector); +std::shared_ptr discoveryMgr_ = + std::make_shared(softbusConnector, listener_, hiChainConnector); /** * @tc.name: OpenAuthSession_001 -- Gitee From 511794d4737fe167caebc40b38469843bc247ab7 Mon Sep 17 00:00:00 2001 From: puhui Date: Wed, 26 Jan 2022 10:21:07 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: puhui --- test/unittest/UTTest_auth_message_processor.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unittest/UTTest_auth_message_processor.cpp b/test/unittest/UTTest_auth_message_processor.cpp index d231f96d4..c648ff9b5 100644 --- a/test/unittest/UTTest_auth_message_processor.cpp +++ b/test/unittest/UTTest_auth_message_processor.cpp @@ -37,7 +37,6 @@ void AuthMessageProcessorTest::TearDownTestCase() } namespace { - std::shared_ptr softbusConnector = std::make_shared(); std::shared_ptr listener = std::make_shared(); std::shared_ptr hiChainConnector_ = std::make_shared(); -- Gitee From 0e35d8e9577f850f3db7846d43b06ce32a850142 Mon Sep 17 00:00:00 2001 From: lcaidm Date: Wed, 26 Jan 2022 12:46:08 +0800 Subject: [PATCH 5/6] =?UTF-8?q?ACE=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 --- common/include/dialog_ui/js/BUILD.gn | 22 +++++ .../include/dialog_ui/js/common/pincode.png | Bin 0 -> 35390 bytes common/include/dialog_ui/js/i18n/en-US.json | 5 + common/include/dialog_ui/js/i18n/zh-CN.json | 5 + .../dialog_ui/js/pages/index/index.css | 38 ++++++++ .../dialog_ui/js/pages/index/index.hml | 16 ++++ .../include/dialog_ui/js/pages/index/index.js | 29 ++++++ common/include/dm_constants.h | 6 ++ ext/input_pin_dialog/dialog_ui/js/BUILD.gn | 22 +++++ .../dialog_ui/js/common/KeyBoard.js | 86 ++++++++++++++++++ .../dialog_ui/js/common/index.hml | 32 +++++++ .../dialog_ui/js/common/pincode.png | Bin 0 -> 35390 bytes .../dialog_ui/js/i18n/en-US.json | 5 + .../dialog_ui/js/i18n/zh-CN.json | 5 + .../dialog_ui/js/pages/index/index.css | 48 ++++++++++ .../dialog_ui/js/pages/index/index.hml | 23 +++++ .../dialog_ui/js/pages/index/index.js | 36 ++++++++ ext/pin_auth/BUILD.gn | 47 +++++++++- ext/pin_auth/include/pin_auth.h | 5 +- ext/pin_auth/include/pin_auth_ui.h | 5 +- ext/pin_auth/src/pin_auth.cpp | 9 +- ext/pin_auth/src/pin_auth_ui.cpp | 45 +++++++-- ext/show_pin_dialog/dialog_ui/js/BUILD.gn | 22 +++++ .../dialog_ui/js/common/pincode.png | Bin 0 -> 35390 bytes .../dialog_ui/js/i18n/en-US.json | 5 + .../dialog_ui/js/i18n/zh-CN.json | 5 + .../dialog_ui/js/pages/index/index.css | 31 +++++++ .../dialog_ui/js/pages/index/index.hml | 14 +++ .../dialog_ui/js/pages/index/index.js | 14 +++ services/devicemanagerservice/BUILD.gn | 4 + .../include/authentication/authentication.h | 5 +- .../include/authentication/dm_auth_manager.h | 1 + .../src/authentication/dm_auth_manager.cpp | 60 ++++++++++-- 33 files changed, 623 insertions(+), 27 deletions(-) create mode 100644 common/include/dialog_ui/js/BUILD.gn create mode 100644 common/include/dialog_ui/js/common/pincode.png create mode 100644 common/include/dialog_ui/js/i18n/en-US.json create mode 100644 common/include/dialog_ui/js/i18n/zh-CN.json create mode 100644 common/include/dialog_ui/js/pages/index/index.css create mode 100644 common/include/dialog_ui/js/pages/index/index.hml create mode 100644 common/include/dialog_ui/js/pages/index/index.js create mode 100644 ext/input_pin_dialog/dialog_ui/js/BUILD.gn create mode 100644 ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js create mode 100644 ext/input_pin_dialog/dialog_ui/js/common/index.hml create mode 100644 ext/input_pin_dialog/dialog_ui/js/common/pincode.png create mode 100644 ext/input_pin_dialog/dialog_ui/js/i18n/en-US.json create mode 100644 ext/input_pin_dialog/dialog_ui/js/i18n/zh-CN.json create mode 100644 ext/input_pin_dialog/dialog_ui/js/pages/index/index.css create mode 100644 ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml create mode 100644 ext/input_pin_dialog/dialog_ui/js/pages/index/index.js create mode 100644 ext/show_pin_dialog/dialog_ui/js/BUILD.gn create mode 100644 ext/show_pin_dialog/dialog_ui/js/common/pincode.png create mode 100644 ext/show_pin_dialog/dialog_ui/js/i18n/en-US.json create mode 100644 ext/show_pin_dialog/dialog_ui/js/i18n/zh-CN.json create mode 100644 ext/show_pin_dialog/dialog_ui/js/pages/index/index.css create mode 100644 ext/show_pin_dialog/dialog_ui/js/pages/index/index.hml create mode 100644 ext/show_pin_dialog/dialog_ui/js/pages/index/index.js diff --git a/common/include/dialog_ui/js/BUILD.gn b/common/include/dialog_ui/js/BUILD.gn new file mode 100644 index 000000000..0792bde29 --- /dev/null +++ b/common/include/dialog_ui/js/BUILD.gn @@ -0,0 +1,22 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/distributedhardware/devicemanager/devicemanager.gni") + +gen_sa_dialog_js("dialog_js_files_etc") { + project_path = "//foundation/distributedhardware/devicemanager/common/include/dialog_ui/js" + dialog_name = "config_dialog_service" + part_name = "device_manager_base" + subsystem_name = "distributedhardware" +} diff --git a/common/include/dialog_ui/js/common/pincode.png b/common/include/dialog_ui/js/common/pincode.png new file mode 100644 index 0000000000000000000000000000000000000000..6616f7659fcf1d5da5ab6796863e32efbe086cdc GIT binary patch literal 35390 zcmV)LK)Jt(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DiPK3$K~#8N?Y#$l zTvwU?FWYgPVmsAwIw7GGS||x*>FlzwES*5;OW#lyNJt3jJ$B+=C97+snUORj&8WK< z*_PFN@4fflp8xZlt82@~Ap!E^v%lY;(dX5ja?82rp7(p6_ndRj4cML4is$!L;ibcM zh%6t4zYXxU0twB4w|O3(rdh<+O(M2-+_Jhcc$+4%w+~3~0g~G0;Ax!Xy3_Er&mp08 z2J!qows8XPMy}8I@hwyEw$CE5gZpcnL2UCRqN;}wT-uG0vL5r^SwD&xT2##tA}ae4 zT|12Ex)J_1h`_=QY&uboZ8W2{1ptKG0 z_YwHJ=aASrgNUkL1QoZNZQ@!c5MJ4f(6VkM^1Qt*)9`l!uDVfvoXT4D)`Lc|VQ#hEcd`2jFj?LV7Qd%47IiC*fl_2jEs7GylW#TdieYE7qqMV8gy*IEuUBW`4QL z1`t;{3_tTbrIqK&WrD7?u_>mL*S4PdNsDEEyP5ZiEHja%LkKD8!OI70@KjO}*6pjt zuIx?(=5-;ea)kN8>%i?@+&-p$jMt_gF-&)S6VJVQ28nI+EKBoIb2Cqd{V;}nFfdSeWfJxd6ZI(7aKS$HMxz}Lafw6zS{r;v1&<-2{J|;QI+W$TX5W2q+dLIhP8JoA7eh(y>|S z;^-vtgn)+*Cn&{pX~00!dqGM-5)>SSk^u!xKng1Az^;NegqHUjU znP3%DFNg_JL*_ewx4=7v-G!~#aJ-7=)XnY2x$ZE*I|5$^otyAUCC~*V<%?h*OE9{b zR~~*&Ag~f?0#u^Xq~p~PQf-q+ApjFwCz!_s9MhHDG0X1-va!=}vMoVr*FKs5+E=nF z2IgxDm+1snN;~)8IEHxUYa-Y45)AIj0eE=b;%kNpr!Kh4`;gqk{3z)~OmQz_D~8}} zARJq`FXp{Z5Lvk9&T3X7<%5VSBfz#qtzcHHJI zC&t0DEz*Z;;>fSU>=tb}mL?;)gySlFmY%7$6sCXABuv(R~1 za8zTe=8U7$#|uKnCi$CX0#p9e;rE>Y}lRUjUSo>2cOiEtuY)fs<{frmh?3euogr z{lwDwPD5(J;t2;ErUt0ydjgK2IlobfEPzV@lZtW@TAQW_~9SoK%A@ zI+c`^oB5(VauCLD0@1_sPUJBKD8b1#54V$&N+c*{dhcXj2~0k!BB>~M?T}GaNd%B> zKB`z%APE8=fh84{Ko~BDR08wcL$#Q~b(6Fnm5IRQU`61r=!cKjHI=_b6?P)JxCimf zH^E8fsn@>d38HyZS%ni~yRuuc>r@Lu3b{QY#` z>j*#|!cLHiBIpFEa4NT$YUY_LLMkdLDV3qH(jEh5;?ofL1)}k(n%FXVA5d( zsOVaKKgtl0Aq2xVDX9pCATFjSu9=}I(9fqq-(nXaWx*v~W%60(FY z!zif$<8mv1~#!$7@D8lf{J}QI` zys*C*&+jY3_UuLk6}DqXP9wq9j2ND0BDWW$5(saje0VIGAQeY=d$|;(1gOyBc7&I7 z5dgisMneWv0+Cdc6)I90F|1S@p}&>;Bxu}RFP6^j<9Y&BilE5-dl`ntRt+G8z}#}U z9NUf(GAC*gm{pIc;!c8$fG_JYpt>9f zV^~Sa!b+GHUcWd(%RxX1Qcl7vrMeF}%>x)@K~}goLYv_GY1%Boa|TkjEryh!wAlXn z`rrBraI;`+I#P?>*=;O9R>2A@>P19JKb?W$OzWI!6pv@9B(-EKrbrgj!2CAsriGQ! zaR@389mO)LCKhO0K?zcp`Vb(_C={9b?(}DZh7RE(2n8Es1dQ6CVjE`&j#)y-S}L6L zw#^$8jG_o8x7tz`U?$ZiFnQ>>+Gh;I8V4QLMO7de*`~(%J#_v^hG0@xeyRjJJT>bm zJyIWX@a}m7RH>wdjv1s4XkE3DF=XXZ4eo-hZ6T#ycp@bmzm3_4NBt)eNPsyQwnY(Q zPX6wtg7T>moRIPoik6KrzZK?L4duQzhFYx?2rX*Irel@Zdc2yT>chT%aA}7=OrOFr z=9NOSBtpu^YbNF6;I)b2`d&iK3j0{;@O-u&tH2}ihw(?(0c<{8#&voKG=`K+R}4WI zO-Kn=$*go_sjPqwkOryTK7yfma6uc7J!smdyv%nkT?0Y&q36hRkJ#t@h9Bg^{nbaFn!$`39iYE0WNX4;$%LJ)V7GkaEAw<>I6icTRtSlA95Qz{Kn5=!O4NKu4Lpi2ZJ$yE# zOas2!WLWS8R<)t&d!@rH1vsvwP*qAwKvDy`RFw7EYE0KTn&Z&1ZFAHNVrMQxDPvSn zT!xf%5LB!Hs31K&e;@aw9=nvTIRapgONDM~r(!-6dU1qe0@o9ywq#b(su5Dywh;EI z0a@)o+_n?&Q&oBisbuDfOd*=9lJKn^MiK$MuLsyiCFCX~w`Er1r^O zmZ^7;KuRQ_oK>R;Ddv zR4XCT!Z3ywM~hc`4*?~!;U|y?Kx(rv?G|b`dqqg;v)Yy>O*>YEX>6yGVL_Hk5}aHF zhEYb^{{ozBld{r!3iI^dQgYVvG^F@jwAy#tbsTGmfzC;=vfH1m(9cqiwkeOC+)iPg zo9pgom={#oLP+)Tyy#>+cOUne+&Oa^QmKSgG9e{Z6;-Z=;%5kS3EO)c1wRZBI~z|Z{)DvFf=^IGL*cTNk_)lLu%8BjW@&Lc~D zsp9$(PYC%4DHkCXN=T(HKq`U?OFex8lt*og3h4={P;R$_s%dvFLCLUDjq_VG8_d#C zK5!PKJcLwsOCKmIt#FV0nV6raikcy$2q;V$gAJ;`8&Zp5^q1_Puh;Vxu<>9y!@Vj~ z*xaglSu;kJ(TTW}q?VlpDLF2kSi=Jp9?2PvLZK5_-RTNn7C@y&bG1QO3KWDimJfPLawgq*m^3vh8g}QqiU*EI}r;w!?|dxxd=KBc^0SyB_2!XV8KXWQ_tK2q!u8ib|#&J+Rg+dos-&~LJ5&5 zhDm}}g4&k|0o!!`v5jM<-6@XH*;CYp;9`b2)e4UpDiKl%Z4=BdE@jPQmhm|8+)hvm zDQu-vk63M0f+wM;a4)>1+k|_%PVoej8N)=Nd#Pqp2nrigp}DQJ7ON4Qm5z`5NaXo> z8P;i;rXE675(H8LRiYZ#(+SHAwLKAB4u*kSk5^*d{zAf{n#xJT4f+U3HQo~#ey)4oF|a55}%HIE{plZvCA03e{;O;l=hdJi4gLs)2hkM?2qDTib_)FmxQ zxd|yZ3%5&+`!qMhQ8kK((D}AxHDG%#RZ4N^>9JP=j!{ztm|&x!24w5S4WtAidkBS#5D}z8%DSnh26&!K7rzq(eG0w0!F^95w3H!> zdMryVi>@K;c;4}Zk(a76f#4RPy!uSVBom}G)WFGbF_xiZ8uz81JFC}@=OSgub5kR7 zL@|$F+=CdZ;8=!P0+XM4BS;BWkp-Q`V)?s=*EfL`Q7ZS7#C-7a-2B{EGS5eFQpl$P zpIW9-(WOw)#nlZWh@tAHBW2i`Rd0F=J>1SG*fVeU;x};XQ0S+bPNMQ!Il6_?4(n+6B6p>qaq5TMKFAeC9I8lqIm@< z+ZHLQL_$h!QW|+KSgDa*J!-bHHO9PgRt`aJilGG^Mzy%rTP6@ueI_w~QW^GX#JHF0 z#Lw>%xQr(>(x`NkxsOEVpNH2pndh0&Jq>goXd0LHHfEzN^J+ismOO^)*&pv11^T-@q|qRuU7)EpA?nHnBd3!s-7Tp zsP+nbv3`FQ{uF--n~ye_ae8WaR~y#mV|9dNyVV%a^txFlHT*&5ujGywZD(xelFExwpADb$@0wP(+os`f95R~aI zHGrz1vk)SRTP4JR(angC6 zR7){*(5SirT0f#{b?Zw%6&DLUe^21?y*!Q$DXA%qm5H?>Rm(zMV}Z)4;Sy8}8vC@X zpdFh|)*-N{!+=AeFt!lxsZGj^iDD=!_-OQca7nLeSl2i#t1+EvltSb-c9>`y*cTvW z29^>?iJcmlYAGh|UusR?>%E3p=yzLX31&%DKt8IknA$-^Fl0&_a>h$kDr2|Ivw z`zi^gPJ(LC3}px_>fyC#{xmUkW_nc-YS@L|CzQA2SbaOX={tgy8qI|xHJZ;7O8;9S z^;&RXuk(+4y;_QF`^TnAuYlm}785eKDb1Z4Ovl0&%i1cTaSAbnmjx+8!btK#ssh%O z+06u1EdmRyMqrN$Hl0`9-ad^MrYTI+y=el6Q_6@=8_hxi?u!mA8-1G6X25veCbC-Gn2_kRnf>BW>a4AdFk|D4x&Ww%fUT7fiw!%BYM2*F^ zned0;aaQnqI-QH?~Di=FWwjz+*NoCJ% zw4ND%#eJ(yNf@qAhVcARK1?G382<0;kSsASZJph2H8EWpv~-JvpY*9{UT8Vkeq z2(maz__%7WS4HKdHX%BwlvFH3k7yS7t@#buUCe@5+-YuwFf}59ltAbt>Yl+mhBb8z ztLk+R*upS~x>@sG9L-h38ko>>GA#}k^w81)GbT#6#>BVi-n`k@CLz2!x(g5pCBioNgysH1~DsM&mh4 zJ$21<9gWvw_(?d0mGWFQVw@qbAmwQxU|Okm+6VzIWr+(WNX1fZh8DHaS)1sj44b6Z z7+Oj3D#TOonX6K_w=jPysdCG?KPo1l)RG2I787KJ3~h7!5p=8>VOcGR$!8uFFx1WK zLtKfVHA+B@BZKGTRU2Lz!$n@xxSD>eA)N}y$^FI?B0iq4p8!{zQe5>UK|?@QPcuve zL(E}B6tH3|pFu+HJk!AZWZtH?0(;v)1qUQn(`ta2k|8RrdIV*&QlUz63xdpV-9i&v zJ4-N0IZm0uo7+z|nqe^-im-#G&l?U`QfZZ7{ee?m$VU`Z!79&bfd#Vi#U3ot{=1nxVj5mW+%Q3VSvEviKA7F1dKo`qfD z^6F=-&0`8umU#)RM8e8vjOwbH;TM(5!6BU|LrN+ZI~0#&C>O6g0jhXRo^xE~6uflq z;Oq_ro@_=;@c=_QLaS&3`&)n%f+3-TDyF!f%W0%B|9q7MOW`CuWenvQN~X08G0z7H zw+ZGyLC$OAR_|RU^Pz|eOW_%nWt=(YJX|Hr+Y(^s;XZ6T*n%BL8W4P95HWc`#3_Z8 z%mtl-={x0uRlhIq_dUK`!l=%^&9 zsnT|yYR1OHRd``x*)2%bQ06n_OKO}qwPj>3;4C6w3J8trIXY%L!Wn8r z^Y_Sl7W}3mgjDunb5(GkN-N3e%Acn~d;pW_L;m|8m7IVMQC2`_iUJl_kN0+iay=;VZww@p*X2vS@} z;Ts)NvoTnZQaCqa?j=;XXN`lh8r!9$Ojt*dNOh?lO51Cnx?x)5!88s`odXJq!x`f4 zA)p=A4BrT%c&RC>CNC|Ka1x-Tq~aRryoA0&KFx&Sq1s7TZy`fy4KGNjnPfgs(`Mo0 zHA!LK#3__h8xg~%s62*5xm1pXhJ$$-oyEM&q&j4NdJCD4x;}g#mrr1o14#yC1R_D= zp&D|Q^dg=BiDRBRO9ZAVDkQ>#kaKe#FV_v@ez&DhWA~wHgk(-4@&v)heMTJR{(0S# zxlb3DZdyE#8PBwMStbNBPX(1SRhX{1#(_Did&~{ku3Dy**H@h)G0f`_&4!WPL~A|` zCEd5Dv3xS!8WUI2f`c_JpuoitAvMJUZM4#9C1pd(3iISni#5StV}FnHX}h!cr*yoQ zzq8Z(`a1vFsj>m|*Z=)_8eiXZ5>jeA5R3#S7efh|y0fjYLhlJFhF4NiYV6b~R;e`Y3aIt2OZJ$L%eIEkL zS`ns3;l^omyF@H&-KS$a@UK75#E0)af;+yp4|jimAMOvS!=7x0IxM{ID%Ri(HFQsx zdd$KZf|*{kqIRQlq+aYBmIW63y)`eC03w(ujAN)og`?RFq;{l+)Yha>&K?t`wkoxE zsRvOZp$3jR7@A0RDWtS-&(RDFnj%JXS!voB6IxQ8nYJ;e$3xQ?Fok&nRb+*FL+v35 zqn0&MLA6gJsa*}i+y~cFs27w^pjGrj_si+#;3V$Xs|I9-+ljm$eulub6A&{wngJ|7?XS|vXJvl?tpU>Ojw z2s&5!tZ9pqvQ!62JS!uYLPA0~oG{v*s{y2q3;|hIin_RNuW2LI@B_6+spna3QU|J= z!OM3VQgRf_>Fi+$|Af@}UuUOEM|!QPI{WX>)A;(PlaLBxysw6HBfqJlqF9s4)R6A3 z8sTq!4EHGAsh~7cSdHkW3%HiGcg+x$)F2Bol@e>_-)?Kf^&g2qz}nqd@fHUzynQP^ z`I`fHHmx5HDj7Fbi?eM6yUQ8~tv-fNEND%WCQSV0rY5X`5 zwFu8+2%*}Zp-KXw;h_qNZR%wh)q$|`CWKWm%xPc<)j^;(bTPE-L`)-L!1ppI-@BR^ zvNrc}*~`ydHd6sI%!zForsAQJ>C`|>Dg}Zpno3GDE<_VP?nd>@P4PG*gp8%uWC|Uf zR51=Za2Ug;kP?QSRCdu)9E3)Ei`uRTm9`l((}9PIOO57I2rh^gb zXqW`ys)3Thgzt{5dgwM3jYsk^j}oXtEl7%%r8hdT^g2J5tT}{$%ksHD?l+(a z0hd0jm!1S{}o)t50IZ^#}0zANJv=PmN%6GF2Xxm6Px@(59+Q(mYhW#xbmj zLW_G5nAdJ@U=A(pL<9k)F=2Wirg33}n1JOar1lF^^bSEvP2-k>$aP*1NZGDyZTGi2 z-`O}=yx(*GqyTNx-<=Gr!SY)Osg*8VaC0h_ zzcmuye5wu`kIW&2YAK4&8Q)E(ukA!ax0H%h(l{b=Ch_B^JF#qSDgv(Bj|;9(#TBfTLV>fPof#L%9=ZjPN5sB&5#H>lt#j9CP@up z&|uQt3~6`Kp`xk?`g(>gGW9AFF20U=Xod*Q9AQswqY?Rutqe2G`B?W!>c(6LLm=Jy zq1#C!7O&@T?J-xMZuq;Y*@*F0hQn+1!Ygq z5?s)M5J8J&RG&TNZ8%ulau%fID9~hgbaZPNf(0qd3D0(@ziif4v)q?u+?L*F{Cu%3 zdY$v}^h@8L{}{4`* z;ATy|=jaT+_4{5rO%7IEU5U$XDaIQ=l82|G=_CvzV_Cba+gf9{G+e<^PSDi!P|;}! z1H*;J9s;Ek+jGhdlnkT@uh6nagwPy(AI0wj3v0P-=Wz$%p^6eDo%IZJn{;2E+LwkA zT+&7*)k7skhiB*&RmFTL@1(-%Vog6t$PldBra?W5y$GkH?8>jh&b&IaZgj1-lQAqI zxZUi_S2GR$u#w1MwAR9te_8$(jfwwaAQcBNO)=VxMs#oWaXei zni^){cXQ~dc_f3a77;9OKBBh>6OJ)b$;CO zrF=XZP6e6;LZ^q}E!BGkl`GY$t7aAvWupius01e)P6b*Fdh7nV<$Lrp!N-C>L*19aj z8$G~hze~_u&G3RXcEFWcxa^&K@w1n8djsXY!aAy;=vJzX)(NBy57enN(Wlbn*OpAxc$@Bc$N;KUOt6;x}8Gzefe11demb_hu7Wwu4>DoD!Q@#RIO?E zan)(^G!|~c#z|=CMqai3=r;$?#f)+%Fx?Fd?J9b)r?}I!Ye_|ELONM!F~L^R1DCnc zmVo5C$qdVq+6WAd7H^SK8s`4ha8D>QY|%hXg>W8*XqwkNfpF4PxVnMX8oHrzU;M3+ z&d;#X-(*=_%?vAqVT9(>85uTeXo0_Jo;HglhL0AgsP+h|#5yib`RC7cVC5})alw_m#upvO3M#2< z-duz=Z#{~u-*OOF+;#wK-*E(M-jRx{-sZu|oA$EuArx1gqUtI&mDk!k_TxK`H{toj zA*|nDgLV5VusgShKqAPg$|K8k-y*}_1?8j=PpT?PvsF}_0hSG^9u{QHfG|Z9MC8qC zJeRxc@0A>Cv01RNmgX}ZSzwx;6{IXs8Ax#j*=bO5-Ni0{J_lX=yKRe)r={tOB%r3| zrx~PLu+nS}=D6I!Ujr$@X_o1h*|3_MwU)00Dckt#!k^xs3n?2^i~s%skP6CbG6g|5 zhngCTW*R7~hUol+l|Vq%64%fJPosL9Skp_QYf9MCF}O=6;VuFm+&Y8XKUU9zcoNI5 zD8&WWoWgtlqZGf{F^Ua`rm!))9$WI85F4b7{Nj zWHAaanMP+dfkKD(G|ZXbqAH|jW(X068&ohMCEPBjov>0b96_NG=>>EQhPlcM-Os2& zit74Ltfy+E#Z%3whf|~QW7HnUbrcHf25XOoHK>uhSvOki!4!mQ^Bf^Hi5RBESui80dan-YkEE+{vKEu5dg?0pl0hoq!FeE&!rU)m(&Rac>r20|p?HI!0-VtQ9 z4k59!4~fjH-KoH*zFmmbZ`jLF?+~th<8j=3AFze0G-@C7`zX^x7<$&inLB%qRN<`@D_A(@p$$N}K)dyeChn-20CQz5O&zrfUBeNnV*&6SqjCD&4{m}9hc{B;4fJutvl^klZ zEry2q{2Cy|ug==u-uB$r`H-MvEw=xokYdKnFPPbh+0nTvk}cl34XXbIkaF>Yn-Sji za_W9lFib%Zs0gDNhAz(9ZmN$i11Tvfjc$%9BE*Wv;Vhs+Vi@p~$NO>J+X`93p2CG! zm*V0ZPvUbwYr`|K^DI;>z#Zd=p_*~hfn(`_y30PEP7qh1g51rTJ_7;E4q?R=`B<{% z0KWeSRlz|}VGuawgae&Ax@a2FT;Ip-)KDLuJ#U68gwaAy&0=RJYuJ)$Iz63)HGf$C zG(vN^U5V9D8+ej1D7N6J2Tdrv2rC^$P~iYo)eJ*3I&c%W*C0|V31=z6mOqEEtQmx4 zG9**jsu1PmJocQJMbOC^1fAkB@@ELZxrN~oBc=yZ<9w8V{&wBruK}o3QdFNYmCS=m zs>#Y}xGUxf1*V4i3S?gjjx_yt!0?ayiXvc{B^tzl`S~Z zH;#ktGf39}SnlJ|T~oOE14+2(+GJdE?LmfE9(?;((+DTL5|~d3Tqm6&TsqaMwn^tP z(wG-MZO{Ftcg!PQgE09yiR<~PY?27#B!+vtlYyJK?-kb`W+<0~C0F_J>3eIjF^=%d zok1G6Nv@tj3YFopE+CcR;yTwPKKDb0fj6ZSY6R3}v};`W#E**cjAx41W0s-&Jj)=@ zzl6ZA;`OecBFt3@j96wW%OPVbm$oHTwi8nAW~!DkdWN83(Z>2fH>F$IPGz~=VuxC6 z7AVe`#$1ilMi-f;Czjc>f6C5u*<>_MQF)%GqJl)UF2g_9fJ&Gy39RXsZ<7D7R2cMA;b|N?mR-^IPlHi zG-B0_M+hkv!b^`}>fV;q(J_)(s8!qk@PQtzxiuN9 zSo2?WEerEa;rPuSU~4A9lFzhMOd^>zy_`0T>woq)d-2|{$KWmh9*(#Edo2F_7bPY% zbVwP{v0~{^vIsi;)3M|D>ca(i>wm`MjsNb%EuV|PyYF@4+v|?v`HXso8U5JFP{YM= zQnNPbR-PpF;Bos9DuQPsfp`2{B0l)#gLvcJ9=z`hhw%O{XX4#o+>ej{I2*s-K8z5m zhG3>El;GTcvfYg7i70Jj9(EFX{e)FFm1&=82-hqV>Trmyn1zGuM{v83{Z}S#`*b?q z^`A%Z{;!|lz7ONhZ=J$#w~Zl?p!Q4AFt2>|Bg}&dBr~n4jT6}0Hj4C?A?#&1nZomq zJ_h{q*-0$BCJGm>NyGB1_Tj2qkK!i}0DBVnJNFgGYn9G(%i#LjM&qQCn6FZZQj8i| zoAcL(Yl`E*aMH9RILk4i{bu~c&v~@4eXqu zv0PE9nj4CZoq?4UzNUx~q!J0KXVbw2;Ik1Crqx=?emds%4xo5KsmwwFY>+K4U;H6V@>? zj^43xj8DyAXk^SBvww05{j)RZnx01U@EY2}#K5>PIVARL4Nq^b|TL zC(zG*>3n6L%p9DotR|r6FfccTimoza*&r_a}WhTEU+%PpR6f!R+sOF}Gc)sVchbFlX=1>3RteK+OhIUb113c+_F-Z6g z5q!hU^TC-JOz7nFS_Hhm=M`XPZ(Qh+avji? ziHgo6a7q|P5e&g;bNJ66Rp8>a`>^z~{a8j&U3^m#9@sjCDAwL)q;hR13)iSoF=|&5 za1yB?cKLuWe7h5?uJK^il|Ec_Q#5WMcpmhRVbiHe1Qibu95beYS*pUpP~~&KK7oth zz6AkmHn3I>W9^=gpFcAPC!rKgRi{COE&|{=H`o1T8LoQ2hBkyD;ARJxTk(!BXW)PK zXreaF)jm#0^}?racMa0iknb+^>pTI_Ti$NPvGXevhc|tX5;CYegfBOhf1Z=OKq4n z_ud`soQA)40IBq%M5cLrBJhp-hOq4F1ga~>LkMEAOUz1*SvE- zzW=9AI9QqZsg{##XR)_+lo0JedeZ<^*q{j!fBfhqmR_5RfQwjxUBdHQvkPB;q!>@f z&)^v!LB?wuPDK?`#4@KD5*XTQ6#Ab*ie*w`q-;f%SlLEMwVIhZZ5etAv*8Lsyc+E9zgK^OavXv#nZlhcslI}Hf0rKS5XDF7Zf8XD;vJz5_EIB?ukhp zI(`z4cn_kzUO1Bc*cI8QRkoesc^JqcN zY09l>eK$=dHZen}&4CM4H+3O0J_QN;k7H+y7dvR#wJqr2`st?%ux?K%Aq;a3B9f9& z)YNEzW&rhiK`KrKz(7iqzG<2g766(a#iW@CJi6tBN-D9vA4zSL@@gv~Xkzk4;bV=Q zKp3odjNubsEyD`6N3G7s%4_TC$l3V#*9Y*8-wxw@j|}3wkG0`je`?3KA06O(e)s4w zzW?w9zWS3Hy!E|JxNzluT)b*OmadJ#=N_uSQwL|Tqi7c4tc_#ol-`CpIw?UyXMD;r ziQ7Kq#szN(#M0|rxcp67_|&&Mu!U+Nh9Oxj3;i~RCg1!+Kd!yw1Ol#hnekUkZ;8aU zcRTUZ4J`;E&^$aBXU!C%t0$1gn%_xf5lZMj7}|vod?OVrZVAQ(YY4c@Tv&Eh6fS#% zhhYwZvNDz-sSiu8r^8;u{od-r`@flu2SNw2n<1d1lqyM&2P^HN;}h`p!{)v^AM?#! z2)y8)#b41jl{Xg>vOcPy za8@3n%;Oz+=ciNf%?FFH(LZHWW1>LSG)J{JNs!JNNGV)PsvrnUClJhV@!nrfQza8N zR76WJ&%`@FQH0-br1D`!l*BY>jMn}Rs_eohzMn)a)AR%t@tyzC$vn)&(yObOCaUGP zQ^`J4gy;Q}*tnmeH1j;PkfC4MIIqWq88;P6Se^|j4d6TjDVeXT9Ve)yG{?DW{L{pd zv|-Ku*Fb7$avB44;;ia=gl8N^*x@XMo+vbsx_9GlMAfx}^&ePlkVlwRQk8Vl345rF z4xY$@%jZK}N-|{PG4KF2UP+1h2>xyN3>BeBWYn06T3Q!@;t;*K9dJ5yUjRYW09NF~C3 zJO^zP6Uc3CLR98K1RYGn27erWvw1!IIVY*WCaI=oF-ZtdGp$opMY4(UX-tqp{23Hs z1Qzp-QdTaW+8KyOD#YYd zr+D5zl(e^*Fjdjx>k28&xujb=G(y`zs*Z(#p@nYqFjM|E55m_uY@SBqR}IV1!Xy6z;deOC^C`UKZ!c)2r)wf7T~c>Bj|vE<4k*5GN}Z#=GiPdvWzhf-`z zpFs>A)2Wa`J!T3)d0r7kz_ST+xcmDjaM5j4T~|afeD!0^ZB#t}b{wDjdNx%_F5Yox zw&}rIar0g*xsmGXS`Px&2H{_RauQE@M-W92X$+7Qq@T`jlnUV@Ks^->eDv#t@(pzM zYZ%(Dj>F0~CE^{QIfj4vW-;#iMjqa9=P5$)2vy}tTzcz%T=J$^eB=HGY~gun7(hbh zEYca0rq<6Ru8>NX=~meM%csY2<2&=PlA+krOAB$~>MAU`q?mbJj@8%aV8z;G9?yj( zSHxoFEnY0YIS`+}FCQCIHSI7}l?JQUGh}0>kj#Cj)y^Y@VOVnMJhsOJpZ;1m0+uCX z$*PmM_}UzN;u~!SLNQciYFi9FF~D$}p;%!zLXJ-3$*>80^4=CKzowYiz8V)@-^KE9 z47dO1N&I$CBepS|4kF-!^X3s;AVBe2SB{t&FfGnEl+r@C?H{hEzjyGZ^N+dU(9ri4in$&rd~$Vt-XR70^6GJE{{oKOxaKHi7mL zhS$eW;8s(A8=<;B>N;=|#(DyC(QVHnfMP)_ifCScVFKfyGNjtNwR z7eU2n(tOryh|3YBlke^JF)5`Me)n`>2$FLP(8Txt>^wZUaWhg23h{DuG-}62jk;7Q zX!vCQ{r#_iSYCKDHHmH|A)E}LX!@+FNE8CO8wDv%*}*V_VVdr2cjb*Eg}_K))$+4P z+VF;Vox(+z)#9?XeOR`#jSy;~(HXC1ElLOlTv&?>F004V)#bS8>PlR6RV6OepugqS z2w2jBWtZ0CqAQE3juP>^h$#fo$$bpGUCp!Do!`ZR+)byaV&E}jc+4lmrt!Z2IEYJc z@#Dg4P7-|Sc*n=;@bD(!>%W@C8$X->FdnvyCb6~fN3T+=9(F<${2JX3U1XsUn zFD`y_0s^iJ!3A#(#s|KahWo>tvHSQO!t>~G1ym`eb0*CSL)Ux9aQ8jAR1}2URSbKs z%)s&+eR%KZkKl=rSws@BVTXbHo}b3*H|@hEZ#aOp@6Nnf`-h7ZDW(2N!j~73Fu?dc1<~J(^-6xqyNF~(~gj9ZNWKZUAFN6SZ`5=KGkc#D3 z6yu7U>+tcfjN-nhfv1@t&k?>4?ij&y&T+itnZwVX>7!c9V&%YacDV(q0IKYOYt!-7 zhZ^xx#xNoY*QiopPu?UUrC!&0M3ieHL~CNdGmxTb$O+AEmpTKfwm*jyLl$-Q=?TUb zqV#9^%=t{42pS6Al27K~@m-;KI4}}Fd3h(k^!PgbXjcS&8tTGN!=mxsT|xNC)*aZ% z5Uhj8>!Cs!;jsp$r_nPphF*e7%C2g35Sgt6adIM#HP)kfhQCwEj7>7E9GOHzN4IGd z7u3}5tmdB>}~{p2qWIrYc`gXYk+oBBZFKYR61?r-ugErtnXrtE~y>Sb&;_&21@CQtDlc zE1W?xL$B}**08Mouej+LF21}KOD}047|QA7x;>&60V`^-bY(M^UDC|LTE=BDE?iZL z3ob3krB@J6mvmy;#iLky8Gm1O3M=28fz8Kw(ORgQx`2@KLA-Rh78?)NAR>Pl-b#Xz zDkzqq`TS4w=*V#lWsXy+9i;=M;SKL@#uc~G87{NJl7P$0aphYI@!@Y&;~9qq3&F!# zp_+RD;hNUBq#Z6gqi&A=(endX^Ij^i%NTlHc@Q_exf=iT2%*MsC;k8(m@tSxNN5pO zKX_ymE8ZG}fScFh?jI2}vExi5*Jb(~Me|e?R8q{VqwT;!s;T?dwc_Rv5l#$!0#@y# zQu9-3)Fa{$)s{kMI;@k>*_22K{V(wz?%0(;m1!m!_81uA+JV;rx7B4 z0?=_{hTHVx%Tz_HZgCSre&$68u6xHpJg|NqTjGE%R6fd?mWfC?m+ z>y?g9E`)otrVVCjZWdjHRL9h~na;Ruun*t)(?f)OIm$mH3h4j8r{9tu_y4Y=bp#s9()MjdHzM*`{*$Hfp0q*=PRm){`x+R3ug@vZ)=gK#inftZ^E~Qg0q0=l+!X;}C$pvG9hslFJJTz*$NHWE_dbdoqaw~NQrTY^$x*~pg(w``%Jn|{^&`0Qt^2S-;m?IhSaoX}cKfYxNx;cq z-nxpr5Oil)=nddq1RqPiu-mF%s+Xsp9(4i7pyA4(p5EBva$h7sEU_do`)rumGV6+rB%G< z7iKb?)NL@Q_?hAUN|lLXEM0p7*M9IIe(~}kp7)I)B##wgwMLhZW5=mZUgJJ0DSaMf znVX`LQV*X6CYhNteG#B+NS$nLwc4aqnnfFhdUQ%CtRXlwYTSV799#U-W||*8-0Q~! zFK)nZ*KNl49)BKRdH5OJ7Z`RSm-T?!zzE zt;f$cao;hV7z;W#!jj{AZ_u=`{-{uCaA;JwETG}Uw2Ju!~Xu`vUx0RpR^;8ZB5F=m52 z2c=IcsFOfzqqQ@P-CI(EU$0+}yuM!K_V*#DuMdTUZpgYTS3B2X3=~)X$(0RV` znMG>igFND{o20B{%QK@*DPI?VTQc z%J~5zx*(kttug)sK!?Dnh{O`m$Ndstc0Iy zm|rzmu|~^$EW4UvHm_;GN?x0l$yoh%AAY}c96_1D&f|J6-vIOghLEB@Y|d;zAVYdR zx-6`upG%F~n}nVahDwEXD*hDVq4M8?pnb;?Us{77Z`%zP zMSOSjHkQ9eJQeGw+Br%U29$SpA}H34KdoPf7kBT%^E-Fogf+-fMVUzmi9WX~tbP}<7 zvy4rF2iH&IE$=_YknRAMud2kAw`JkZubn^;L!)?xFB-R$R6CEf`aYyq3?V6R43QZV zh#@c@qO-i^BZVyBR9x4j zl`)(mR36+sjXVCe0T*16%TTk0ime5gT+@uDS7qV7pDV<}R9g-WgHULywkSd)hVXEf zYoaxcNY`EXnxb|D;Z#x@xAd(CJFw=R2aR(DTzmqnt}4UI)p=OCDhrpa&cxa`6yWxc zR^TIFE61mQnv3;GbJ(6a2uC#?t+g7ihB`!+*CCvar{g-A&R;$^f}7q)Re6brs^b*i z`r%^y`nfSA@|cN*4BylSS21TG70vAuE2j`!qWkBpjtb?aM)oHXBKj`!)Cd*T1XblQ ze3gR?&xVo4?^CF{`(1xPVnMP;nc5P|CQ zQe1dV1%E%m?+@bATMzLXRN;FMP2+(b4DXmON69#X^STgK(Z_Im2tfty4CgDcJC7lE z-MG22*rg7QI+hWQ&!P!XntNYMsVQ4kB~@9FGD8sL1U96Mk`kn52&tLZ1SzQr!6vh^ zk@@3bShEvPL?_@+P9Of{NyQ&LDY!r0hd)SdMaJM)8@HojVh(K+GgMG>=$W2DW@#y+ z)6;O2;ZPOT#!sJq3P&31Q8zV(94bEFp`*yyf7C>zLrkYas=THalu(^SpE!XZQL+3% z&dJ^Rf`Cf9zV!bCB|Gg;)FT|%|Uqct-%Iff6 z+XBH$h;MJ&#&X?=7nAlQaQ`XPjL)HZU;sx-ijhhMbfmNxd-HOTk(-T!1qC=%P>6lm zIoOwzgOuaPv6st?oLrn_+SAL5@w=@XSxH9Y1&WYsir#UKvj72U7eK3)__b+=%x@=GfHaK&nWG?gn+8z zK6&2$4xTHWJfdLI^d4?vX!fJW`ta`09LEJ$$KcX6$ymC=k4sk_#f6t-V%bGmSh6Y; zOV=EwLP*C4zI7BYChMLvD!!_EgjdudiiJI@xCfEh<47Y|zItCX*1qiomR*^FrI#PV zTR(CF>mmtpLdu;p2Vc2nAebOb1_+gL?4@E&P|q4cv9HxquWH{)W(by2KTBZsF+AjT z(L*+~hu}CdiD;@6_i?Vr>QuMB>{Ga=+i5D>;VJ8+0vkahugNAV+Y4@pB1k+~dfk59 z^e_AHgXf#gM1>lu?C}Dm@`a8tFZl46ZD`DnZ`(|($I_$n$t{B()G6irT2*}n`w2uX9jc95!8KdwMp>}m5ud4 z23twlc78~yT`8xg8Ls`Ac$O;a7te3Ru6>z!IpqL$Qdw<2l7*M{AHmD}593+F>i1iB zqnV&-9GOH$RxaEb`w+KxKaLcaqHA^z4P)c1n4UvseLY&4uudMMm_SWBcm&4^icPPe z(%q?cATATKbMf1aTd*O)4_96hcJVlYJl>{+Wc+dGF6>B1K-0`Lsz#YFM~)zb!21oM z!>b0`BLNB1Fzpi;EphQ<|G&0p5m6f-y zhjLgG{IllZ?=N#7|MBBqT>i#dI!_B>GK+wVdI-#7eCP|~Cftmqlf@EF34&DVthp5@ znzeZZ9WlB>kkT|ER3(I{=I&O*d@9rF;&u;j@5d+aIe<@mF$eFtD<4;0a|{=)%qFNR zvFy@%f~pNmugSv&w|VeiFLq-4u^Dr7a!5%tRVmY0Gl;NLeK^_-eB{d|xa`JUELX4I zDj#mUD;mg;kWx2_0}OEwvQ)=1{PR>$#a7KCgZtRe?=zam39MfD zYq|(Bs@amRxZZ7u*%yEL43XuDaW98!EHS@AkO5kz5HFNM*Gta3CU98yRs#zguY*!OM^E~x< zwB32F*rw+uo@z9zN_RWx7A^JOY04TYD2>$DlePsYnI71YOhW8!8bD@qyBXCzCN9~K zT69~CffP+Q9RDRqNq`;5EyMnTO8Bx0@%xQC;K?sT`0-qXoy@1YEkkr(38JzKu_ZZ! zK-mtS3fdS-#StdEoN+ivxO7ijqs%*|XL0|F>yh2mOhC*TNT`v#yt^Awsi_12p~25b z$|_LW)q}+2r|`(8orpVn0vSccNXpHHFFPBqqet*$P!Kl6#Gqkv5^YSodIPH&@;&8< zMs#i-QW~1@m^%)S#>V68Pd|r;qFwmWrmc7&!hz@fNrw0<1N0C1*E|?8&aC+ZU!EPT<+>V7Mf;LyKC^^%Ta{XyXbfqmoU^T!HO%( z@aB&c&LMn zjq7t;bxjLWF$`HWX@4ZcpfrY@j>29O_UxjH`{wVuaQ%DeI1Do`xS|~wUNM4zWsQVD z8LoJ13GRJxz|`XE35zb6HdEkw>t;$5|kz&8TTTLR>RQ z#*~ei;RkAS`p6dxaruqeSh{*IL%tNe?e4?ashKKyt|=AsILeZza7}G}8acm-aCjoB zA5TVi7~q>Qua@~&H%y}{s_i7K7y{)F;+{Wb;JQ0@GKAZJOK;wd>)yQwPX+SW3U70$ z5{ugz_DvI5tQ?qc-+N#PtKYaEOV&ui9>$06slfAI9-GIHCs_RTRJxf12w_;hJ{>kMsL*hWpN9D)36(_&kF|-Sb#sJ?GEIG9{2`_J&xhA9*b$Wdt zjy1KLhG8{)lLO~KN=nMQDfVngspy}12~x5yhHveR8xNP&;P+G|j|PR|VcO5uZ^DDY z;dqQ;-s7}~cI{!M@Dg|$W`6bd@foy@PN9p-J|16BQ*IlZ!Xq0tBd@WEKq90Fl}-&) zn43q#;E-vU&Z}#{E>|oL6_yy#{rd4|u|7Bg&+ZDua|F{ffxGcsa4>$qZXMP~Mxu6f z46OuPEBCJfoi93Fh|J7H8AHu{{uWEPJrEp%{ILmaOi5?uk%Lpi!)W9-{oKa7b%hY3 zEe4YrqOiyesI(r}*HfXDxAt#OY~4nH=1?8ZA~`=7f7-DXN9(K5Of|JFF%I67$I#R- z4Dx0E{r#_ixGJg?7Aj3i;--9d*Y`5SQ%{R-Q4pkNOplMA*5cBQu~alEe4j)oekKrj z!#ne_f-365%L=gax&plCvn6_o^!!$6U8twNo_z(i=S#InHEF1ZX>LI@z4z3cBdMTOK|axHCTRg7OuZL6Hj}r zP&I}?ag>dwBle zeu(>CyBz`7ZNbeSjl}wRDix-~T|B{1djN?w9RyW3(wj!jO~Us*Ux_z-z{B)xqlMvZ zAK7o(k@loA9VbQ*m0M4>HiI~x!(%&vTR%{UrB^WD)!A@GCcgaJUeg}sVR#tJvanAo zE{_U`aNNj>=+j^6B3xOST%z$#$MDf_H5iD-F};Zl#eG!Tem&MqQ{WITdgh-XrDeh{-GpH?m6UxO7O$;sx)saC?*u7LvZ(bH;%U}chh{=3>4E(aR2?Iwrspp} zN*ckLdM#WQB({JqLS%(JTM4*(lbyxGJ=%S zQih;gQN!&jC#O-vV}>6+iqIp6xc-1ilYtGFGL6wvIu@J0lNnHP9rc)Mc&AAZq1sHi z?jjhEl~Ls8$@teR3Tyf_MSoW3|vHD%Xxa4iS@WuP85Jm-+AV3kA zemZdym5HC~;pGsiivg@ytHxrc|MGOa<=>0(yw3uZ!rCZ0@aFwJ*pg1A!2NvZcWrpn z9l2C{2XNu)T)h92HP{-%eB{1k2r)N-5Oqj5;|}4v_obStc`vxhgQd6Zz~_H;0xx*_ z5Rt8!C;AvlbyG?8F^uh^@|wlNJ9_Yrj~yg%LK#jb;Ktkc;fMG4A&?-^AWvt`h*5JP z%!jZ3q8qDjI)Mw)rp}OF$7) z7is+20es_knq1Fn=SyPfCP4XHsqk9$$aa2KTUnj;bQ>?1Qa!O%R(q1KMfc`SurlN| zXy7^;UEZW#a_D{x$tpxN)N!YV3U%00zdl0L-^G*&*IyE_yfNCr-$*Qr=P-qzxV=v z{nAVL)eA4+{+Bjb|dp_-8F=DrlFJ+nKIaCjC8 zCr%(WKOegi6VXC2H%v`&N#(|Mng}fCv7-n{NHpWJcqov;<`yD#fNB7&ZT1b;23CBp zbI>^rOim%IxCA??WmmnDjIJ8>Z<24D--U!Ge_9bG+5_@Tskcs^gwtH(||fhj7vA zEG)lrA8vg2aoqF!ChVfK1?P?-qGA$}EOepuL)g>Q4|nYxQs^v+bjo{w(Z}#7lYlu! zsFdPOAJ51AfrHq=!ms=4V(2t3hKcHic9cvR$V6okP}_mqKAMST*QFCuR0Egq$Hg}v z!zaEmg&+SBxcco1Nf=VCOrgR_#+_d)$CFeneu1M%A?q+hiZ+Cov}0FxD>fe-#2+Ji zan*-*A>c+Tkt?~pI+)u!@$ql!;?v0wFf9a464M<_h4S?ucj2119OLl`sI>&;oA%*D z->JZQjib`=0D?-8-f@`ceRRkSJbi)T?b|Z3;oToQg)jm=f+21U zkMWa-=dkweR5us9nT8AmToY>`^*>v?ur*`MJV#GGoAFe$ChVir?`7z{haud@zfOQ$ zzK0Nr#pSmo6{7thXY;Xf#xvv?QzR}BbOk@5eV(E=eeDAS->}H;8^mlL` z6;)9a;uv!6+SiAjgxt^mG=X>C+05(9yuSE2mag54A3ZsV5H-@X!iZ!j8D7*3PeVVB zvl>oeNFG(xi#^O+Jvh_~&n5_{al)ISp;6}=>2H}v{i_X1vvAmhH&uZMQhJn^=G}Lc z^cpbfi8+1^^sF6+N06%QJPT6vorTy<|12eC%~7!MgAJ&2jjs{ibjzijw2dmIw6zsQ zZ7s-cX+lnWGjcjwkk{FYg6?({cXgn=rwe^Nj-V!oR_~$!K)zs%UO&$FB~`T;q{GVD z^}9eZN|mP(-7*cJG~aQXj=oVecMY1)9fM;S;(9}T-_%Fd)ZU4P{y{THQjOY5V|7UW;RC%)Z;$9544R5G9cX&)}Rjr+Yki2(88rn^qj5eH0LQ#jKV&2x>cXhB$M6M_pH z5S%@UZ3NI)?ytdB@1+A@=R&|$w9DMaq2KeFX)AH;uenZY(WI~~_S3+1tP9T`T@ksfo8qh=BK{15VQ*-hzKvZ4ShsKBm! z%L%;WBe{6@$Mf)>PZr^g?<>K|>kF{#s-w7+s&wU>lkoBH=U{URp?7i)Az5vREgeKg z%RD?~Lr9Y22N4jwRyAyfd(F9O9mad7wo9^0&_kTVU@B91#y#14hvF7$v z=35L_-+BmFzC8^ey5}&SjT z_o*2eYzRzJqKuJL0>Ky^dX$iwphN3-+XOSEb(9;9kY*DkgxQ|okzJVJd+k%e8sR>r zv}A))Vg!SxLm3iCcx;7d0+RsILnYH^?jh9R(rL5Q^eLlE*eppj$DQ-kEaU#fax%#n zlZau$ZiML_=Z^xmQCHkT8;{}Ne^HM; z1d-;R3M=YIR9PV|#gdgCEWg@=3)Uv!qFd5%^G6Thn@==h9aYqB zhDU0X(k(W+fjKN!qt08+WN;b__3*Yf-1+$|GxC1Ps$^Vw%K@IhgL&v76kS+)RVo3+ zuhPM~%#%PYy&()&ydwdh{$Vkmi=9N!35Mi^Tm;h>l+(x1 zy4e6h*La(Mo@%lX%hynuu4cZk@!{5w9l zd7eXNy53EDM{&<%1^6fx&$S=oF;>SJ1##(`QmkInfPkerSaRuMLMoZ67%sk+ zYLCZQz9xl$VtBeX12??8kgzYsH~vtHo%`nrCx+vt9dMSlAgQSf8Lji?-o^NmS%$C^ zh|cdcbDOK@ZY!bkod>IN`)BrH`Snp)%IgxanyN~V3A;7~E8iA{f8jOy(yy!WWRxB- zDxmTj6;Cm(gjDu0A=M5S!+#Htu`zKH@B0Gt;Y#NFT85rCIq?3kXJQ9cVGOU8MyH1q zb|ADsQ%bWk$s5P+lO0r0tqdJC1#^!X6BVnmcp8GDr3v?Fry;eVo@546G=+OyN8_RN za1b?^t7k8{Z4SwVl*UMTxK2`4HzCz+Af;||IjfvSuAw<3El8btq}89hi9TDdG&`e- z;Ruu|+VlhgFi8kabH7s>nKDF(;TFD;-ljr#Zei6Wj?-3wAn7Xabd{M%I+c+Q$UdnD#%$?FBm> zS0-2u6G#S{gz*T^P2Z1lImI-NFl}Q5m(sVeYh!;8p!5oGGi*?=T^wt#c+Gu81(nb^ zN>eWwYprIgpT-$}&)TbAb9__Xl+9zkuM6+_N)SHql{kFpD`^CV2lqZ&z_5f6D4s!T zCkruaeFr6ebi){;n^gd3;m)7OMo%w3__YY!@#Q#t@EfW4{4a~~NEB;a0x7a|2+o>b zgqOAuj8qH!?vD`-xa)g~xP$9{@Sfv%&zBG3o&V{@ueY`!GKUUZNsv~}nrUytvgh!q zV-WxL%UrzUi+;TG%c=O6A0Nc`Uo0~>|3(xs3}raus_R62Yct{*E;y^Zd8{cagK4TC zV13d&zWzuRZvWyw-2S;tyz8^M3}p-P?oSsn#4Y6c9>Z6EUxnx6fSpIEI5J1@+oNF9;m~H!wh#a+ZncYAgPgXrUHt}p$ei?OG#=lk-DErcnrLt-@{m^Xm5=2;{VGO3L)J+7L+ zDTtNClVL-IQ93@rbAQ+86Y=41?!#T*O2wCdmxb-R$B?SY-2W(L%!Y!R z3M3=J0YFG;uJK9Q zI89KJ>Aisy&CEqkNX^i(X9Wt{JSih6jE{~I5Ed*n6Q*TSGL|X)((ISA8OC{nlQDYr z6n`TR2n?o+?=47C%}_=44-Ff>j4(9QQfD?v>P;~nvPr^rMxUpcLcNy}WcKvIr>7B? zbdrQxFadU&>&bLJn%8}r3Q;O?ipRE1(3y~0;v40hrhbta9UD{bTj>|@^xIJPwE8LKPIlb)6b?C^bPxlhX3m&{+woii^rr~cMXTA+&INUWFTW39R!rM&6tA|~%Qq%MEBFhG_n@|qQ z)su&ZxULkG?p&DVIy3OK%_Fge6$@eGtQ}z)VMWQM9rDQpC=&`&Ss7q)DRpHlEPWQF zPAr0y+D0f&=ty?Y-Xu*uO=m;u&z;8pRxW6n*0=U^=15llrb%f5@L?de`1GB5Rh4*vLH1{0;tVOCK#VF=|-KUh33=gS}>C?1JE;e zrcr8C=tb_5&$2PrA%Jb;cNfw@&Z0Eo7Y)MxJwif6psGju2-c#X?7OQ&l+_ z0*336LM&vG?ru7?)mAlRRF-NoIZ;B*9F>k9TEH5zTHVeIlj6|<5?HgVeM#*zZib7o znufTU5?!GcYehe|mE+hC9Pm@I`PvAvwlNlT%KfHc9=DI-f}Z`?X}ZQ`F%><82y1&y zjz$Ob)Tp;-+AI~e24#0J?fuxDMF^a1F}1p$>f+{k%6SARW0eEY^YJv}L%gPZaL{-*O-85*@tOW}Kk?(w{Kan-z@gj{Mn*Wr1qVse)cQ89HQ@I)haW!7WIv07{) zc!L=ZO6??Tx@7{?Q8kPRDjhusRB36vRB&E9cATh3_=yS}s%`Pna>2kViOR~imPY>mw}kxpWYwSBUqVZ zS^h0Qw{6D2LE+aNAvL=IDV`0#mkGw)`#F%Zf?WO0@L0CZGRB;v%`Y-aCmN5m*hCdW z7HeriY5`6QfI3@|G4+egoWz1zkh0G0?|l(cECdTGO6IH>L3lxr0hAnl$B70ycn@p7 zURpmAn+NG6!&EKSfIS~&yPvhGq_{CUgQjya4eW%J8ouK-b3q%|ZPgs#R2Ox0L>4+9 zoy5oA%$(;f{JnjcM#paJWsTd(!rV%Q)5P$sVZj>txtVZihr4Q!kRlvw2q=adTE@`P z0|_ZLyze@7E~LijG(Ct^8wXX097>O(lHd07SYOylMIVSs2KDlT{Wm%(`0xX38oesRDJL^(8($~SfG3Oo*_r`7?N5U zn$Yy*T|vi7NW~FSW^5Hh$AmWi);h@FJLwQzbkG4h0z*5R8cJhpHQK$MPT$I~pqa}? zf}@^=yM~Tmb=sndyYw;jDLb&d#r-L}F7^xqKJ*S!&diC&}1T^M7omT@S_fp~P>k?pQ4U_~a7x%T;+~xfYw+TJMC7HlV zWq6g^GH;&nBNL!fnO-TT~vXanw=-0=9wS!6UGG4vjMd@XK4D&eayc`K*_k{(`M({>+uTk zn?gzlH%3)LP-)vB9gB)agY}G6b+MLhp?b356x&coh0{ReXD(f}b%clj zRZT@zkLYp&q>L~jTw<%`WRnc9#;`lP9gcE_ZiH<_sfIEPFr5=dNrh5Xg%)?S*6*cb zQ4!IB!b^to}BZzOI0&3>DHuWO9uA6Y`hqGaXii!@^FvoKt zpa|m7!f7f4Dg`RJSgI!jCxS(J;i~92fD&9ZI@_a%gO*P-Z=_iInLk}zrxj7fO^C?v zL}dOjqKk(J9j2QKO3KU2efk*cB`dsJXrI!1DYN)$LYc}ex|I1rfW#6QUNtfkVktas zO3MtlA*^_Or9sP7DzaoQef(XaV*&vn5NTw$Zaaw)g!o>{#Xy2!u;&<8yPY7Mz-_&R zuLfhP@mr5Sa}z+(s^qAmBFm_xcpY?exE|1|xuX>3xe2PBSuIpTP0VvWC0YZAsS24! zuK-Ud>U|Q!SB*|jP@b7IuuLu}DlOGcm0H_}EJ8|m^6O?XHD^OgK(G{+%v#67(wV>0(BnSs5KfR<3@WKA z`#b$^14($X5o5hSJ59F2n=_zdp3ux=V)*@8X7;dP+}@ahj+U>*v@Y#+f|LCUFug^M zl>9UsR5CT5+onQn8qJ#+zBCUlz=~l}vy@d2m)&Qqi3&iVt5z7sf~RnzX_SCsnAg@# zSaq^+Q;Ag5vC0SrntE@XRs4>Sa@8~tRyAS@cdda5Zwl)o|T5Ui|0sSL{qt&pNF^OWMq@<9`dM3jwS%kee@<}p;O zVofb|(aLjf8{?AO60V+BDXVe9iHeJ1rK4(|&c;xdAl{P;Y&$l~(0GQ&nq_!Gbx8AQ zX47gqYZ0N$&^VQ0nz`Y&4(2gZ>RC&yvmW@VhpooZnPbam;VuE(WizJDEtX+lJi|&i zLq|8yH@HyrKEtUq^Q<*Yeaep6%;`z5GB&o7%uZQDSZpW4XDi2P%gD?|1N0CQmN##8Z9Ly zNJ&WvQkMJ6>GX-txZuL9+l>qUtuCbPwEbeU;bLo}^Frzzv(`BqQc9f-8<`EEvmnLy z_V>2w*nf4J44}?6<(HLDr|mSP{z`kjA(hAiAjyBm1SU&OIV)K3DB0s{1u7L7I++@0 zsWcScCAG1}ZX1NZt&i4YAS6WEPVA;3lZ~TDvVswRAHiqKeW@qoum#WyAsv z!v%K@)j(A%6-g5dbSoXD(}b6Pa}0%?{REtK>rOmtZVeucr0UQto3T_V22zL-c&(Y#8&dX1b` zX9JZi6^3S`@DhM#dK2Y0&o7~l;TFw90L4~O*$`B2hPisL@BK_;GGUY=U~!qmbo*&q z3Q|c7!&3+%8&GNOR3BWX(30C2hAKR788elLIz)6|qfF^n@2Y{24J*EP^O!L_ukaG) zS24phDmMp}P_!DqxeR3m5SZIRP^rU%d0E49R7aJ|r9y5q$sn&uU`{*N(X|%vm{+=0 ziOTJ?s%F`cT2filQX|myoj|2BWhtp~q}B8qNZCs2|5ZpWHv45Df8} z=7wRKX@4T5!tz=P;%=%Qf~tk*!=+%N8*hDtr=JQ|H|44!TwsxDJM##QRTvkTqqaa+0#t_rR4k#Z zu~MoyG~-4{K{vP89S;1BiYTI_2jK*qnIf2GW;) zntDuol!hSK;hyFG|93-5W`pQ2+5ayf6;DMG#{v;oIm8fSh>pMl%bH!&Y^b3%qr)0f z;1i$-s)Ra?JZD%)1>m9N_tXur!1S_UcXQdnf<#C$bo16z{jlK65*z#J1XNNA5gYo= zc5Xr{rgX}fi{Xu%KyX*lv88Yr0y`l5vGO9Btla2od;)kVDo`$ z?96OLR8c>Ib2_kLe+BlirgoI7V5^O#p9P)H!WulhsGANV2kNF{QO%iKfkp^c%XCw< zo1k2$QRk=vHB+eO-)5c>9I4&2Nbl7|ZkkDgu+-z!2`x2j zCpU8&f-H>A8=l`ng*3?T2#=;A8i7UFCQF&BS5EHBHR)F;f%CYr$qXAJ=87m$2@Kp&` z1db{`mMtk=-N&a1@YDz%%8El^QfTL6KG?8QJDEnBYuG^qubG~xKcp4`N@gJS zSDLnYy&;v}I0-*%s07tq<%39|@<^r=rZvrBUmGE%9wC8&&Z+Q3VTq@P>#LBlpvW0D zu17U`0-aFffIJM{{H!5UxbI}ib{1|AomWn!+CPE6NkJqLejbK6u@x-5R6=eZ+n9P4 z%LOtjJboXq0iboWOa~#=IFDF{cQHi+2+e9o;4wNxRtqBXy0HCF4W3QR#k%Ao1RiI| zNKm;6J4dm){0EG3Nz`CKDkT?T=wLYJpsI4w2@(}v)$*7OJG=z7U+c2=ca{twB)g69 zCaBbor4iZHR%5o8=j^T17$yxdVC`SgW8mTCIr{0?Njz3E6`WbJ=1);$c9R;w2@k5J zRH`J6a}rbxSQ;5V6L!gsQb$AFhVS`(GGVc|b=p`m6^)lF(9N_bC@%@xM1sqw@Q=Vv zCS-Js6soWkhH}XSP!g4r%+L3Nk^$60xR=Cm(9d<%Lo3xPGwqKH<|U+L9w{oGb37rX za6V4w&9rH##jc!2Y(7>+IMp%~>@kW}?M+&SG4BN|wFfHXQ`=xP^HH;IMpGf#VV**} zB-^OcQ`_bVRP{m(75U7Z28P&S1te`?F=%y64~WueY=JW21AiS!@2~G@ZNGzuoM-dHr4nQUXaLm4Szj zD_ErxAQ>%l=034h)^;fju{2Icg9-I8Q8%4b6P@WsPgx=hp469yGb9LLG`;upI}I*O zP~jweVx^9_f8ElcS~E#KI^16EUuR5Vrc~9qF*DI#IgeYZ)chPde6wWx5y3 zzH!v*lBN=pDO{jwUh5dv#x54@I69T5eHL*%mYaoeu{l`)qgCUwKt~aFkyQ-2sHR*D z@uCT`;3C$}giko(62Tf-g8@Sr4rtuX_N-HYrb`b82rbbALp7ys8@8ON!SnkHusuf)Sm=UVH(s|9o^Ft-Ie3HiXBHq%b1hI1*YI9^kQa&~W>nHbN2$5K+S1Sy%lj%;83 z8A#a^&;1ip=U>aRS5DLGYbLW^w^u--oQokq44p2rt{*WBH@sbhQ#S$9ISDtN$lW;w z7tKNE4C8vCtm&O}gcv$YGz+RR7W8Nq_-F!8=3pog!NMHHLaooP)+xkrop8c1qKRQb z`xKmAvv76I!AT%GJLV8WM~fl29Bs3Rq%nzqx3uO%&Mqov zx+sDroX6Qkr`VL!ge`fk*iqDp-Goo5j!)GS!4POSL$URz>aan#trWCiyC%IW??xcM z523tBt4ZuSq=)k=^ z7lOyd{ETP*CHBFXn^4eqS{hTHc3BqNP4IWq(Fd5hL!O20#aV!Fq?eGySu#tpR3_r)R zws*1i4`Trjry_{dHguF|?SsF`9Bm6mb!8w$XAz{rSvVsbX9%1b1F0RwJ=j)A2dHG& zMhDWd_E0fxWk|N0&JjpJ?JVxZ9y&{u(nV(u<#9I`G!r(h*jC(*9i<)ES=NP}rJdMG z)f7r45J7;3bG@+I0fKJ;p*4NnUkA1nG-6M6w*izalwjIb-iDpDP^ummA(hZSkGL+X z%g$+dyXTPD3ncW;pMjHYgubiOGPkUYj!HxGh3A*LU{<&{VV1H)DzJE-hfAujqLa&B3v5(fTAF(?nTJWb z6==cyr+ZSV2Kn9$`s6kAFzhswBi0R?o;x&Rx6=ZZ3H`X9pGzq%4g8Jc_T~W({7zFGA7D8= zwJ-!h;hrERENL+3`5MmuqVw1w`b%d1o$HY2Gkb&ceP<);>|f8dGi$$^S-4wle|eAR z`|f!q?uC=;$6mpQ0fY&9itM6s52u;4lw62#IeTwGsDDvTD&&?t;yOc>V-XDuDh zZ6df{I2|T}VTRxo#u_%1p`#6{i25l6SC3F7_2Z?J4cN?ZBA5;mN$7>KW)H0yK$P}J z1+|kQ+xDV%1XlL&cmykd-$5XSa2d??q^x$9bz*B_E7ej1wllN~qXX(39CSbj&)>Ev zwHP=N$Wl}>RIS>_86$9d zQ~?ZAoiRPd_1IEahu!5Z*pgq1t+b%h7Q{64!^>+S(<8^+wS81WRs(nnEmg+KC6(7B zji#l{O+^@9*o;6b!mXKQW)@AsDV+*dgF1~OQsX=;2iuY~@U(T-G+OJu0Tr){Amygg zjAw|O#&eSbJ8KXquXjj(E5cZTM6t5a4c2kBBiv47@u-|=dY{DoNZVoRf|ZAhut z>0Dp>Ys~yR*J;nS(<{H?%UPd$C`ywkO$Z+0$#;kLh*jDxah=sAgG%K zFTAV+LHSMCL&uGz6RZ6tjx~223x7Ndb{ri}Q?A6&i9J+4ajbQn1Wb%TM02ZMr;$LC znYJlz%cZ#yccJY{>qo0sh%m8?K;t?N7TzeXuQ|~pS#w6P;D%E*g;&$6MiE**f;}Yz z2&RQIY*>G!8tV>KVhdrliy>Z+W*Q){lnzJr5P}%;?d12n3fd6JuwyrE2OTIvgAr-L zR9k_p_4WJif_BqJ6;-8iPlPhlr}0mxjS!5Nx+GwtHPdKy4*}c{7vZHaS??pMR^pg9 zUgnc+9x5AIJk_RcPUdxFP48J2N65vu6Lf@@yJZLtL9nn9TTfMDYgQ$K3K|$vbu+x8 zgQ|yap`qPwd{13aO$JP?B#bRUN=nLA(T%WzChRy_X{P&Cn79~H8gh`rFxxiWGLy0} z;#;tix>B2!rj&M7Yap!+DTQo*4yo|PkkYL+iy$S_XmW*m_TWw3ziE2z7MZ3D4$to} z9W7E%rbo7nicLdG%BiZ#hmg!l=45^6SyQ!GA)h+l)#Xk=seAqPfRuUZ&ACo{uAN@_ z6<_u)&$qR0_ByZrdbK^tUdx_d%YJ09Emg1QDpm?F=F^-)8fd9;GrE;U-PHDN6dDW|U7@E94q-bb?TgnbLRstofPb5Zd0D6u^RM zxIuEO+EGTBrXDjM%1ad}Cza#s7M)0jjPVS4G&_W5KF|~`i_OehK+_m1t-sh3v@Zfs zBf*XH6GBl`w81%b#vH|(=B1Ac!Wx#4O0}0p5T*0@3hm6&7*!O%m)W2?$dGe?kGk`z zPzW|nYIr_KrFP7nwiL~_KvVClJ%HARl%Bn)UcxjgMunQ%);1}v*9%g*e!8x@mR7Id zG~9$#WFEuG+;&9q_k^Mr9Ix*%55836xjpZ;rJdB(FE#ZVA@!PGTJc<`J=b1+XZ9h_ yx3z8dISCp1c(R0000b; literal 0 HcmV?d00001 diff --git a/common/include/dialog_ui/js/i18n/en-US.json b/common/include/dialog_ui/js/i18n/en-US.json new file mode 100644 index 000000000..0714fc75f --- /dev/null +++ b/common/include/dialog_ui/js/i18n/en-US.json @@ -0,0 +1,5 @@ +{ + "message":{ + "hello": "hello world" + } +} \ No newline at end of file diff --git a/common/include/dialog_ui/js/i18n/zh-CN.json b/common/include/dialog_ui/js/i18n/zh-CN.json new file mode 100644 index 000000000..53afe2047 --- /dev/null +++ b/common/include/dialog_ui/js/i18n/zh-CN.json @@ -0,0 +1,5 @@ +{ + "message": { + "hello": "你好世界" + } +} \ No newline at end of file diff --git a/common/include/dialog_ui/js/pages/index/index.css b/common/include/dialog_ui/js/pages/index/index.css new file mode 100644 index 000000000..a8c28768d --- /dev/null +++ b/common/include/dialog_ui/js/pages/index/index.css @@ -0,0 +1,38 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; + opacity: 0.8; + background-color: azure; +} + +.title { + font-size: 48px; + line-height: 70px; + font-weight: 800; +} + +.but { + width: 85%; + margin-top: 10%; + text-align: center; +} + +.but1 { + width: 40%; + font-size: 26px; + margin-left: 10%; +} + +.but2 { + width: 20%; + font-size: 26px; + margin-left: 55%; +} + + +.title-list { + font-size: 38px; + line-height: 40px; + font-weight: 800; +} diff --git a/common/include/dialog_ui/js/pages/index/index.hml b/common/include/dialog_ui/js/pages/index/index.hml new file mode 100644 index 000000000..1ec849137 --- /dev/null +++ b/common/include/dialog_ui/js/pages/index/index.hml @@ -0,0 +1,16 @@ +
+ + 是否允许{{ message }}连接本机 + + + 用于分享图片 + +
+ + +
+
diff --git a/common/include/dialog_ui/js/pages/index/index.js b/common/include/dialog_ui/js/pages/index/index.js new file mode 100644 index 000000000..85c42a6e6 --- /dev/null +++ b/common/include/dialog_ui/js/pages/index/index.js @@ -0,0 +1,29 @@ +import router from '@ohos.router' + +var times = 60; +export default { + data: { + message: router.getParams().targetPkgName, + }, + onInit() { + console.info('getParams: ' + router.getParams()); + this.timeRemaining = times; + const next = () => { + --this.timeRemaining; + if (this.timeRemaining > 0) { + setTimeout(next, 1000) + } else { + onCancel(); + } + } + next() + }, + onConfirm() { + console.info('click confirm'); + callNativeHandler("EVENT_CONFIRM", "0"); + }, + onCancel() { + console.info('click cancel'); + callNativeHandler("EVENT_CANCEL", "1"); + } +} \ No newline at end of file diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index 492de42c1..7878b4266 100644 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -172,6 +172,12 @@ const std::string BR_MAC = "BR_MAC"; const std::string BLE_MAC = "BLE_MAC"; const std::string ETH_IP = "ETH_IP"; const std::string ETH_PORT = "ETH_PORT"; + +// ACE +const int32_t ACE_X = 50; +const int32_t ACE_Y = 200; +const int32_t ACE_WIDTH = 400; +const int32_t ACE_HEIGHT = 200; } // namespace DistributedHardware } // namespace OHOS #endif diff --git a/ext/input_pin_dialog/dialog_ui/js/BUILD.gn b/ext/input_pin_dialog/dialog_ui/js/BUILD.gn new file mode 100644 index 000000000..8abf88695 --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/BUILD.gn @@ -0,0 +1,22 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/distributedhardware/devicemanager/devicemanager.gni") + +gen_sa_dialog_js("dialog_js_files_etc") { + project_path = "//foundation/distributedhardware/devicemanager/ext/input_pin_dialog/dialog_ui/js" + dialog_name = "input_pin_service" + part_name = "device_manager_base" + subsystem_name = "distributedhardware" +} diff --git a/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js b/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js new file mode 100644 index 000000000..c3234a50d --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js @@ -0,0 +1,86 @@ + +;(function(exports){ + var KeyBoard = function(input, options){ + var body = document.getElementsByTagName('body')[0]; + var DIV_ID = options && options.divId || '__w_l_h_v_c_z_e_r_o_divid'; + + if(document.getElementById(DIV_ID)){ + body.removeChild(document.getElementById(DIV_ID)); + } + + this.input = input; + this.el = document.createElement('div'); + + var self = this; + var zIndex = options && options.zIndex || 1000; + var width = options && options.width || '100%'; + var height = options && options.height || '193px'; + var fontSize = options && options.fontSize || '15px'; + var backgroundColor = options && options.backgroundColor || '#fff'; + var TABLE_ID = options && options.table_id || 'table_0909099'; + var mobile = typeof orientation !== 'undefined'; + + this.el.id = DIV_ID; + this.el.style.position = 'absolute'; + this.el.style.left = 0; + this.el.style.right = 0; + this.el.style.bottom = 0; + this.el.style.zIndex = zIndex; + this.el.style.width = width; + this.el.style.height = height; + this.el.style.backgroundColor = backgroundColor; + + //样式 + var cssStr = ''; + + //Button + var btnStr = '
完成
'; + + //table + var tableStr = ''; + tableStr += ''; + tableStr += ''; + tableStr += ''; + tableStr += ''; + tableStr += ''; + tableStr += '
123
456
789
.0删除
'; + this.el.innerHTML = cssStr + btnStr + tableStr; + + function addEvent(e){ + var ev = e || window.event; + var clickEl = ev.element || ev.target; + var value = clickEl.textContent || clickEl.innerText; + if(clickEl.tagName.toLocaleLowerCase() === 'td' && value !== "删除"){ + if(self.input){ + self.input.value += value; + } + }else if(clickEl.tagName.toLocaleLowerCase() === 'div' && value === "完成"){ + body.removeChild(self.el); + }else if(clickEl.tagName.toLocaleLowerCase() === 'td' && value === "删除"){ + var num = self.input.value; + if(num){ + var newNum = num.substr(0, num.length - 1); + self.input.value = newNum; + } + } + } + + if(mobile){ + this.el.ontouchstart = addEvent; + }else{ + this.el.onclick = addEvent; + } + body.appendChild(this.el); + } + + exports.KeyBoard = KeyBoard; + +})(window); \ No newline at end of file diff --git a/ext/input_pin_dialog/dialog_ui/js/common/index.hml b/ext/input_pin_dialog/dialog_ui/js/common/index.hml new file mode 100644 index 000000000..3566d9ba2 --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/common/index.hml @@ -0,0 +1,32 @@ +
+ + PIN码连接 + + + 请输入另一个设备显示的PIN码进行验证 + + + + + PIN码输入错误，请重新输入 + +
+ + +
+ + + +
diff --git a/ext/input_pin_dialog/dialog_ui/js/common/pincode.png b/ext/input_pin_dialog/dialog_ui/js/common/pincode.png new file mode 100644 index 0000000000000000000000000000000000000000..6616f7659fcf1d5da5ab6796863e32efbe086cdc GIT binary patch literal 35390 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 yx3z8dISCp1c(R0000b; literal 0 HcmV?d00001 diff --git a/ext/input_pin_dialog/dialog_ui/js/i18n/en-US.json b/ext/input_pin_dialog/dialog_ui/js/i18n/en-US.json new file mode 100644 index 000000000..0714fc75f --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/i18n/en-US.json @@ -0,0 +1,5 @@ +{ + "message":{ + "hello": "hello world" + } +} \ No newline at end of file diff --git a/ext/input_pin_dialog/dialog_ui/js/i18n/zh-CN.json b/ext/input_pin_dialog/dialog_ui/js/i18n/zh-CN.json new file mode 100644 index 000000000..53afe2047 --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/i18n/zh-CN.json @@ -0,0 +1,5 @@ +{ + "message": { + "hello": "你好世界" + } +} \ No newline at end of file diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css new file mode 100644 index 000000000..f71aa930e --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css @@ -0,0 +1,48 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; + opacity: 0.8; + background-color: azure; +} + +.title { + font-size: 48px; + line-height: 40px; + font-weight: 800; +} + +.title-list { + font-size: 30px; + line-height: 35px; + font-weight: 800; +} + +.title-error { + font-size: 15px; + line-height: 20px; + font-weight: 800; + color: #ff0000; +} + +.title-pin { + font-size: 30px; + line-height: 35px; + font-weight: 800; +} + +.but { + margin: 10px 20px 10px 20px; +} + +.but1 { + width: 80px; + height: 36px; + font-size: 26px; +} + +.but2 { + width: 80px; + height: 36px; + font-size: 26px; +} \ No newline at end of file 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 new file mode 100644 index 000000000..a8be01f5f --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml @@ -0,0 +1,23 @@ +
+ + PIN码连接 + + + 请输入另一个设备显示的PIN码进行验证 + + + + + + PIN码输入错误，请重新输入 + +
+ + +
+ +
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 new file mode 100644 index 000000000..7e358fc5d --- /dev/null +++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.js @@ -0,0 +1,36 @@ +import router from '@ohos.router' + +var numbs = 0; +export default { + data: { + pincode: router.getParams().pinCode, + }, + onInit() { + console.info('getParams: ' + router.getParams()); + document.getElementById("error").setAttribute("hidden",true); + }, + onConfirm() { + console.info('click confirm'); + numbs = numbs + 1; + if (numbs < 3){ + var input= document.getElementById("input").value; + console.info('input: ' + input); + console.info('pincode: ' + pincode); + if (input == pincode){ + console.info('pincode: = input'); + callNativeHandler(input, "0"); + } else { + console.info('pincode: != input'); + //刷新页面，提示输入错误 + document.getElementById("error").removeAttribute("hidden"); + } + } else { + console.info('click cancel'); + callNativeHandler("EVENT_CONFIRM", "1"); + } + }, + onCancel() { + console.info('click cancel'); + callNativeHandler("EVENT_CONFIRM", "1"); + } +} \ No newline at end of file diff --git a/ext/pin_auth/BUILD.gn b/ext/pin_auth/BUILD.gn index 603d4ff14..837223468 100644 --- a/ext/pin_auth/BUILD.gn +++ b/ext/pin_auth/BUILD.gn @@ -25,10 +25,38 @@ if (defined(ohos_lite)) { include_dirs = [ "include", "${common_path}/include", - "${services_path}/include/adapter", "${ext_path}/pin_auth/include/ability", + "${services_path}/include/dependency/timer", + "${services_path}/include/config", + "${services_path}/include/adapter", "${services_path}/include/authentication", + "${services_path}/include/ability", + "${services_path}/include/deviceinfo", + "${services_path}/include/devicestate", + "${services_path}/include/discovery", + "${services_path}/include/dependency/commonevent", + "${services_path}/include/dependency/hichain", + "${services_path}/include/dependency/softbus", + "${services_path}/include/dependency/timer", + "${services_path}/include/ipc", + "${services_path}/include/ipc/standard", "${utils_path}/include", + "${utils_path}/include/ipc/standard", + "${services_path}/include", + "${innerkits_path}/native_cpp/include", + "${common_path}/include/ipc", + "${common_path}/include/ipc/model", + "${innerkits_path}/native_cpp/include", + "${innerkits_path}/native_cpp/include/ipc", + "${innerkits_path}/native_cpp/include/ipc/standard", + "//third_party/json/include", + "//utils/native/base/include", + "//utils/system/safwk/native/include", + "//base/notification/ces_standard/frameworks/core/include", + "//base/notification/ces_standard/interfaces/innerkits/native/include", + "//base/security/deviceauth/interfaces/innerkits", + "//base/startup/syspara_lite/interfaces/kits", + "//base/startup/syspara_lite/adapter/native/syspara/include", ] sources = [ @@ -38,20 +66,33 @@ if (defined(ohos_lite)) { ] 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", ] external_deps = [ - "bundle_framework:appexecfwk_base", - "bundle_framework:appexecfwk_core", + "appexecfwk_standard:appexecfwk_base", + "appexecfwk_standard:appexecfwk_core", + "appexecfwk_standard:libeventhandler", + "ces_standard:cesfwk_core", + "ces_standard:cesfwk_innerkits", + "dsoftbus_standard:softbus_client", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", "safwk:system_ability_fwk", + "samgr_standard:samgr_proxy", "startup_l2:syspara", + "startup_l2:syspara_watchagent", ] defines = [ diff --git a/ext/pin_auth/include/pin_auth.h b/ext/pin_auth/include/pin_auth.h index 2129c94a1..b2636e0af 100644 --- a/ext/pin_auth/include/pin_auth.h +++ b/ext/pin_auth/include/pin_auth.h @@ -20,6 +20,7 @@ #include #include "authentication.h" +#include "dm_auth_manager.h" #include "dm_ability_manager.h" #include "pin_auth_ui.h" @@ -29,8 +30,8 @@ class PinAuth : public IAuthentication { public: PinAuth(); ~PinAuth(); - int32_t ShowAuthInfo() override; - int32_t StartAuth(std::shared_ptr dmAbilityManager) override; + int32_t ShowAuthInfo(int32_t code) override; + int32_t StartAuth(int32_t code, std::shared_ptr authManager) override; int32_t VerifyAuthentication(std::string pinToken, int32_t code, const std::string &authParam) override; private: diff --git a/ext/pin_auth/include/pin_auth_ui.h b/ext/pin_auth/include/pin_auth_ui.h index f8910cba2..61575797f 100644 --- a/ext/pin_auth/include/pin_auth_ui.h +++ b/ext/pin_auth/include/pin_auth_ui.h @@ -18,6 +18,7 @@ #include +#include "dm_auth_manager.h" #include "dm_ability_manager.h" namespace OHOS { @@ -25,8 +26,8 @@ namespace DistributedHardware { class PinAuthUi { public: PinAuthUi(); - int32_t ShowPinDialog(); - int32_t InputPinDialog(std::shared_ptr dmAbilityManager); + int32_t ShowPinDialog(int32_t code); + int32_t InputPinDialog(int32_t code, std::shared_ptr authManager); private: int32_t StartFaUiService(std::shared_ptr dmAbilityManager); diff --git a/ext/pin_auth/src/pin_auth.cpp b/ext/pin_auth/src/pin_auth.cpp index 5e123b0c5..138abc56f 100644 --- a/ext/pin_auth/src/pin_auth.cpp +++ b/ext/pin_auth/src/pin_auth.cpp @@ -33,15 +33,14 @@ PinAuth::~PinAuth() { } -int32_t PinAuth::ShowAuthInfo() +int32_t PinAuth::ShowAuthInfo(int32_t code) { - return pinAuthUi_->ShowPinDialog(); + return pinAuthUi_->ShowPinDialog(code); } -int32_t PinAuth::StartAuth(std::shared_ptr dmAbilityManager) +int32_t PinAuth::StartAuth(int32_t code, std::shared_ptr authManager) { - times_ = 0; - return pinAuthUi_->InputPinDialog(dmAbilityManager); + return pinAuthUi_->InputPinDialog(code, authManager); } int32_t PinAuth::VerifyAuthentication(std::string pinToken, int32_t code, const std::string &authParam) diff --git a/ext/pin_auth/src/pin_auth_ui.cpp b/ext/pin_auth/src/pin_auth_ui.cpp index 691e50052..a3cfeefe2 100644 --- a/ext/pin_auth/src/pin_auth_ui.cpp +++ b/ext/pin_auth/src/pin_auth_ui.cpp @@ -18,6 +18,8 @@ #include "dm_ability_manager.h" #include "dm_constants.h" #include "dm_log.h" +#include "nlohmann/json.hpp" +#include "ui_service_mgr_client.h" namespace OHOS { namespace DistributedHardware { @@ -26,18 +28,47 @@ PinAuthUi::PinAuthUi() LOGI("AuthUi constructor"); } -int32_t PinAuthUi::ShowPinDialog() +int32_t PinAuthUi::ShowPinDialog(int32_t code) { + LOGI("ShowPinDialog start"); + nlohmann::json jsonObj; + jsonObj[PIN_CODE_KEY] = code; + jsonObj.dump(); + const std::string params = jsonObj.dump(); + + Ace::UIServiceMgrClient::GetInstance()->ShowDialog( + "show_pin_service", + params, + OHOS::Rosen::WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW, + ACE_X, ACE_Y, ACE_WIDTH, ACE_HEIGHT, + [](int32_t id, const std::string& event, const std::string& params) { + LOGI("CancelDialog start id:%d,event:%s,parms:%s", id, event.c_str(), params.c_str()); + Ace::UIServiceMgrClient::GetInstance()->CancelDialog(id); + }); + LOGI("ShowConfigDialog end"); return DM_OK; } -int32_t PinAuthUi::InputPinDialog(std::shared_ptr dmAbilityManager) +int32_t PinAuthUi::InputPinDialog(int32_t code, std::shared_ptr authManager) { - if (dmAbilityManager == nullptr) { - LOGE("PinAuthUi::dmAbilityManager is null"); - return DM_FAILED; - } - return StartFaUiService(dmAbilityManager); + LOGI("InputPinDialog start"); + nlohmann::json jsonObj; + jsonObj[PIN_CODE_KEY] = code; + jsonObj.dump(); + const std::string params = jsonObj.dump(); + + Ace::UIServiceMgrClient::GetInstance()->ShowDialog( + "input_pin_service", + params, + 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()); + }); + LOGI("ShowConfigDialog end"); + return DM_OK; } int32_t PinAuthUi::StartFaUiService(std::shared_ptr dmAbilityManager) diff --git a/ext/show_pin_dialog/dialog_ui/js/BUILD.gn b/ext/show_pin_dialog/dialog_ui/js/BUILD.gn new file mode 100644 index 000000000..8c623e7f8 --- /dev/null +++ b/ext/show_pin_dialog/dialog_ui/js/BUILD.gn @@ -0,0 +1,22 @@ +# Copyright (c) 2021 Huawei Device Co., Ltd. +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +import("//foundation/ace/ace_engine/build/ace_gen_sa_dialog_js.gni") +import("//foundation/distributedhardware/devicemanager/devicemanager.gni") + +gen_sa_dialog_js("dialog_js_files_etc") { + project_path = "//foundation/distributedhardware/devicemanager/ext/show_pin_dialog/dialog_ui/js" + dialog_name = "show_pin_service" + part_name = "device_manager_base" + subsystem_name = "distributedhardware" +} diff --git a/ext/show_pin_dialog/dialog_ui/js/common/pincode.png b/ext/show_pin_dialog/dialog_ui/js/common/pincode.png new file mode 100644 index 0000000000000000000000000000000000000000..6616f7659fcf1d5da5ab6796863e32efbe086cdc GIT binary patch literal 35390 zcmV)LK)Jt(P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>DiPK3$K~#8N?Y#$l zTvwU?FWYgPVmsAwIw7GGS||x*>FlzwES*5;OW#lyNJt3jJ$B+=C97+snUORj&8WK< z*_PFN@4fflp8xZlt82@~Ap!E^v%lY;(dX5ja?82rp7(p6_ndRj4cML4is$!L;ibcM zh%6t4zYXxU0twB4w|O3(rdh<+O(M2-+_Jhcc$+4%w+~3~0g~G0;Ax!Xy3_Er&mp08 z2J!qows8XPMy}8I@hwyEw$CE5gZpcnL2UCRqN;}wT-uG0vL5r^SwD&xT2##tA}ae4 zT|12Ex)J_1h`_=QY&uboZ8W2{1ptKG0 z_YwHJ=aASrgNUkL1QoZNZQ@!c5MJ4f(6VkM^1Qt*)9`l!uDVfvoXT4D)`Lc|VQ#hEcd`2jFj?LV7Qd%47IiC*fl_2jEs7GylW#TdieYE7qqMV8gy*IEuUBW`4QL z1`t;{3_tTbrIqK&WrD7?u_>mL*S4PdNsDEEyP5ZiEHja%LkKD8!OI70@KjO}*6pjt zuIx?(=5-;ea)kN8>%i?@+&-p$jMt_gF-&)S6VJVQ28nI+EKBoIb2Cqd{V;}nFfdSeWfJxd6ZI(7aKS$HMxz}Lafw6zS{r;v1&<-2{J|;QI+W$TX5W2q+dLIhP8JoA7eh(y>|S z;^-vtgn)+*Cn&{pX~00!dqGM-5)>SSk^u!xKng1Az^;NegqHUjU znP3%DFNg_JL*_ewx4=7v-G!~#aJ-7=)XnY2x$ZE*I|5$^otyAUCC~*V<%?h*OE9{b zR~~*&Ag~f?0#u^Xq~p~PQf-q+ApjFwCz!_s9MhHDG0X1-va!=}vMoVr*FKs5+E=nF z2IgxDm+1snN;~)8IEHxUYa-Y45)AIj0eE=b;%kNpr!Kh4`;gqk{3z)~OmQz_D~8}} zARJq`FXp{Z5Lvk9&T3X7<%5VSBfz#qtzcHHJI zC&t0DEz*Z;;>fSU>=tb}mL?;)gySlFmY%7$6sCXABuv(R~1 za8zTe=8U7$#|uKnCi$CX0#p9e;rE>Y}lRUjUSo>2cOiEtuY)fs<{frmh?3euogr z{lwDwPD5(J;t2;ErUt0ydjgK2IlobfEPzV@lZtW@TAQW_~9SoK%A@ zI+c`^oB5(VauCLD0@1_sPUJBKD8b1#54V$&N+c*{dhcXj2~0k!BB>~M?T}GaNd%B> zKB`z%APE8=fh84{Ko~BDR08wcL$#Q~b(6Fnm5IRQU`61r=!cKjHI=_b6?P)JxCimf zH^E8fsn@>d38HyZS%ni~yRuuc>r@Lu3b{QY#` z>j*#|!cLHiBIpFEa4NT$YUY_LLMkdLDV3qH(jEh5;?ofL1)}k(n%FXVA5d( zsOVaKKgtl0Aq2xVDX9pCATFjSu9=}I(9fqq-(nXaWx*v~W%60(FY z!zif$<8mv1~#!$7@D8lf{J}QI` zys*C*&+jY3_UuLk6}DqXP9wq9j2ND0BDWW$5(saje0VIGAQeY=d$|;(1gOyBc7&I7 z5dgisMneWv0+Cdc6)I90F|1S@p}&>;Bxu}RFP6^j<9Y&BilE5-dl`ntRt+G8z}#}U z9NUf(GAC*gm{pIc;!c8$fG_JYpt>9f zV^~Sa!b+GHUcWd(%RxX1Qcl7vrMeF}%>x)@K~}goLYv_GY1%Boa|TkjEryh!wAlXn z`rrBraI;`+I#P?>*=;O9R>2A@>P19JKb?W$OzWI!6pv@9B(-EKrbrgj!2CAsriGQ! zaR@389mO)LCKhO0K?zcp`Vb(_C={9b?(}DZh7RE(2n8Es1dQ6CVjE`&j#)y-S}L6L zw#^$8jG_o8x7tz`U?$ZiFnQ>>+Gh;I8V4QLMO7de*`~(%J#_v^hG0@xeyRjJJT>bm zJyIWX@a}m7RH>wdjv1s4XkE3DF=XXZ4eo-hZ6T#ycp@bmzm3_4NBt)eNPsyQwnY(Q zPX6wtg7T>moRIPoik6KrzZK?L4duQzhFYx?2rX*Irel@Zdc2yT>chT%aA}7=OrOFr z=9NOSBtpu^YbNF6;I)b2`d&iK3j0{;@O-u&tH2}ihw(?(0c<{8#&voKG=`K+R}4WI zO-Kn=$*go_sjPqwkOryTK7yfma6uc7J!smdyv%nkT?0Y&q36hRkJ#t@h9Bg^{nbaFn!$`39iYE0WNX4;$%LJ)V7GkaEAw<>I6icTRtSlA95Qz{Kn5=!O4NKu4Lpi2ZJ$yE# zOas2!WLWS8R<)t&d!@rH1vsvwP*qAwKvDy`RFw7EYE0KTn&Z&1ZFAHNVrMQxDPvSn zT!xf%5LB!Hs31K&e;@aw9=nvTIRapgONDM~r(!-6dU1qe0@o9ywq#b(su5Dywh;EI z0a@)o+_n?&Q&oBisbuDfOd*=9lJKn^MiK$MuLsyiCFCX~w`Er1r^O zmZ^7;KuRQ_oK>R;Ddv zR4XCT!Z3ywM~hc`4*?~!;U|y?Kx(rv?G|b`dqqg;v)Yy>O*>YEX>6yGVL_Hk5}aHF zhEYb^{{ozBld{r!3iI^dQgYVvG^F@jwAy#tbsTGmfzC;=vfH1m(9cqiwkeOC+)iPg zo9pgom={#oLP+)Tyy#>+cOUne+&Oa^QmKSgG9e{Z6;-Z=;%5kS3EO)c1wRZBI~z|Z{)DvFf=^IGL*cTNk_)lLu%8BjW@&Lc~D zsp9$(PYC%4DHkCXN=T(HKq`U?OFex8lt*og3h4={P;R$_s%dvFLCLUDjq_VG8_d#C zK5!PKJcLwsOCKmIt#FV0nV6raikcy$2q;V$gAJ;`8&Zp5^q1_Puh;Vxu<>9y!@Vj~ z*xaglSu;kJ(TTW}q?VlpDLF2kSi=Jp9?2PvLZK5_-RTNn7C@y&bG1QO3KWDimJfPLawgq*m^3vh8g}QqiU*EI}r;w!?|dxxd=KBc^0SyB_2!XV8KXWQ_tK2q!u8ib|#&J+Rg+dos-&~LJ5&5 zhDm}}g4&k|0o!!`v5jM<-6@XH*;CYp;9`b2)e4UpDiKl%Z4=BdE@jPQmhm|8+)hvm zDQu-vk63M0f+wM;a4)>1+k|_%PVoej8N)=Nd#Pqp2nrigp}DQJ7ON4Qm5z`5NaXo> z8P;i;rXE675(H8LRiYZ#(+SHAwLKAB4u*kSk5^*d{zAf{n#xJT4f+U3HQo~#ey)4oF|a55}%HIE{plZvCA03e{;O;l=hdJi4gLs)2hkM?2qDTib_)FmxQ zxd|yZ3%5&+`!qMhQ8kK((D}AxHDG%#RZ4N^>9JP=j!{ztm|&x!24w5S4WtAidkBS#5D}z8%DSnh26&!K7rzq(eG0w0!F^95w3H!> zdMryVi>@K;c;4}Zk(a76f#4RPy!uSVBom}G)WFGbF_xiZ8uz81JFC}@=OSgub5kR7 zL@|$F+=CdZ;8=!P0+XM4BS;BWkp-Q`V)?s=*EfL`Q7ZS7#C-7a-2B{EGS5eFQpl$P zpIW9-(WOw)#nlZWh@tAHBW2i`Rd0F=J>1SG*fVeU;x};XQ0S+bPNMQ!Il6_?4(n+6B6p>qaq5TMKFAeC9I8lqIm@< z+ZHLQL_$h!QW|+KSgDa*J!-bHHO9PgRt`aJilGG^Mzy%rTP6@ueI_w~QW^GX#JHF0 z#Lw>%xQr(>(x`NkxsOEVpNH2pndh0&Jq>goXd0LHHfEzN^J+ismOO^)*&pv11^T-@q|qRuU7)EpA?nHnBd3!s-7Tp zsP+nbv3`FQ{uF--n~ye_ae8WaR~y#mV|9dNyVV%a^txFlHT*&5ujGywZD(xelFExwpADb$@0wP(+os`f95R~aI zHGrz1vk)SRTP4JR(angC6 zR7){*(5SirT0f#{b?Zw%6&DLUe^21?y*!Q$DXA%qm5H?>Rm(zMV}Z)4;Sy8}8vC@X zpdFh|)*-N{!+=AeFt!lxsZGj^iDD=!_-OQca7nLeSl2i#t1+EvltSb-c9>`y*cTvW z29^>?iJcmlYAGh|UusR?>%E3p=yzLX31&%DKt8IknA$-^Fl0&_a>h$kDr2|Ivw z`zi^gPJ(LC3}px_>fyC#{xmUkW_nc-YS@L|CzQA2SbaOX={tgy8qI|xHJZ;7O8;9S z^;&RXuk(+4y;_QF`^TnAuYlm}785eKDb1Z4Ovl0&%i1cTaSAbnmjx+8!btK#ssh%O z+06u1EdmRyMqrN$Hl0`9-ad^MrYTI+y=el6Q_6@=8_hxi?u!mA8-1G6X25veCbC-Gn2_kRnf>BW>a4AdFk|D4x&Ww%fUT7fiw!%BYM2*F^ zned0;aaQnqI-QH?~Di=FWwjz+*NoCJ% zw4ND%#eJ(yNf@qAhVcARK1?G382<0;kSsASZJph2H8EWpv~-JvpY*9{UT8Vkeq z2(maz__%7WS4HKdHX%BwlvFH3k7yS7t@#buUCe@5+-YuwFf}59ltAbt>Yl+mhBb8z ztLk+R*upS~x>@sG9L-h38ko>>GA#}k^w81)GbT#6#>BVi-n`k@CLz2!x(g5pCBioNgysH1~DsM&mh4 zJ$21<9gWvw_(?d0mGWFQVw@qbAmwQxU|Okm+6VzIWr+(WNX1fZh8DHaS)1sj44b6Z z7+Oj3D#TOonX6K_w=jPysdCG?KPo1l)RG2I787KJ3~h7!5p=8>VOcGR$!8uFFx1WK zLtKfVHA+B@BZKGTRU2Lz!$n@xxSD>eA)N}y$^FI?B0iq4p8!{zQe5>UK|?@QPcuve zL(E}B6tH3|pFu+HJk!AZWZtH?0(;v)1qUQn(`ta2k|8RrdIV*&QlUz63xdpV-9i&v zJ4-N0IZm0uo7+z|nqe^-im-#G&l?U`QfZZ7{ee?m$VU`Z!79&bfd#Vi#U3ot{=1nxVj5mW+%Q3VSvEviKA7F1dKo`qfD z^6F=-&0`8umU#)RM8e8vjOwbH;TM(5!6BU|LrN+ZI~0#&C>O6g0jhXRo^xE~6uflq z;Oq_ro@_=;@c=_QLaS&3`&)n%f+3-TDyF!f%W0%B|9q7MOW`CuWenvQN~X08G0z7H zw+ZGyLC$OAR_|RU^Pz|eOW_%nWt=(YJX|Hr+Y(^s;XZ6T*n%BL8W4P95HWc`#3_Z8 z%mtl-={x0uRlhIq_dUK`!l=%^&9 zsnT|yYR1OHRd``x*)2%bQ06n_OKO}qwPj>3;4C6w3J8trIXY%L!Wn8r z^Y_Sl7W}3mgjDunb5(GkN-N3e%Acn~d;pW_L;m|8m7IVMQC2`_iUJl_kN0+iay=;VZww@p*X2vS@} z;Ts)NvoTnZQaCqa?j=;XXN`lh8r!9$Ojt*dNOh?lO51Cnx?x)5!88s`odXJq!x`f4 zA)p=A4BrT%c&RC>CNC|Ka1x-Tq~aRryoA0&KFx&Sq1s7TZy`fy4KGNjnPfgs(`Mo0 zHA!LK#3__h8xg~%s62*5xm1pXhJ$$-oyEM&q&j4NdJCD4x;}g#mrr1o14#yC1R_D= zp&D|Q^dg=BiDRBRO9ZAVDkQ>#kaKe#FV_v@ez&DhWA~wHgk(-4@&v)heMTJR{(0S# zxlb3DZdyE#8PBwMStbNBPX(1SRhX{1#(_Did&~{ku3Dy**H@h)G0f`_&4!WPL~A|` zCEd5Dv3xS!8WUI2f`c_JpuoitAvMJUZM4#9C1pd(3iISni#5StV}FnHX}h!cr*yoQ zzq8Z(`a1vFsj>m|*Z=)_8eiXZ5>jeA5R3#S7efh|y0fjYLhlJFhF4NiYV6b~R;e`Y3aIt2OZJ$L%eIEkL zS`ns3;l^omyF@H&-KS$a@UK75#E0)af;+yp4|jimAMOvS!=7x0IxM{ID%Ri(HFQsx zdd$KZf|*{kqIRQlq+aYBmIW63y)`eC03w(ujAN)og`?RFq;{l+)Yha>&K?t`wkoxE zsRvOZp$3jR7@A0RDWtS-&(RDFnj%JXS!voB6IxQ8nYJ;e$3xQ?Fok&nRb+*FL+v35 zqn0&MLA6gJsa*}i+y~cFs27w^pjGrj_si+#;3V$Xs|I9-+ljm$eulub6A&{wngJ|7?XS|vXJvl?tpU>Ojw z2s&5!tZ9pqvQ!62JS!uYLPA0~oG{v*s{y2q3;|hIin_RNuW2LI@B_6+spna3QU|J= z!OM3VQgRf_>Fi+$|Af@}UuUOEM|!QPI{WX>)A;(PlaLBxysw6HBfqJlqF9s4)R6A3 z8sTq!4EHGAsh~7cSdHkW3%HiGcg+x$)F2Bol@e>_-)?Kf^&g2qz}nqd@fHUzynQP^ z`I`fHHmx5HDj7Fbi?eM6yUQ8~tv-fNEND%WCQSV0rY5X`5 zwFu8+2%*}Zp-KXw;h_qNZR%wh)q$|`CWKWm%xPc<)j^;(bTPE-L`)-L!1ppI-@BR^ zvNrc}*~`ydHd6sI%!zForsAQJ>C`|>Dg}Zpno3GDE<_VP?nd>@P4PG*gp8%uWC|Uf zR51=Za2Ug;kP?QSRCdu)9E3)Ei`uRTm9`l((}9PIOO57I2rh^gb zXqW`ys)3Thgzt{5dgwM3jYsk^j}oXtEl7%%r8hdT^g2J5tT}{$%ksHD?l+(a z0hd0jm!1S{}o)t50IZ^#}0zANJv=PmN%6GF2Xxm6Px@(59+Q(mYhW#xbmj zLW_G5nAdJ@U=A(pL<9k)F=2Wirg33}n1JOar1lF^^bSEvP2-k>$aP*1NZGDyZTGi2 z-`O}=yx(*GqyTNx-<=Gr!SY)Osg*8VaC0h_ zzcmuye5wu`kIW&2YAK4&8Q)E(ukA!ax0H%h(l{b=Ch_B^JF#qSDgv(Bj|;9(#TBfTLV>fPof#L%9=ZjPN5sB&5#H>lt#j9CP@up z&|uQt3~6`Kp`xk?`g(>gGW9AFF20U=Xod*Q9AQswqY?Rutqe2G`B?W!>c(6LLm=Jy zq1#C!7O&@T?J-xMZuq;Y*@*F0hQn+1!Ygq z5?s)M5J8J&RG&TNZ8%ulau%fID9~hgbaZPNf(0qd3D0(@ziif4v)q?u+?L*F{Cu%3 zdY$v}^h@8L{}{4`* z;ATy|=jaT+_4{5rO%7IEU5U$XDaIQ=l82|G=_CvzV_Cba+gf9{G+e<^PSDi!P|;}! z1H*;J9s;Ek+jGhdlnkT@uh6nagwPy(AI0wj3v0P-=Wz$%p^6eDo%IZJn{;2E+LwkA zT+&7*)k7skhiB*&RmFTL@1(-%Vog6t$PldBra?W5y$GkH?8>jh&b&IaZgj1-lQAqI zxZUi_S2GR$u#w1MwAR9te_8$(jfwwaAQcBNO)=VxMs#oWaXei zni^){cXQ~dc_f3a77;9OKBBh>6OJ)b$;CO zrF=XZP6e6;LZ^q}E!BGkl`GY$t7aAvWupius01e)P6b*Fdh7nV<$Lrp!N-C>L*19aj z8$G~hze~_u&G3RXcEFWcxa^&K@w1n8djsXY!aAy;=vJzX)(NBy57enN(Wlbn*OpAxc$@Bc$N;KUOt6;x}8Gzefe11demb_hu7Wwu4>DoD!Q@#RIO?E zan)(^G!|~c#z|=CMqai3=r;$?#f)+%Fx?Fd?J9b)r?}I!Ye_|ELONM!F~L^R1DCnc zmVo5C$qdVq+6WAd7H^SK8s`4ha8D>QY|%hXg>W8*XqwkNfpF4PxVnMX8oHrzU;M3+ z&d;#X-(*=_%?vAqVT9(>85uTeXo0_Jo;HglhL0AgsP+h|#5yib`RC7cVC5})alw_m#upvO3M#2< z-duz=Z#{~u-*OOF+;#wK-*E(M-jRx{-sZu|oA$EuArx1gqUtI&mDk!k_TxK`H{toj zA*|nDgLV5VusgShKqAPg$|K8k-y*}_1?8j=PpT?PvsF}_0hSG^9u{QHfG|Z9MC8qC zJeRxc@0A>Cv01RNmgX}ZSzwx;6{IXs8Ax#j*=bO5-Ni0{J_lX=yKRe)r={tOB%r3| zrx~PLu+nS}=D6I!Ujr$@X_o1h*|3_MwU)00Dckt#!k^xs3n?2^i~s%skP6CbG6g|5 zhngCTW*R7~hUol+l|Vq%64%fJPosL9Skp_QYf9MCF}O=6;VuFm+&Y8XKUU9zcoNI5 zD8&WWoWgtlqZGf{F^Ua`rm!))9$WI85F4b7{Nj zWHAaanMP+dfkKD(G|ZXbqAH|jW(X068&ohMCEPBjov>0b96_NG=>>EQhPlcM-Os2& zit74Ltfy+E#Z%3whf|~QW7HnUbrcHf25XOoHK>uhSvOki!4!mQ^Bf^Hi5RBESui80dan-YkEE+{vKEu5dg?0pl0hoq!FeE&!rU)m(&Rac>r20|p?HI!0-VtQ9 z4k59!4~fjH-KoH*zFmmbZ`jLF?+~th<8j=3AFze0G-@C7`zX^x7<$&inLB%qRN<`@D_A(@p$$N}K)dyeChn-20CQz5O&zrfUBeNnV*&6SqjCD&4{m}9hc{B;4fJutvl^klZ zEry2q{2Cy|ug==u-uB$r`H-MvEw=xokYdKnFPPbh+0nTvk}cl34XXbIkaF>Yn-Sji za_W9lFib%Zs0gDNhAz(9ZmN$i11Tvfjc$%9BE*Wv;Vhs+Vi@p~$NO>J+X`93p2CG! zm*V0ZPvUbwYr`|K^DI;>z#Zd=p_*~hfn(`_y30PEP7qh1g51rTJ_7;E4q?R=`B<{% z0KWeSRlz|}VGuawgae&Ax@a2FT;Ip-)KDLuJ#U68gwaAy&0=RJYuJ)$Iz63)HGf$C zG(vN^U5V9D8+ej1D7N6J2Tdrv2rC^$P~iYo)eJ*3I&c%W*C0|V31=z6mOqEEtQmx4 zG9**jsu1PmJocQJMbOC^1fAkB@@ELZxrN~oBc=yZ<9w8V{&wBruK}o3QdFNYmCS=m zs>#Y}xGUxf1*V4i3S?gjjx_yt!0?ayiXvc{B^tzl`S~Z zH;#ktGf39}SnlJ|T~oOE14+2(+GJdE?LmfE9(?;((+DTL5|~d3Tqm6&TsqaMwn^tP z(wG-MZO{Ftcg!PQgE09yiR<~PY?27#B!+vtlYyJK?-kb`W+<0~C0F_J>3eIjF^=%d zok1G6Nv@tj3YFopE+CcR;yTwPKKDb0fj6ZSY6R3}v};`W#E**cjAx41W0s-&Jj)=@ zzl6ZA;`OecBFt3@j96wW%OPVbm$oHTwi8nAW~!DkdWN83(Z>2fH>F$IPGz~=VuxC6 z7AVe`#$1ilMi-f;Czjc>f6C5u*<>_MQF)%GqJl)UF2g_9fJ&Gy39RXsZ<7D7R2cMA;b|N?mR-^IPlHi zG-B0_M+hkv!b^`}>fV;q(J_)(s8!qk@PQtzxiuN9 zSo2?WEerEa;rPuSU~4A9lFzhMOd^>zy_`0T>woq)d-2|{$KWmh9*(#Edo2F_7bPY% zbVwP{v0~{^vIsi;)3M|D>ca(i>wm`MjsNb%EuV|PyYF@4+v|?v`HXso8U5JFP{YM= zQnNPbR-PpF;Bos9DuQPsfp`2{B0l)#gLvcJ9=z`hhw%O{XX4#o+>ej{I2*s-K8z5m zhG3>El;GTcvfYg7i70Jj9(EFX{e)FFm1&=82-hqV>Trmyn1zGuM{v83{Z}S#`*b?q z^`A%Z{;!|lz7ONhZ=J$#w~Zl?p!Q4AFt2>|Bg}&dBr~n4jT6}0Hj4C?A?#&1nZomq zJ_h{q*-0$BCJGm>NyGB1_Tj2qkK!i}0DBVnJNFgGYn9G(%i#LjM&qQCn6FZZQj8i| zoAcL(Yl`E*aMH9RILk4i{bu~c&v~@4eXqu zv0PE9nj4CZoq?4UzNUx~q!J0KXVbw2;Ik1Crqx=?emds%4xo5KsmwwFY>+K4U;H6V@>? zj^43xj8DyAXk^SBvww05{j)RZnx01U@EY2}#K5>PIVARL4Nq^b|TL zC(zG*>3n6L%p9DotR|r6FfccTimoza*&r_a}WhTEU+%PpR6f!R+sOF}Gc)sVchbFlX=1>3RteK+OhIUb113c+_F-Z6g z5q!hU^TC-JOz7nFS_Hhm=M`XPZ(Qh+avji? ziHgo6a7q|P5e&g;bNJ66Rp8>a`>^z~{a8j&U3^m#9@sjCDAwL)q;hR13)iSoF=|&5 za1yB?cKLuWe7h5?uJK^il|Ec_Q#5WMcpmhRVbiHe1Qibu95beYS*pUpP~~&KK7oth zz6AkmHn3I>W9^=gpFcAPC!rKgRi{COE&|{=H`o1T8LoQ2hBkyD;ARJxTk(!BXW)PK zXreaF)jm#0^}?racMa0iknb+^>pTI_Ti$NPvGXevhc|tX5;CYegfBOhf1Z=OKq4n z_ud`soQA)40IBq%M5cLrBJhp-hOq4F1ga~>LkMEAOUz1*SvE- zzW=9AI9QqZsg{##XR)_+lo0JedeZ<^*q{j!fBfhqmR_5RfQwjxUBdHQvkPB;q!>@f z&)^v!LB?wuPDK?`#4@KD5*XTQ6#Ab*ie*w`q-;f%SlLEMwVIhZZ5etAv*8Lsyc+E9zgK^OavXv#nZlhcslI}Hf0rKS5XDF7Zf8XD;vJz5_EIB?ukhp zI(`z4cn_kzUO1Bc*cI8QRkoesc^JqcN zY09l>eK$=dHZen}&4CM4H+3O0J_QN;k7H+y7dvR#wJqr2`st?%ux?K%Aq;a3B9f9& z)YNEzW&rhiK`KrKz(7iqzG<2g766(a#iW@CJi6tBN-D9vA4zSL@@gv~Xkzk4;bV=Q zKp3odjNubsEyD`6N3G7s%4_TC$l3V#*9Y*8-wxw@j|}3wkG0`je`?3KA06O(e)s4w zzW?w9zWS3Hy!E|JxNzluT)b*OmadJ#=N_uSQwL|Tqi7c4tc_#ol-`CpIw?UyXMD;r ziQ7Kq#szN(#M0|rxcp67_|&&Mu!U+Nh9Oxj3;i~RCg1!+Kd!yw1Ol#hnekUkZ;8aU zcRTUZ4J`;E&^$aBXU!C%t0$1gn%_xf5lZMj7}|vod?OVrZVAQ(YY4c@Tv&Eh6fS#% zhhYwZvNDz-sSiu8r^8;u{od-r`@flu2SNw2n<1d1lqyM&2P^HN;}h`p!{)v^AM?#! z2)y8)#b41jl{Xg>vOcPy za8@3n%;Oz+=ciNf%?FFH(LZHWW1>LSG)J{JNs!JNNGV)PsvrnUClJhV@!nrfQza8N zR76WJ&%`@FQH0-br1D`!l*BY>jMn}Rs_eohzMn)a)AR%t@tyzC$vn)&(yObOCaUGP zQ^`J4gy;Q}*tnmeH1j;PkfC4MIIqWq88;P6Se^|j4d6TjDVeXT9Ve)yG{?DW{L{pd zv|-Ku*Fb7$avB44;;ia=gl8N^*x@XMo+vbsx_9GlMAfx}^&ePlkVlwRQk8Vl345rF z4xY$@%jZK}N-|{PG4KF2UP+1h2>xyN3>BeBWYn06T3Q!@;t;*K9dJ5yUjRYW09NF~C3 zJO^zP6Uc3CLR98K1RYGn27erWvw1!IIVY*WCaI=oF-ZtdGp$opMY4(UX-tqp{23Hs z1Qzp-QdTaW+8KyOD#YYd zr+D5zl(e^*Fjdjx>k28&xujb=G(y`zs*Z(#p@nYqFjM|E55m_uY@SBqR}IV1!Xy6z;deOC^C`UKZ!c)2r)wf7T~c>Bj|vE<4k*5GN}Z#=GiPdvWzhf-`z zpFs>A)2Wa`J!T3)d0r7kz_ST+xcmDjaM5j4T~|afeD!0^ZB#t}b{wDjdNx%_F5Yox zw&}rIar0g*xsmGXS`Px&2H{_RauQE@M-W92X$+7Qq@T`jlnUV@Ks^->eDv#t@(pzM zYZ%(Dj>F0~CE^{QIfj4vW-;#iMjqa9=P5$)2vy}tTzcz%T=J$^eB=HGY~gun7(hbh zEYca0rq<6Ru8>NX=~meM%csY2<2&=PlA+krOAB$~>MAU`q?mbJj@8%aV8z;G9?yj( zSHxoFEnY0YIS`+}FCQCIHSI7}l?JQUGh}0>kj#Cj)y^Y@VOVnMJhsOJpZ;1m0+uCX z$*PmM_}UzN;u~!SLNQciYFi9FF~D$}p;%!zLXJ-3$*>80^4=CKzowYiz8V)@-^KE9 z47dO1N&I$CBepS|4kF-!^X3s;AVBe2SB{t&FfGnEl+r@C?H{hEzjyGZ^N+dU(9ri4in$&rd~$Vt-XR70^6GJE{{oKOxaKHi7mL zhS$eW;8s(A8=<;B>N;=|#(DyC(QVHnfMP)_ifCScVFKfyGNjtNwR z7eU2n(tOryh|3YBlke^JF)5`Me)n`>2$FLP(8Txt>^wZUaWhg23h{DuG-}62jk;7Q zX!vCQ{r#_iSYCKDHHmH|A)E}LX!@+FNE8CO8wDv%*}*V_VVdr2cjb*Eg}_K))$+4P z+VF;Vox(+z)#9?XeOR`#jSy;~(HXC1ElLOlTv&?>F004V)#bS8>PlR6RV6OepugqS z2w2jBWtZ0CqAQE3juP>^h$#fo$$bpGUCp!Do!`ZR+)byaV&E}jc+4lmrt!Z2IEYJc z@#Dg4P7-|Sc*n=;@bD(!>%W@C8$X->FdnvyCb6~fN3T+=9(F<${2JX3U1XsUn zFD`y_0s^iJ!3A#(#s|KahWo>tvHSQO!t>~G1ym`eb0*CSL)Ux9aQ8jAR1}2URSbKs z%)s&+eR%KZkKl=rSws@BVTXbHo}b3*H|@hEZ#aOp@6Nnf`-h7ZDW(2N!j~73Fu?dc1<~J(^-6xqyNF~(~gj9ZNWKZUAFN6SZ`5=KGkc#D3 z6yu7U>+tcfjN-nhfv1@t&k?>4?ij&y&T+itnZwVX>7!c9V&%YacDV(q0IKYOYt!-7 zhZ^xx#xNoY*QiopPu?UUrC!&0M3ieHL~CNdGmxTb$O+AEmpTKfwm*jyLl$-Q=?TUb zqV#9^%=t{42pS6Al27K~@m-;KI4}}Fd3h(k^!PgbXjcS&8tTGN!=mxsT|xNC)*aZ% z5Uhj8>!Cs!;jsp$r_nPphF*e7%C2g35Sgt6adIM#HP)kfhQCwEj7>7E9GOHzN4IGd z7u3}5tmdB>}~{p2qWIrYc`gXYk+oBBZFKYR61?r-ugErtnXrtE~y>Sb&;_&21@CQtDlc zE1W?xL$B}**08Mouej+LF21}KOD}047|QA7x;>&60V`^-bY(M^UDC|LTE=BDE?iZL z3ob3krB@J6mvmy;#iLky8Gm1O3M=28fz8Kw(ORgQx`2@KLA-Rh78?)NAR>Pl-b#Xz zDkzqq`TS4w=*V#lWsXy+9i;=M;SKL@#uc~G87{NJl7P$0aphYI@!@Y&;~9qq3&F!# zp_+RD;hNUBq#Z6gqi&A=(endX^Ij^i%NTlHc@Q_exf=iT2%*MsC;k8(m@tSxNN5pO zKX_ymE8ZG}fScFh?jI2}vExi5*Jb(~Me|e?R8q{VqwT;!s;T?dwc_Rv5l#$!0#@y# zQu9-3)Fa{$)s{kMI;@k>*_22K{V(wz?%0(;m1!m!_81uA+JV;rx7B4 z0?=_{hTHVx%Tz_HZgCSre&$68u6xHpJg|NqTjGE%R6fd?mWfC?m+ z>y?g9E`)otrVVCjZWdjHRL9h~na;Ruun*t)(?f)OIm$mH3h4j8r{9tu_y4Y=bp#s9()MjdHzM*`{*$Hfp0q*=PRm){`x+R3ug@vZ)=gK#inftZ^E~Qg0q0=l+!X;}C$pvG9hslFJJTz*$NHWE_dbdoqaw~NQrTY^$x*~pg(w``%Jn|{^&`0Qt^2S-;m?IhSaoX}cKfYxNx;cq z-nxpr5Oil)=nddq1RqPiu-mF%s+Xsp9(4i7pyA4(p5EBva$h7sEU_do`)rumGV6+rB%G< z7iKb?)NL@Q_?hAUN|lLXEM0p7*M9IIe(~}kp7)I)B##wgwMLhZW5=mZUgJJ0DSaMf znVX`LQV*X6CYhNteG#B+NS$nLwc4aqnnfFhdUQ%CtRXlwYTSV799#U-W||*8-0Q~! zFK)nZ*KNl49)BKRdH5OJ7Z`RSm-T?!zzE zt;f$cao;hV7z;W#!jj{AZ_u=`{-{uCaA;JwETG}Uw2Ju!~Xu`vUx0RpR^;8ZB5F=m52 z2c=IcsFOfzqqQ@P-CI(EU$0+}yuM!K_V*#DuMdTUZpgYTS3B2X3=~)X$(0RV` znMG>igFND{o20B{%QK@*DPI?VTQc z%J~5zx*(kttug)sK!?Dnh{O`m$Ndstc0Iy zm|rzmu|~^$EW4UvHm_;GN?x0l$yoh%AAY}c96_1D&f|J6-vIOghLEB@Y|d;zAVYdR zx-6`upG%F~n}nVahDwEXD*hDVq4M8?pnb;?Us{77Z`%zP zMSOSjHkQ9eJQeGw+Br%U29$SpA}H34KdoPf7kBT%^E-Fogf+-fMVUzmi9WX~tbP}<7 zvy4rF2iH&IE$=_YknRAMud2kAw`JkZubn^;L!)?xFB-R$R6CEf`aYyq3?V6R43QZV zh#@c@qO-i^BZVyBR9x4j zl`)(mR36+sjXVCe0T*16%TTk0ime5gT+@uDS7qV7pDV<}R9g-WgHULywkSd)hVXEf zYoaxcNY`EXnxb|D;Z#x@xAd(CJFw=R2aR(DTzmqnt}4UI)p=OCDhrpa&cxa`6yWxc zR^TIFE61mQnv3;GbJ(6a2uC#?t+g7ihB`!+*CCvar{g-A&R;$^f}7q)Re6brs^b*i z`r%^y`nfSA@|cN*4BylSS21TG70vAuE2j`!qWkBpjtb?aM)oHXBKj`!)Cd*T1XblQ ze3gR?&xVo4?^CF{`(1xPVnMP;nc5P|CQ zQe1dV1%E%m?+@bATMzLXRN;FMP2+(b4DXmON69#X^STgK(Z_Im2tfty4CgDcJC7lE z-MG22*rg7QI+hWQ&!P!XntNYMsVQ4kB~@9FGD8sL1U96Mk`kn52&tLZ1SzQr!6vh^ zk@@3bShEvPL?_@+P9Of{NyQ&LDY!r0hd)SdMaJM)8@HojVh(K+GgMG>=$W2DW@#y+ z)6;O2;ZPOT#!sJq3P&31Q8zV(94bEFp`*yyf7C>zLrkYas=THalu(^SpE!XZQL+3% z&dJ^Rf`Cf9zV!bCB|Gg;)FT|%|Uqct-%Iff6 z+XBH$h;MJ&#&X?=7nAlQaQ`XPjL)HZU;sx-ijhhMbfmNxd-HOTk(-T!1qC=%P>6lm zIoOwzgOuaPv6st?oLrn_+SAL5@w=@XSxH9Y1&WYsir#UKvj72U7eK3)__b+=%x@=GfHaK&nWG?gn+8z zK6&2$4xTHWJfdLI^d4?vX!fJW`ta`09LEJ$$KcX6$ymC=k4sk_#f6t-V%bGmSh6Y; zOV=EwLP*C4zI7BYChMLvD!!_EgjdudiiJI@xCfEh<47Y|zItCX*1qiomR*^FrI#PV zTR(CF>mmtpLdu;p2Vc2nAebOb1_+gL?4@E&P|q4cv9HxquWH{)W(by2KTBZsF+AjT z(L*+~hu}CdiD;@6_i?Vr>QuMB>{Ga=+i5D>;VJ8+0vkahugNAV+Y4@pB1k+~dfk59 z^e_AHgXf#gM1>lu?C}Dm@`a8tFZl46ZD`DnZ`(|($I_$n$t{B()G6irT2*}n`w2uX9jc95!8KdwMp>}m5ud4 z23twlc78~yT`8xg8Ls`Ac$O;a7te3Ru6>z!IpqL$Qdw<2l7*M{AHmD}593+F>i1iB zqnV&-9GOH$RxaEb`w+KxKaLcaqHA^z4P)c1n4UvseLY&4uudMMm_SWBcm&4^icPPe z(%q?cATATKbMf1aTd*O)4_96hcJVlYJl>{+Wc+dGF6>B1K-0`Lsz#YFM~)zb!21oM z!>b0`BLNB1Fzpi;EphQ<|G&0p5m6f-y zhjLgG{IllZ?=N#7|MBBqT>i#dI!_B>GK+wVdI-#7eCP|~Cftmqlf@EF34&DVthp5@ znzeZZ9WlB>kkT|ER3(I{=I&O*d@9rF;&u;j@5d+aIe<@mF$eFtD<4;0a|{=)%qFNR zvFy@%f~pNmugSv&w|VeiFLq-4u^Dr7a!5%tRVmY0Gl;NLeK^_-eB{d|xa`JUELX4I zDj#mUD;mg;kWx2_0}OEwvQ)=1{PR>$#a7KCgZtRe?=zam39MfD zYq|(Bs@amRxZZ7u*%yEL43XuDaW98!EHS@AkO5kz5HFNM*Gta3CU98yRs#zguY*!OM^E~x< zwB32F*rw+uo@z9zN_RWx7A^JOY04TYD2>$DlePsYnI71YOhW8!8bD@qyBXCzCN9~K zT69~CffP+Q9RDRqNq`;5EyMnTO8Bx0@%xQC;K?sT`0-qXoy@1YEkkr(38JzKu_ZZ! zK-mtS3fdS-#StdEoN+ivxO7ijqs%*|XL0|F>yh2mOhC*TNT`v#yt^Awsi_12p~25b z$|_LW)q}+2r|`(8orpVn0vSccNXpHHFFPBqqet*$P!Kl6#Gqkv5^YSodIPH&@;&8< zMs#i-QW~1@m^%)S#>V68Pd|r;qFwmWrmc7&!hz@fNrw0<1N0C1*E|?8&aC+ZU!EPT<+>V7Mf;LyKC^^%Ta{XyXbfqmoU^T!HO%( z@aB&c&LMn zjq7t;bxjLWF$`HWX@4ZcpfrY@j>29O_UxjH`{wVuaQ%DeI1Do`xS|~wUNM4zWsQVD z8LoJ13GRJxz|`XE35zb6HdEkw>t;$5|kz&8TTTLR>RQ z#*~ei;RkAS`p6dxaruqeSh{*IL%tNe?e4?ashKKyt|=AsILeZza7}G}8acm-aCjoB zA5TVi7~q>Qua@~&H%y}{s_i7K7y{)F;+{Wb;JQ0@GKAZJOK;wd>)yQwPX+SW3U70$ z5{ugz_DvI5tQ?qc-+N#PtKYaEOV&ui9>$06slfAI9-GIHCs_RTRJxf12w_;hJ{>kMsL*hWpN9D)36(_&kF|-Sb#sJ?GEIG9{2`_J&xhA9*b$Wdt zjy1KLhG8{)lLO~KN=nMQDfVngspy}12~x5yhHveR8xNP&;P+G|j|PR|VcO5uZ^DDY z;dqQ;-s7}~cI{!M@Dg|$W`6bd@foy@PN9p-J|16BQ*IlZ!Xq0tBd@WEKq90Fl}-&) zn43q#;E-vU&Z}#{E>|oL6_yy#{rd4|u|7Bg&+ZDua|F{ffxGcsa4>$qZXMP~Mxu6f z46OuPEBCJfoi93Fh|J7H8AHu{{uWEPJrEp%{ILmaOi5?uk%Lpi!)W9-{oKa7b%hY3 zEe4YrqOiyesI(r}*HfXDxAt#OY~4nH=1?8ZA~`=7f7-DXN9(K5Of|JFF%I67$I#R- z4Dx0E{r#_ixGJg?7Aj3i;--9d*Y`5SQ%{R-Q4pkNOplMA*5cBQu~alEe4j)oekKrj z!#ne_f-365%L=gax&plCvn6_o^!!$6U8twNo_z(i=S#InHEF1ZX>LI@z4z3cBdMTOK|axHCTRg7OuZL6Hj}r zP&I}?ag>dwBle zeu(>CyBz`7ZNbeSjl}wRDix-~T|B{1djN?w9RyW3(wj!jO~Us*Ux_z-z{B)xqlMvZ zAK7o(k@loA9VbQ*m0M4>HiI~x!(%&vTR%{UrB^WD)!A@GCcgaJUeg}sVR#tJvanAo zE{_U`aNNj>=+j^6B3xOST%z$#$MDf_H5iD-F};Zl#eG!Tem&MqQ{WITdgh-XrDeh{-GpH?m6UxO7O$;sx)saC?*u7LvZ(bH;%U}chh{=3>4E(aR2?Iwrspp} zN*ckLdM#WQB({JqLS%(JTM4*(lbyxGJ=%S zQih;gQN!&jC#O-vV}>6+iqIp6xc-1ilYtGFGL6wvIu@J0lNnHP9rc)Mc&AAZq1sHi z?jjhEl~Ls8$@teR3Tyf_MSoW3|vHD%Xxa4iS@WuP85Jm-+AV3kA zemZdym5HC~;pGsiivg@ytHxrc|MGOa<=>0(yw3uZ!rCZ0@aFwJ*pg1A!2NvZcWrpn z9l2C{2XNu)T)h92HP{-%eB{1k2r)N-5Oqj5;|}4v_obStc`vxhgQd6Zz~_H;0xx*_ z5Rt8!C;AvlbyG?8F^uh^@|wlNJ9_Yrj~yg%LK#jb;Ktkc;fMG4A&?-^AWvt`h*5JP z%!jZ3q8qDjI)Mw)rp}OF$7) z7is+20es_knq1Fn=SyPfCP4XHsqk9$$aa2KTUnj;bQ>?1Qa!O%R(q1KMfc`SurlN| zXy7^;UEZW#a_D{x$tpxN)N!YV3U%00zdl0L-^G*&*IyE_yfNCr-$*Qr=P-qzxV=v z{nAVL)eA4+{+Bjb|dp_-8F=DrlFJ+nKIaCjC8 zCr%(WKOegi6VXC2H%v`&N#(|Mng}fCv7-n{NHpWJcqov;<`yD#fNB7&ZT1b;23CBp zbI>^rOim%IxCA??WmmnDjIJ8>Z<24D--U!Ge_9bG+5_@Tskcs^gwtH(||fhj7vA zEG)lrA8vg2aoqF!ChVfK1?P?-qGA$}EOepuL)g>Q4|nYxQs^v+bjo{w(Z}#7lYlu! zsFdPOAJ51AfrHq=!ms=4V(2t3hKcHic9cvR$V6okP}_mqKAMST*QFCuR0Egq$Hg}v z!zaEmg&+SBxcco1Nf=VCOrgR_#+_d)$CFeneu1M%A?q+hiZ+Cov}0FxD>fe-#2+Ji zan*-*A>c+Tkt?~pI+)u!@$ql!;?v0wFf9a464M<_h4S?ucj2119OLl`sI>&;oA%*D z->JZQjib`=0D?-8-f@`ceRRkSJbi)T?b|Z3;oToQg)jm=f+21U zkMWa-=dkweR5us9nT8AmToY>`^*>v?ur*`MJV#GGoAFe$ChVir?`7z{haud@zfOQ$ zzK0Nr#pSmo6{7thXY;Xf#xvv?QzR}BbOk@5eV(E=eeDAS->}H;8^mlL` z6;)9a;uv!6+SiAjgxt^mG=X>C+05(9yuSE2mag54A3ZsV5H-@X!iZ!j8D7*3PeVVB zvl>oeNFG(xi#^O+Jvh_~&n5_{al)ISp;6}=>2H}v{i_X1vvAmhH&uZMQhJn^=G}Lc z^cpbfi8+1^^sF6+N06%QJPT6vorTy<|12eC%~7!MgAJ&2jjs{ibjzijw2dmIw6zsQ zZ7s-cX+lnWGjcjwkk{FYg6?({cXgn=rwe^Nj-V!oR_~$!K)zs%UO&$FB~`T;q{GVD z^}9eZN|mP(-7*cJG~aQXj=oVecMY1)9fM;S;(9}T-_%Fd)ZU4P{y{THQjOY5V|7UW;RC%)Z;$9544R5G9cX&)}Rjr+Yki2(88rn^qj5eH0LQ#jKV&2x>cXhB$M6M_pH z5S%@UZ3NI)?ytdB@1+A@=R&|$w9DMaq2KeFX)AH;uenZY(WI~~_S3+1tP9T`T@ksfo8qh=BK{15VQ*-hzKvZ4ShsKBm! z%L%;WBe{6@$Mf)>PZr^g?<>K|>kF{#s-w7+s&wU>lkoBH=U{URp?7i)Az5vREgeKg z%RD?~Lr9Y22N4jwRyAyfd(F9O9mad7wo9^0&_kTVU@B91#y#14hvF7$v z=35L_-+BmFzC8^ey5}&SjT z_o*2eYzRzJqKuJL0>Ky^dX$iwphN3-+XOSEb(9;9kY*DkgxQ|okzJVJd+k%e8sR>r zv}A))Vg!SxLm3iCcx;7d0+RsILnYH^?jh9R(rL5Q^eLlE*eppj$DQ-kEaU#fax%#n zlZau$ZiML_=Z^xmQCHkT8;{}Ne^HM; z1d-;R3M=YIR9PV|#gdgCEWg@=3)Uv!qFd5%^G6Thn@==h9aYqB zhDU0X(k(W+fjKN!qt08+WN;b__3*Yf-1+$|GxC1Ps$^Vw%K@IhgL&v76kS+)RVo3+ zuhPM~%#%PYy&()&ydwdh{$Vkmi=9N!35Mi^Tm;h>l+(x1 zy4e6h*La(Mo@%lX%hynuu4cZk@!{5w9l zd7eXNy53EDM{&<%1^6fx&$S=oF;>SJ1##(`QmkInfPkerSaRuMLMoZ67%sk+ zYLCZQz9xl$VtBeX12??8kgzYsH~vtHo%`nrCx+vt9dMSlAgQSf8Lji?-o^NmS%$C^ zh|cdcbDOK@ZY!bkod>IN`)BrH`Snp)%IgxanyN~V3A;7~E8iA{f8jOy(yy!WWRxB- zDxmTj6;Cm(gjDu0A=M5S!+#Htu`zKH@B0Gt;Y#NFT85rCIq?3kXJQ9cVGOU8MyH1q zb|ADsQ%bWk$s5P+lO0r0tqdJC1#^!X6BVnmcp8GDr3v?Fry;eVo@546G=+OyN8_RN za1b?^t7k8{Z4SwVl*UMTxK2`4HzCz+Af;||IjfvSuAw<3El8btq}89hi9TDdG&`e- z;Ruu|+VlhgFi8kabH7s>nKDF(;TFD;-ljr#Zei6Wj?-3wAn7Xabd{M%I+c+Q$UdnD#%$?FBm> zS0-2u6G#S{gz*T^P2Z1lImI-NFl}Q5m(sVeYh!;8p!5oGGi*?=T^wt#c+Gu81(nb^ zN>eWwYprIgpT-$}&)TbAb9__Xl+9zkuM6+_N)SHql{kFpD`^CV2lqZ&z_5f6D4s!T zCkruaeFr6ebi){;n^gd3;m)7OMo%w3__YY!@#Q#t@EfW4{4a~~NEB;a0x7a|2+o>b zgqOAuj8qH!?vD`-xa)g~xP$9{@Sfv%&zBG3o&V{@ueY`!GKUUZNsv~}nrUytvgh!q zV-WxL%UrzUi+;TG%c=O6A0Nc`Uo0~>|3(xs3}raus_R62Yct{*E;y^Zd8{cagK4TC zV13d&zWzuRZvWyw-2S;tyz8^M3}p-P?oSsn#4Y6c9>Z6EUxnx6fSpIEI5J1@+oNF9;m~H!wh#a+ZncYAgPgXrUHt}p$ei?OG#=lk-DErcnrLt-@{m^Xm5=2;{VGO3L)J+7L+ zDTtNClVL-IQ93@rbAQ+86Y=41?!#T*O2wCdmxb-R$B?SY-2W(L%!Y!R z3M3=J0YFG;uJK9Q zI89KJ>Aisy&CEqkNX^i(X9Wt{JSih6jE{~I5Ed*n6Q*TSGL|X)((ISA8OC{nlQDYr z6n`TR2n?o+?=47C%}_=44-Ff>j4(9QQfD?v>P;~nvPr^rMxUpcLcNy}WcKvIr>7B? zbdrQxFadU&>&bLJn%8}r3Q;O?ipRE1(3y~0;v40hrhbta9UD{bTj>|@^xIJPwE8LKPIlb)6b?C^bPxlhX3m&{+woii^rr~cMXTA+&INUWFTW39R!rM&6tA|~%Qq%MEBFhG_n@|qQ z)su&ZxULkG?p&DVIy3OK%_Fge6$@eGtQ}z)VMWQM9rDQpC=&`&Ss7q)DRpHlEPWQF zPAr0y+D0f&=ty?Y-Xu*uO=m;u&z;8pRxW6n*0=U^=15llrb%f5@L?de`1GB5Rh4*vLH1{0;tVOCK#VF=|-KUh33=gS}>C?1JE;e zrcr8C=tb_5&$2PrA%Jb;cNfw@&Z0Eo7Y)MxJwif6psGju2-c#X?7OQ&l+_ z0*336LM&vG?ru7?)mAlRRF-NoIZ;B*9F>k9TEH5zTHVeIlj6|<5?HgVeM#*zZib7o znufTU5?!GcYehe|mE+hC9Pm@I`PvAvwlNlT%KfHc9=DI-f}Z`?X}ZQ`F%><82y1&y zjz$Ob)Tp;-+AI~e24#0J?fuxDMF^a1F}1p$>f+{k%6SARW0eEY^YJv}L%gPZaL{-*O-85*@tOW}Kk?(w{Kan-z@gj{Mn*Wr1qVse)cQ89HQ@I)haW!7WIv07{) zc!L=ZO6??Tx@7{?Q8kPRDjhusRB36vRB&E9cATh3_=yS}s%`Pna>2kViOR~imPY>mw}kxpWYwSBUqVZ zS^h0Qw{6D2LE+aNAvL=IDV`0#mkGw)`#F%Zf?WO0@L0CZGRB;v%`Y-aCmN5m*hCdW z7HeriY5`6QfI3@|G4+egoWz1zkh0G0?|l(cECdTGO6IH>L3lxr0hAnl$B70ycn@p7 zURpmAn+NG6!&EKSfIS~&yPvhGq_{CUgQjya4eW%J8ouK-b3q%|ZPgs#R2Ox0L>4+9 zoy5oA%$(;f{JnjcM#paJWsTd(!rV%Q)5P$sVZj>txtVZihr4Q!kRlvw2q=adTE@`P z0|_ZLyze@7E~LijG(Ct^8wXX097>O(lHd07SYOylMIVSs2KDlT{Wm%(`0xX38oesRDJL^(8($~SfG3Oo*_r`7?N5U zn$Yy*T|vi7NW~FSW^5Hh$AmWi);h@FJLwQzbkG4h0z*5R8cJhpHQK$MPT$I~pqa}? zf}@^=yM~Tmb=sndyYw;jDLb&d#r-L}F7^xqKJ*S!&diC&}1T^M7omT@S_fp~P>k?pQ4U_~a7x%T;+~xfYw+TJMC7HlV zWq6g^GH;&nBNL!fnO-TT~vXanw=-0=9wS!6UGG4vjMd@XK4D&eayc`K*_k{(`M({>+uTk zn?gzlH%3)LP-)vB9gB)agY}G6b+MLhp?b356x&coh0{ReXD(f}b%clj zRZT@zkLYp&q>L~jTw<%`WRnc9#;`lP9gcE_ZiH<_sfIEPFr5=dNrh5Xg%)?S*6*cb zQ4!IB!b^to}BZzOI0&3>DHuWO9uA6Y`hqGaXii!@^FvoKt zpa|m7!f7f4Dg`RJSgI!jCxS(J;i~92fD&9ZI@_a%gO*P-Z=_iInLk}zrxj7fO^C?v zL}dOjqKk(J9j2QKO3KU2efk*cB`dsJXrI!1DYN)$LYc}ex|I1rfW#6QUNtfkVktas zO3MtlA*^_Or9sP7DzaoQef(XaV*&vn5NTw$Zaaw)g!o>{#Xy2!u;&<8yPY7Mz-_&R zuLfhP@mr5Sa}z+(s^qAmBFm_xcpY?exE|1|xuX>3xe2PBSuIpTP0VvWC0YZAsS24! zuK-Ud>U|Q!SB*|jP@b7IuuLu}DlOGcm0H_}EJ8|m^6O?XHD^OgK(G{+%v#67(wV>0(BnSs5KfR<3@WKA z`#b$^14($X5o5hSJ59F2n=_zdp3ux=V)*@8X7;dP+}@ahj+U>*v@Y#+f|LCUFug^M zl>9UsR5CT5+onQn8qJ#+zBCUlz=~l}vy@d2m)&Qqi3&iVt5z7sf~RnzX_SCsnAg@# zSaq^+Q;Ag5vC0SrntE@XRs4>Sa@8~tRyAS@cdda5Zwl)o|T5Ui|0sSL{qt&pNF^OWMq@<9`dM3jwS%kee@<}p;O zVofb|(aLjf8{?AO60V+BDXVe9iHeJ1rK4(|&c;xdAl{P;Y&$l~(0GQ&nq_!Gbx8AQ zX47gqYZ0N$&^VQ0nz`Y&4(2gZ>RC&yvmW@VhpooZnPbam;VuE(WizJDEtX+lJi|&i zLq|8yH@HyrKEtUq^Q<*Yeaep6%;`z5GB&o7%uZQDSZpW4XDi2P%gD?|1N0CQmN##8Z9Ly zNJ&WvQkMJ6>GX-txZuL9+l>qUtuCbPwEbeU;bLo}^Frzzv(`BqQc9f-8<`EEvmnLy z_V>2w*nf4J44}?6<(HLDr|mSP{z`kjA(hAiAjyBm1SU&OIV)K3DB0s{1u7L7I++@0 zsWcScCAG1}ZX1NZt&i4YAS6WEPVA;3lZ~TDvVswRAHiqKeW@qoum#WyAsv z!v%K@)j(A%6-g5dbSoXD(}b6Pa}0%?{REtK>rOmtZVeucr0UQto3T_V22zL-c&(Y#8&dX1b` zX9JZi6^3S`@DhM#dK2Y0&o7~l;TFw90L4~O*$`B2hPisL@BK_;GGUY=U~!qmbo*&q z3Q|c7!&3+%8&GNOR3BWX(30C2hAKR788elLIz)6|qfF^n@2Y{24J*EP^O!L_ukaG) zS24phDmMp}P_!DqxeR3m5SZIRP^rU%d0E49R7aJ|r9y5q$sn&uU`{*N(X|%vm{+=0 ziOTJ?s%F`cT2filQX|myoj|2BWhtp~q}B8qNZCs2|5ZpWHv45Df8} z=7wRKX@4T5!tz=P;%=%Qf~tk*!=+%N8*hDtr=JQ|H|44!TwsxDJM##QRTvkTqqaa+0#t_rR4k#Z zu~MoyG~-4{K{vP89S;1BiYTI_2jK*qnIf2GW;) zntDuol!hSK;hyFG|93-5W`pQ2+5ayf6;DMG#{v;oIm8fSh>pMl%bH!&Y^b3%qr)0f z;1i$-s)Ra?JZD%)1>m9N_tXur!1S_UcXQdnf<#C$bo16z{jlK65*z#J1XNNA5gYo= zc5Xr{rgX}fi{Xu%KyX*lv88Yr0y`l5vGO9Btla2od;)kVDo`$ z?96OLR8c>Ib2_kLe+BlirgoI7V5^O#p9P)H!WulhsGANV2kNF{QO%iKfkp^c%XCw< zo1k2$QRk=vHB+eO-)5c>9I4&2Nbl7|ZkkDgu+-z!2`x2j zCpU8&f-H>A8=l`ng*3?T2#=;A8i7UFCQF&BS5EHBHR)F;f%CYr$qXAJ=87m$2@Kp&` z1db{`mMtk=-N&a1@YDz%%8El^QfTL6KG?8QJDEnBYuG^qubG~xKcp4`N@gJS zSDLnYy&;v}I0-*%s07tq<%39|@<^r=rZvrBUmGE%9wC8&&Z+Q3VTq@P>#LBlpvW0D zu17U`0-aFffIJM{{H!5UxbI}ib{1|AomWn!+CPE6NkJqLejbK6u@x-5R6=eZ+n9P4 z%LOtjJboXq0iboWOa~#=IFDF{cQHi+2+e9o;4wNxRtqBXy0HCF4W3QR#k%Ao1RiI| zNKm;6J4dm){0EG3Nz`CKDkT?T=wLYJpsI4w2@(}v)$*7OJG=z7U+c2=ca{twB)g69 zCaBbor4iZHR%5o8=j^T17$yxdVC`SgW8mTCIr{0?Njz3E6`WbJ=1);$c9R;w2@k5J zRH`J6a}rbxSQ;5V6L!gsQb$AFhVS`(GGVc|b=p`m6^)lF(9N_bC@%@xM1sqw@Q=Vv zCS-Js6soWkhH}XSP!g4r%+L3Nk^$60xR=Cm(9d<%Lo3xPGwqKH<|U+L9w{oGb37rX za6V4w&9rH##jc!2Y(7>+IMp%~>@kW}?M+&SG4BN|wFfHXQ`=xP^HH;IMpGf#VV**} zB-^OcQ`_bVRP{m(75U7Z28P&S1te`?F=%y64~WueY=JW21AiS!@2~G@ZNGzuoM-dHr4nQUXaLm4Szj zD_ErxAQ>%l=034h)^;fju{2Icg9-I8Q8%4b6P@WsPgx=hp469yGb9LLG`;upI}I*O zP~jweVx^9_f8ElcS~E#KI^16EUuR5Vrc~9qF*DI#IgeYZ)chPde6wWx5y3 zzH!v*lBN=pDO{jwUh5dv#x54@I69T5eHL*%mYaoeu{l`)qgCUwKt~aFkyQ-2sHR*D z@uCT`;3C$}giko(62Tf-g8@Sr4rtuX_N-HYrb`b82rbbALp7ys8@8ON!SnkHusuf)Sm=UVH(s|9o^Ft-Ie3HiXBHq%b1hI1*YI9^kQa&~W>nHbN2$5K+S1Sy%lj%;83 z8A#a^&;1ip=U>aRS5DLGYbLW^w^u--oQokq44p2rt{*WBH@sbhQ#S$9ISDtN$lW;w z7tKNE4C8vCtm&O}gcv$YGz+RR7W8Nq_-F!8=3pog!NMHHLaooP)+xkrop8c1qKRQb z`xKmAvv76I!AT%GJLV8WM~fl29Bs3Rq%nzqx3uO%&Mqov zx+sDroX6Qkr`VL!ge`fk*iqDp-Goo5j!)GS!4POSL$URz>aan#trWCiyC%IW??xcM z523tBt4ZuSq=)k=^ z7lOyd{ETP*CHBFXn^4eqS{hTHc3BqNP4IWq(Fd5hL!O20#aV!Fq?eGySu#tpR3_r)R zws*1i4`Trjry_{dHguF|?SsF`9Bm6mb!8w$XAz{rSvVsbX9%1b1F0RwJ=j)A2dHG& zMhDWd_E0fxWk|N0&JjpJ?JVxZ9y&{u(nV(u<#9I`G!r(h*jC(*9i<)ES=NP}rJdMG z)f7r45J7;3bG@+I0fKJ;p*4NnUkA1nG-6M6w*izalwjIb-iDpDP^ummA(hZSkGL+X z%g$+dyXTPD3ncW;pMjHYgubiOGPkUYj!HxGh3A*LU{<&{VV1H)DzJE-hfAujqLa&B3v5(fTAF(?nTJWb z6==cyr+ZSV2Kn9$`s6kAFzhswBi0R?o;x&Rx6=ZZ3H`X9pGzq%4g8Jc_T~W({7zFGA7D8= zwJ-!h;hrERENL+3`5MmuqVw1w`b%d1o$HY2Gkb&ceP<);>|f8dGi$$^S-4wle|eAR z`|f!q?uC=;$6mpQ0fY&9itM6s52u;4lw62#IeTwGsDDvTD&&?t;yOc>V-XDuDh zZ6df{I2|T}VTRxo#u_%1p`#6{i25l6SC3F7_2Z?J4cN?ZBA5;mN$7>KW)H0yK$P}J z1+|kQ+xDV%1XlL&cmykd-$5XSa2d??q^x$9bz*B_E7ej1wllN~qXX(39CSbj&)>Ev zwHP=N$Wl}>RIS>_86$9d zQ~?ZAoiRPd_1IEahu!5Z*pgq1t+b%h7Q{64!^>+S(<8^+wS81WRs(nnEmg+KC6(7B zji#l{O+^@9*o;6b!mXKQW)@AsDV+*dgF1~OQsX=;2iuY~@U(T-G+OJu0Tr){Amygg zjAw|O#&eSbJ8KXquXjj(E5cZTM6t5a4c2kBBiv47@u-|=dY{DoNZVoRf|ZAhut z>0Dp>Ys~yR*J;nS(<{H?%UPd$C`ywkO$Z+0$#;kLh*jDxah=sAgG%K zFTAV+LHSMCL&uGz6RZ6tjx~223x7Ndb{ri}Q?A6&i9J+4ajbQn1Wb%TM02ZMr;$LC znYJlz%cZ#yccJY{>qo0sh%m8?K;t?N7TzeXuQ|~pS#w6P;D%E*g;&$6MiE**f;}Yz z2&RQIY*>G!8tV>KVhdrliy>Z+W*Q){lnzJr5P}%;?d12n3fd6JuwyrE2OTIvgAr-L zR9k_p_4WJif_BqJ6;-8iPlPhlr}0mxjS!5Nx+GwtHPdKy4*}c{7vZHaS??pMR^pg9 zUgnc+9x5AIJk_RcPUdxFP48J2N65vu6Lf@@yJZLtL9nn9TTfMDYgQ$K3K|$vbu+x8 zgQ|yap`qPwd{13aO$JP?B#bRUN=nLA(T%WzChRy_X{P&Cn79~H8gh`rFxxiWGLy0} z;#;tix>B2!rj&M7Yap!+DTQo*4yo|PkkYL+iy$S_XmW*m_TWw3ziE2z7MZ3D4$to} z9W7E%rbo7nicLdG%BiZ#hmg!l=45^6SyQ!GA)h+l)#Xk=seAqPfRuUZ&ACo{uAN@_ z6<_u)&$qR0_ByZrdbK^tUdx_d%YJ09Emg1QDpm?F=F^-)8fd9;GrE;U-PHDN6dDW|U7@E94q-bb?TgnbLRstofPb5Zd0D6u^RM zxIuEO+EGTBrXDjM%1ad}Cza#s7M)0jjPVS4G&_W5KF|~`i_OehK+_m1t-sh3v@Zfs zBf*XH6GBl`w81%b#vH|(=B1Ac!Wx#4O0}0p5T*0@3hm6&7*!O%m)W2?$dGe?kGk`z zPzW|nYIr_KrFP7nwiL~_KvVClJ%HARl%Bn)UcxjgMunQ%);1}v*9%g*e!8x@mR7Id zG~9$#WFEuG+;&9q_k^Mr9Ix*%55836xjpZ;rJdB(FE#ZVA@!PGTJc<`J=b1+XZ9h_ yx3z8dISCp1c(R0000b; literal 0 HcmV?d00001 diff --git a/ext/show_pin_dialog/dialog_ui/js/i18n/en-US.json b/ext/show_pin_dialog/dialog_ui/js/i18n/en-US.json new file mode 100644 index 000000000..0714fc75f --- /dev/null +++ b/ext/show_pin_dialog/dialog_ui/js/i18n/en-US.json @@ -0,0 +1,5 @@ +{ + "message":{ + "hello": "hello world" + } +} \ No newline at end of file diff --git a/ext/show_pin_dialog/dialog_ui/js/i18n/zh-CN.json b/ext/show_pin_dialog/dialog_ui/js/i18n/zh-CN.json new file mode 100644 index 000000000..53afe2047 --- /dev/null +++ b/ext/show_pin_dialog/dialog_ui/js/i18n/zh-CN.json @@ -0,0 +1,5 @@ +{ + "message": { + "hello": "你好世界" + } +} \ No newline at end of file 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 new file mode 100644 index 000000000..feb20b4fd --- /dev/null +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css @@ -0,0 +1,31 @@ +.container { + flex-direction: column; + justify-content: center; + align-items: center; + opacity: 0.8; + background-color: azure; +} + +.title { + font-size: 48px; + line-height: 50px; + font-weight: 800; +} + +.title-list { + font-size: 38px; + line-height: 40px; + font-weight: 800; +} + +.title-pin { + font-size: 48px; + line-height: 50px; + font-weight: 800; +} + +.but { + width: 100%; + font-size: 26px; + height: 36px; +} \ No newline at end of file diff --git a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.hml b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.hml new file mode 100644 index 000000000..9cb650aef --- /dev/null +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.hml @@ -0,0 +1,14 @@ +
+ + PIN码连接 + + + 请在设备端输入链接码进行验证 + + + {{ pincode }} + + +
\ No newline at end of file diff --git a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.js b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.js new file mode 100644 index 000000000..114655c3a --- /dev/null +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.js @@ -0,0 +1,14 @@ +import router from '@ohos.router' + +export default { + data: { + pincode: router.getParams().pinCode, + }, + onInit() { + console.info('getParams: ' + router.getParams()); + }, + onConfirm() { + console.info('click confirm'); + callNativeHandler("EVENT_CONFIRM", "1"); + } +} \ No newline at end of file diff --git a/services/devicemanagerservice/BUILD.gn b/services/devicemanagerservice/BUILD.gn index 8d9799369..f4359edcc 100644 --- a/services/devicemanagerservice/BUILD.gn +++ b/services/devicemanagerservice/BUILD.gn @@ -57,6 +57,7 @@ if (defined(ohos_lite)) { "//base/startup/syspara_lite/interfaces/kits", "//base/startup/syspara_lite/adapter/native/syspara/include", "//third_party/json/include", + "//third_party/flutter/skia", ] sources = [ @@ -85,12 +86,15 @@ if (defined(ohos_lite)) { ] deps = [ + "${common_path}/include/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/windowmanager/wm:libwm", "//utils/native/base:utils", ] diff --git a/services/devicemanagerservice/include/authentication/authentication.h b/services/devicemanagerservice/include/authentication/authentication.h index 5783f1112..43c486511 100644 --- a/services/devicemanagerservice/include/authentication/authentication.h +++ b/services/devicemanagerservice/include/authentication/authentication.h @@ -20,11 +20,12 @@ namespace OHOS { namespace DistributedHardware { +class DmAuthManager; class IAuthentication { public: virtual ~IAuthentication() = default; - virtual int32_t ShowAuthInfo() = 0; - virtual int32_t StartAuth(std::shared_ptr dmAbilityManager) = 0; + virtual int32_t ShowAuthInfo(int32_t code) = 0; + virtual int32_t StartAuth(int32_t code, std::shared_ptr authManager) = 0; virtual int32_t VerifyAuthentication(std::string pinToken, int32_t code, const std::string &authParam) = 0; }; diff --git a/services/devicemanagerservice/include/authentication/dm_auth_manager.h b/services/devicemanagerservice/include/authentication/dm_auth_manager.h index 2ea42c9b7..6b0298ec9 100644 --- a/services/devicemanagerservice/include/authentication/dm_auth_manager.h +++ b/services/devicemanagerservice/include/authentication/dm_auth_manager.h @@ -129,6 +129,7 @@ public: const std::string &extra); int32_t UnAuthenticateDevice(const std::string &pkgName, const std::string &deviceId); int32_t VerifyAuthentication(const std::string &authParam); + void VerifyPinAuthAuthentication(const std::string &action); void OnSessionOpened(int32_t sessionId, int32_t sessionSide, int32_t result); void OnSessionClosed(int32_t sessionId); void OnDataReceived(int32_t sessionId, std::string message); diff --git a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp index cde8a2e3c..1e9976f44 100644 --- a/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp +++ b/services/devicemanagerservice/src/authentication/dm_auth_manager.cpp @@ -24,6 +24,9 @@ #include "dm_random.h" #include "nlohmann/json.hpp" #include "parameter.h" +#include "ui_service_mgr_client.h" +#include "dialog_callback_stub.h" +#include "dialog_callback.h" namespace OHOS { namespace DistributedHardware { @@ -652,31 +655,61 @@ int32_t DmAuthManager::GetPinCode() void DmAuthManager::ShowConfigDialog() { - std::shared_ptr authUi_ = std::make_shared(); - dmAbilityMgr_ = std::make_shared(); - authUi_->ShowConfirmDialog(dmAbilityMgr_); + LOGI("ShowConfigDialog start"); + nlohmann::json jsonObj; + jsonObj[TAG_AUTH_TYPE] = AUTH_TYPE_PIN; + jsonObj[TAG_TOKEN] = authResponseContext_->token; + jsonObj[TARGET_PKG_NAME_KEY] = authResponseContext_->targetPkgName; + jsonObj.dump(); + const std::string params = jsonObj.dump(); + std::shared_ptr authMgr_ = shared_from_this(); + + Ace::UIServiceMgrClient::GetInstance()->ShowDialog( + "config_dialog_service", + params, + OHOS::Rosen::WindowType::WINDOW_TYPE_SYSTEM_ALARM_WINDOW, + ACE_X, ACE_Y, ACE_WIDTH, ACE_HEIGHT, + [authMgr_](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()); + authMgr_->StartAuthProcess(atoi(params.c_str())); + }); + LOGI("ShowConfigDialog end"); } void DmAuthManager::ShowAuthInfoDialog() { - return; + LOGI("DmAuthManager::ShowAuthInfoDialog start"); + authResponseContext_->code = GeneratePincode(); + std::shared_ptr ptr; + if (authenticationMap_.find(1) == authenticationMap_.end()) { + LOGE("DmAuthManager::authenticationMap_ is null"); + return; + } + ptr = authenticationMap_[1]; + LOGI("ShowAuthInfoDialog code:%d", authResponseContext_->code); + ptr->ShowAuthInfo(authResponseContext_->code); } void DmAuthManager::ShowStartAuthDialog() { LOGI("DmAuthManager::ShowStartAuthDialog start"); - dmAbilityMgr_ = std::make_shared(); std::shared_ptr ptr; if (authenticationMap_.find(1) == authenticationMap_.end()) { LOGE("DmAuthManager::authenticationMap_ is null"); return; } ptr = authenticationMap_[1]; - ptr->StartAuth(dmAbilityMgr_); + ptr->StartAuth(authResponseContext_->code, shared_from_this()); } int32_t DmAuthManager::GetAuthenticationParam(DmAuthParam &authParam) { + if (dmAbilityMgr_ == nullptr) { + LOGI("dmAbilityMgr_ is nullptr"); + return DM_POINT_NULL; + } + dmAbilityMgr_->StartAbilityDone(); AbilityRole role = dmAbilityMgr_->GetAbilityRole(); authParam.direction = (int32_t)role; @@ -737,5 +770,20 @@ void DmAuthManager::UserSwitchEventCallback (void) } } } + +void DmAuthManager::VerifyPinAuthAuthentication(const std::string &action) +{ + LOGI("DmAuthManager::VerifyPinAuthAuthentication"); + timerMap_[INPUT_TIMEOUT_TASK]->Stop(SESSION_CANCEL_TIMEOUT); + if (action == "0") { + authRequestState_->TransitionTo(std::make_shared()); + } + if (action == "1") { + authRequestContext_->reason = DM_AUTH_INPUT_FAILED; + authResponseContext_->state = authRequestState_->GetStateType(); + authRequestState_->TransitionTo(std::make_shared()); + } + LOGI("DmAuthManager::VerifyAuthentication complete"); +} } // namespace DistributedHardware } // namespace OHOS -- Gitee From 2a96d357a222753086b0d4bb3e5c0cdcb8f1a186 Mon Sep 17 00:00:00 2001 From: lcaidm Date: Wed, 26 Jan 2022 16:57:07 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=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 --- common/include/dialog_ui/js/pages/index/index.css | 3 +++ common/include/dialog_ui/js/pages/index/index.hml | 2 +- ext/input_pin_dialog/dialog_ui/js/pages/index/index.css | 2 ++ ext/input_pin_dialog/dialog_ui/js/pages/index/index.hml | 2 +- ext/input_pin_dialog/dialog_ui/js/pages/index/index.js | 2 -- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/common/include/dialog_ui/js/pages/index/index.css b/common/include/dialog_ui/js/pages/index/index.css index a8c28768d..b87a3962a 100644 --- a/common/include/dialog_ui/js/pages/index/index.css +++ b/common/include/dialog_ui/js/pages/index/index.css @@ -16,16 +16,19 @@ width: 85%; margin-top: 10%; text-align: center; + height: 45px; } .but1 { width: 40%; + height: 36px; font-size: 26px; margin-left: 10%; } .but2 { width: 20%; + height: 36px; font-size: 26px; margin-left: 55%; } diff --git a/common/include/dialog_ui/js/pages/index/index.hml b/common/include/dialog_ui/js/pages/index/index.hml index 1ec849137..81ab90ff6 100644 --- a/common/include/dialog_ui/js/pages/index/index.hml +++ b/common/include/dialog_ui/js/pages/index/index.hml @@ -1,6 +1,6 @@
- 是否允许{{ message }}连接本机 + 是否允许对端连接本机 用于分享图片 diff --git a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css index f71aa930e..cf763b2ac 100644 --- a/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css +++ b/ext/input_pin_dialog/dialog_ui/js/pages/index/index.css @@ -33,6 +33,8 @@ .but { margin: 10px 20px 10px 20px; + width: 85%; + height: 40px; } .but1 { 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 a8be01f5f..7f629df7a 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 @@ -8,7 +8,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 7e358fc5d..8a38e6188 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 @@ -7,7 +7,6 @@ export default { }, onInit() { console.info('getParams: ' + router.getParams()); - document.getElementById("error").setAttribute("hidden",true); }, onConfirm() { console.info('click confirm'); @@ -22,7 +21,6 @@ export default { } else { console.info('pincode: != input'); //刷新页面，提示输入错误 - document.getElementById("error").removeAttribute("hidden"); } } else { console.info('click cancel'); -- Gitee