diff --git a/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.css b/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.css index 72630ca514539b8ac5d23be1252c3990f665de65..1af1aa754ab8fc7a1bdfab5778086e8e205ce158 100644 --- a/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.css +++ b/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.css @@ -1,3 +1,18 @@ +/* + 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/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.hml b/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.hml index 8ce5443f5b8ab4d28486a308d8aac8daba098c87..72791a167774196a69ca97c18ebda722c945a8a1 100644 --- a/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.hml +++ b/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.hml @@ -1,3 +1,18 @@ + +
是否允许对端连接本机 diff --git a/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.js b/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.js index 13a4384c54373870c4ca3b1e17d2daf7567c1239..19671312de0b4831c62e1f51e582602a6c7daf26 100644 --- a/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.js +++ b/common/include/show_confirm_dialog/dialog_ui/js/pages/index/index.js @@ -1,3 +1,18 @@ +/* + 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/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..998579267af35cf62169d4ab3c447ff7da4bc9b7 100644 --- a/ext/mini/utils/src/log/dm_log.cpp +++ b/ext/mini/utils/src/log/dm_log.cpp @@ -73,9 +73,12 @@ 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 = (void)memset_s(&arg, sizeof(va_list), 0, sizeof(va_list)); + 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/input_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.css index 7a310c9505b14086f69dd95e3dae0154c22eb27b..f83830a8d8440bfc84cb3bf27f682b2e5c393eac 100644 --- a/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.css +++ b/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.css @@ -1,3 +1,18 @@ +/* + 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/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.hml b/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.hml index 53558da904c5d13768c9a31383aed65dbd133aa8..0d0451017fefa6eac27d3bbaba14c4e150fc837c 100644 --- a/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.hml +++ b/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.hml @@ -1,3 +1,20 @@ + +
PIN码连接 diff --git a/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.js b/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.js index 488972d500f7250991051ef8511d5c24f22ce86d..65fce494ac1e663e5b479d9b31690b9360a0f1d6 100644 --- a/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.js +++ b/ext/pin_auth/input_pin_dialog/dialog_ui/js/pages/index/index.js @@ -1,3 +1,18 @@ +/* + 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 numbs = 0; diff --git a/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.css b/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.css index 8ce639b24540471fdce1155b554c6c090f9fa280..218d178702161438be3274de863d8afb8beb90e5 100644 --- a/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.css +++ b/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.css @@ -1,3 +1,18 @@ +/* + 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/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.hml b/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.hml index 845c99e570c9e56592ea375fa53410773b4c743c..ad532b4a48c5cf4593a10075133f3effc0c6ab32 100644 --- a/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.hml +++ b/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.hml @@ -1,3 +1,20 @@ + +
PIN码连接 diff --git a/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.js b/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.js index 598deca1f5d8075b1e73fbdc3cd4fbdcd5781635..1cf30b5708555cf87932029054ca21eea7dbfa8d 100644 --- a/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.js +++ b/ext/pin_auth/show_pin_dialog/dialog_ui/js/pages/index/index.js @@ -1,3 +1,18 @@ +/* + 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 { 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);