diff --git a/common/include/dialog_ui/js/pages/index/index.hml b/common/include/dialog_ui/js/pages/index/index.hml index 4a689e272e87c59f32f11fb626795649dbb3f722..97f3919b38005d0b37d13bdfed1e54ea2205fad5 100644 --- a/common/include/dialog_ui/js/pages/index/index.hml +++ b/common/include/dialog_ui/js/pages/index/index.hml @@ -1,3 +1,17 @@ +
是否允许对端连接本机 diff --git a/common/include/dialog_ui/js/pages/index/index.js b/common/include/dialog_ui/js/pages/index/index.js index f579f6a3e554e0dcb02bd8e95b2e1e5577304402..608ed2733aef8b6f23aa3f4d51342f0898893081 100644 --- a/common/include/dialog_ui/js/pages/index/index.js +++ b/common/include/dialog_ui/js/pages/index/index.js @@ -1,3 +1,17 @@ +/* + Copyright (c) 2022 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 router from '@ohos.router' var timel = null; diff --git a/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js b/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js index c3234a50dc7569ed8bf587f6ea22899f0671b0f2..676f36c9dbe5cafc9c609d506a5f138232851bd5 100644 --- a/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js +++ b/ext/input_pin_dialog/dialog_ui/js/common/KeyBoard.js @@ -1,4 +1,17 @@ +/* + Copyright (c) 2022 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. +*/ ;(function(exports){ var KeyBoard = function(input, options){ var body = document.getElementsByTagName('body')[0]; diff --git a/ext/input_pin_dialog/dialog_ui/js/common/index.hml b/ext/input_pin_dialog/dialog_ui/js/common/index.hml index 3566d9ba28b0696c15f59dcf87adaa6155fb5430..f4b38f39910631f1374f3614eca8a4f9f0791835 100644 --- a/ext/input_pin_dialog/dialog_ui/js/common/index.hml +++ b/ext/input_pin_dialog/dialog_ui/js/common/index.hml @@ -1,3 +1,17 @@ +
PIN码连接 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 84f217637922f7f11220581ad95ca82c435abbf6..bac7185483c89897665583b24cc0090a62582837 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 @@ -1,3 +1,17 @@ +
PIN码连接 diff --git a/ext/mini/services/devicemanagerservice/include/ability/dm_ability_manager.h b/ext/mini/services/devicemanagerservice/include/ability/dm_ability_manager.h index 17a9337d598f8052ef850417d37f471250955197..f0572b11a9d81f24d3f60dedfc314378bf3e3b51 100644 --- a/ext/mini/services/devicemanagerservice/include/ability/dm_ability_manager.h +++ b/ext/mini/services/devicemanagerservice/include/ability/dm_ability_manager.h @@ -53,7 +53,7 @@ public: void StartAbilityDone(); private: - void waitForTimeout(uint32_t timeout_s); + void WaitForTimeout(uint32_t timeout_s); private: sem_t mSem_; diff --git a/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp b/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp index b6f9025e646deb89d252db83cd68fc3f27fb4f53..b6ea8caeeb880f0e4537c9adee9fad22e4e15a21 100644 --- a/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp +++ b/ext/mini/services/devicemanagerservice/src/ability/lite/dm_ability_manager.cpp @@ -37,7 +37,7 @@ AbilityStatus DmAbilityManager::StartAbility(AbilityRole role) return mStatus_; } -void DmAbilityManager::waitForTimeout(uint32_t timeout_s) +void DmAbilityManager::WaitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); diff --git a/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp b/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp index 69143cada59c7de41f2db6d12482b737e6f15deb..d0a6d9af6d5ec3ac25ed72beddf7ce7db544533b 100644 --- a/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp +++ b/ext/mini/services/devicemanagerservice/src/ability/standard/dm_ability_manager.cpp @@ -76,11 +76,11 @@ AbilityStatus DmAbilityManager::StartAbility(AbilityRole role) mStatus_ = AbilityStatus::ABILITY_STATUS_FAILED; return mStatus_; } - waitForTimeout(ABILITY_START_TIMEOUT); + WaitForTimeout(ABILITY_START_TIMEOUT); return mStatus_; } -void DmAbilityManager::waitForTimeout(uint32_t timeout_s) +void DmAbilityManager::WaitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); diff --git a/ext/mini/utils/src/log/dm_log.cpp b/ext/mini/utils/src/log/dm_log.cpp index 538594b1564ab13ca0afc2e82cc10013465aabf6..88c546f92a9d9dfcb0908e36fca403ab6cdb626c 100644 --- a/ext/mini/utils/src/log/dm_log.cpp +++ b/ext/mini/utils/src/log/dm_log.cpp @@ -73,9 +73,13 @@ void DMLog(DMLogLevel logLevel, const char *fmt, ...) { char logBuf[LOG_MAX_LEN] = {0}; va_list arg; - int32_t ret = 0; - (void)memset_s(&arg, sizeof(va_list), 0, sizeof(va_list)); + int32_t ret = vsprintf_s(logBuf, sizeof(logBuf), fmt, arg); + if (ret != 0) { + DMLogOut(logLevel, "DM log memset_s error."); + return; + } + va_start(arg, fmt); ret = vsprintf_s(logBuf, sizeof(logBuf), fmt, arg); va_end(arg); diff --git a/ext/pin_auth/include/ability/dm_ability_manager.h b/ext/pin_auth/include/ability/dm_ability_manager.h index 225fefc6218fcd9c761be7cc5fd260fce4155e1d..8da9965b30904909a7b2831486cb3f4612bed017 100644 --- a/ext/pin_auth/include/ability/dm_ability_manager.h +++ b/ext/pin_auth/include/ability/dm_ability_manager.h @@ -43,7 +43,7 @@ public: void StartAbilityDone(); private: - void waitForTimeout(uint32_t timeout_s); + void WaitForTimeout(uint32_t timeout_s); private: sem_t mSem_; diff --git a/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp b/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp index d58403aeeb0b4c73e1f99d91bc78ad6cc719e796..6fab485c813e465c57933e1106567624a158b8f0 100644 --- a/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp +++ b/ext/pin_auth/src/ability/lite/dm_ability_manager.cpp @@ -30,7 +30,7 @@ AbilityStatus DmAbilityManager::StartAbility(AbilityRole role) return mStatus_; } -void DmAbilityManager::waitForTimeout(uint32_t timeout_s) +void DmAbilityManager::WaitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); diff --git a/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp b/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp index 09d7203142859847f2881085371a51fc338a02d8..58be7e50e516724e38b002013d682542b0ca60c7 100644 --- a/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp +++ b/ext/pin_auth/src/ability/standard/dm_ability_manager.cpp @@ -53,11 +53,11 @@ AbilityStatus DmAbilityManager::StartAbility(AbilityRole role) mStatus_ = ABILITY_STATUS_FAILED; return mStatus_; } - waitForTimeout(ABILITY_START_TIMEOUT); + WaitForTimeout(ABILITY_START_TIMEOUT); return mStatus_; } -void DmAbilityManager::waitForTimeout(uint32_t timeout_s) +void DmAbilityManager::WaitForTimeout(uint32_t timeout_s) { struct timespec ts; clock_gettime(CLOCK_REALTIME, &ts); diff --git a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css index ad2c2c4163304477cc340203355f1f1ea6b60d30..36ae7bfc318e72516ad9d981c1c3dedbbbbaf7ff 100644 --- a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.css @@ -1,3 +1,17 @@ +/* + Copyright (c) 2022 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. +*/ .container { flex-direction: column; justify-content: center; 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 index 9cb650aefdc7650e308f4202a3b9ca0ee11cba57..25e56edb005614cc793e3c5845255a08df44b2ec 100644 --- a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.hml +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.hml @@ -1,3 +1,17 @@ +
PIN码连接 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 index 3a55ac1cc8215df26437b036c9f92ec5dbb7568d..f61a54b7b65d98fc1299fbb83e26bca3da6a3ff2 100644 --- a/ext/show_pin_dialog/dialog_ui/js/pages/index/index.js +++ b/ext/show_pin_dialog/dialog_ui/js/pages/index/index.js @@ -1,3 +1,17 @@ +/* + Copyright (c) 2022 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 router from '@ohos.router' export default {