From 1fa19307efb28291e53e37736ac7f1e358f9140e Mon Sep 17 00:00:00 2001 From: zhanghuiyu_5451 Date: Tue, 25 Jul 2023 18:44:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BF=AE=E6=94=B9=20Signed-o?= =?UTF-8?q?ff-by:=20zhanghuiyu=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- interfaces/kits/napi/src/napi_accessibility_utils.cpp | 8 +++----- services/aams/src/accessibility_account_data.cpp | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/interfaces/kits/napi/src/napi_accessibility_utils.cpp b/interfaces/kits/napi/src/napi_accessibility_utils.cpp index a28d20ae..4f38de15 100644 --- a/interfaces/kits/napi/src/napi_accessibility_utils.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_utils.cpp @@ -818,7 +818,6 @@ std::string ConvertStringJSToNAPI(napi_env env, napi_value object, napi_value pr void ConvertStringArrayJSToNAPI(napi_env env, napi_value object, napi_value propertyNameValue, bool &hasProperty, std::vector &stringArray) { - std::string str = ""; napi_has_property(env, object, propertyNameValue, &hasProperty); if (hasProperty) { napi_value contentsValue = nullptr; @@ -828,7 +827,7 @@ void ConvertStringArrayJSToNAPI(napi_env env, napi_value object, napi_get_array_length(env, contentsValue, &dataLen); for (uint32_t i = 0; i < dataLen; i++) { napi_get_element(env, contentsValue, i, &data); - str = GetStringFromNAPI(env, data); + std::string str = GetStringFromNAPI(env, data); stringArray.push_back(str); } } @@ -941,7 +940,6 @@ bool ConvertEventInfoJSToNAPIPart3( { bool hasProperty = false; int32_t dataValue = 0; - std::string str = ""; napi_value propertyNameValue = nullptr; napi_create_string_utf8(env, "contents", NAPI_AUTO_LENGTH, &propertyNameValue); std::vector stringArray {}; @@ -953,9 +951,9 @@ bool ConvertEventInfoJSToNAPIPart3( } napi_create_string_utf8(env, "lastContent", NAPI_AUTO_LENGTH, &propertyNameValue); - str = ConvertStringJSToNAPI(env, object, propertyNameValue, hasProperty); + std::string strNapi = ConvertStringJSToNAPI(env, object, propertyNameValue, hasProperty); if (hasProperty) { - eventInfo.SetLatestContent(str); + eventInfo.SetLatestContent(strNapi); } napi_create_string_utf8(env, "beginIndex", NAPI_AUTO_LENGTH, &propertyNameValue); diff --git a/services/aams/src/accessibility_account_data.cpp b/services/aams/src/accessibility_account_data.cpp index 624352af..a4506c5b 100644 --- a/services/aams/src/accessibility_account_data.cpp +++ b/services/aams/src/accessibility_account_data.cpp @@ -267,13 +267,13 @@ void AccessibilityAccountData::RemoveInstalledAbility(const std::string &bundleN for (auto it = installedAbilities_.begin(); it != installedAbilities_.end();) { if (it->GetPackageName() == bundleName) { HILOG_DEBUG("Removed %{public}s from InstalledAbility: ", bundleName.c_str()); - std::string targetName = ""; if (!config_) { it = installedAbilities_.erase(it); continue; } std::string name = config_->GetShortkeyTarget(); if (it->GetId() == name) { + std::string targetName = ""; config_->SetShortkeyTarget(targetName); config_->SetShortKeyState(false); } -- Gitee