openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2025-01-09 02:11:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!34871 获焦时再去拉输入法并传递私有数据

Browse Source 
Merge pull request !34871 from jsjzju/master
This commit is contained in:
openharmony_ci 2024-06-05 09:25:37 +00:00 committed by Gitee
commit fa0a86ddc5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
frameworks/core/components_ng/pattern/text_field/text_field_pattern.cpp
View File

@ -135,7 +135,6 @@ constexpr char16_t OBSCURING_CHARACTER = u'•';
constexpr char16_t OBSCURING_CHARACTER_FOR_AR = u'*';
const std::string NEWLINE = "\n";
const std::wstring WIDE_NEWLINE = StringUtils::ToWstring(NEWLINE);
constexpr int32_t AUTO_FILL_FAILED = 1;
#if defined(ENABLE_STANDARD_INPUT)
constexpr int32_t AUTO_FILL_CANCEL = 2;
#endif
@ -147,7 +146,6 @@ const std::string EMAIL_WHITE_LIST = "[\\w.\\@]";
const std::string URL_WHITE_LIST = "[a-zA-z]+://[^\\s]*";
const std::string SHOW_PASSWORD_SVG = "SYS_SHOW_PASSWORD_SVG";
const std::string HIDE_PASSWORD_SVG = "SYS_HIDE_PASSWORD_SVG";
const std::string AUTO_FILL_TEST = "persist.sys.arkui.auto.fill.input.method.enabled";
const std::string AUTO_FILL_PARAMS_USERNAME = "com.autofill.params.userName";
const std::string AUTO_FILL_PARAMS_NEWPASSWORD = "com.autofill.params.newPassword";
constexpr int32_t DEFAULT_MODE = -1;
@ -3473,6 +3471,10 @@ bool TextFieldPattern::RequestKeyboard(bool isFocusViewChanged, bool needStartTw
}
inputMethod->Attach(textChangeListener_, needShowSoftKeyboard, textConfig);
UpdateKeyboardOffset(textConfig.positionY, textConfig.height);
if (!fillContentMap_.empty()) {
inputMethod->SendPrivateCommand(fillContentMap_);
fillContentMap_.clear();
}
#else
ok = RequestKeyboardCrossPlatForm(isFocusViewChanged);
#endif
@ -6305,11 +6307,9 @@ void TextFieldPattern::NotifyFillRequestSuccess(RefPtr<ViewDataWrap> viewDataWra
bool TextFieldPattern::ParseFillContentJsonValue(const std::unique_ptr<JsonValue>& jsonObject,
std::unordered_map<std::string, std::variant<std::string, bool, int32_t>>& map)
{
bool ret = false;
if (!jsonObject->IsValid() || jsonObject->IsArray() || !jsonObject->IsObject()) {
TAG_LOGE(AceLogTag::ACE_AUTO_FILL, "fillContent format is not right");
return ret;
return false;
}
auto child = jsonObject->GetChild();
@ -6336,46 +6336,18 @@ void TextFieldPattern::NotifyFillRequestFailed(int32_t errCode, const std::strin
{
TAG_LOGI(AceLogTag::ACE_AUTO_FILL, "errCode:%{public}d", errCode);
SetFillRequestFinish(true);
if (errCode == AUTO_FILL_FAILED) {
return;
}
if (RequestKeyboard(false, true, true)) {
NotifyOnEditChanged(true);
}
#if defined(ENABLE_STANDARD_INPUT)
TAG_LOGI(AceLogTag::ACE_AUTO_FILL, "fillContent is : %{private}s", fillContent.c_str());
std::unordered_map<std::string, MiscServices::PrivateDataValue> userNamesOrPassWordMap;
while (errCode == AUTO_FILL_CANCEL && IsAutoFillPasswordType(GetAutoFillType())) {
if (errCode == AUTO_FILL_CANCEL && !fillContent.empty() && IsAutoFillPasswordType(GetAutoFillType())) {
auto jsonObject = JsonUtil::ParseJsonString(fillContent);
if (jsonObject == nullptr) {
break;
return;
}
if (!ParseFillContentJsonValue(jsonObject, userNamesOrPassWordMap)) {
break;
}
MiscServices::InputMethodController::GetInstance()->SendPrivateCommand(userNamesOrPassWordMap);
if (system::GetBoolParameter(AUTO_FILL_TEST, false)) {
if (textChangeListener_ == nullptr) {
textChangeListener_ = new OnTextChangedListenerImpl(WeakClaim(this));
}
auto task = [textChangeListener = textChangeListener_, userNamesOrPassWordMap] {
CHECK_NULL_VOID(textChangeListener);
textChangeListener->ReceivePrivateCommand(userNamesOrPassWordMap);
};
auto context = PipelineContext::GetCurrentContext();
CHECK_NULL_VOID(context);
auto taskExecutor = context->GetTaskExecutor();
CHECK_NULL_VOID(taskExecutor);
taskExecutor->PostDelayedTask(task, TaskExecutor::TaskType::UI, 3000, "ArkUITextFieldTestAutoFillInput");
}
break;
fillContentMap_.clear();
ParseFillContentJsonValue(jsonObject, fillContentMap_);
}
#endif
auto host = GetHost();
CHECK_NULL_VOID(host);
host->MarkDirtyNode(PROPERTY_UPDATE_RENDER);
}
bool TextFieldPattern::CheckAutoSave()

1
frameworks/core/components_ng/pattern/text_field/text_field_pattern.h
View File

@ -1681,6 +1681,7 @@ private:
std::string autoFillUserName_;
std::string autoFillNewPassword_;
bool autoFillOtherAccount_ = false;
std::unordered_map<std::string, std::variant<std::string, bool, int32_t>> fillContentMap_;
bool textInputBlurOnSubmit_ = true;
bool textAreaBlurOnSubmit_ = false;