openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2025-02-10 17:34:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Signed-off-by: ma-shaoyin <mashaoyin1@huawei.com>

Browse Source 
Changes to be committed:
This commit is contained in:
ma-shaoyin 2023-01-20 10:14:58 +08:00
parent bc1d1e21aa
commit 0654a4d1c3
5 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
interfaces/kits/js/napi/inputmethodability/js_input_method_engine_setting.cpp
View File

@ -555,9 +555,9 @@ void JsInputMethodEngineSetting::OnInputStart()
return;
}
auto getInputStartProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_TWO) {
auto getInputStartProperty = [](napi_value *args, uint8_t argc,
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc < 2) {
return false;
}
napi_value textInput = JsTextInputClientEngine::GetTextInputClientInstance(item->env_);
@ -570,7 +570,7 @@ void JsInputMethodEngineSetting::OnInputStart()
args[ARGC_ONE] = textInput;
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_TWO, getInputStartProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_TWO, getInputStartProperty);
});
}
@ -590,15 +590,15 @@ void JsInputMethodEngineSetting::OnKeyboardStatus(bool isShow)
delete work;
});
auto getKeyboardStatusProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_ZERO) {
auto getKeyboardStatusProperty = [](napi_value *args, uint8_t argc,
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc != 0) {
return false;
}
args[ARGC_ZERO] = nullptr;
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_ZERO, getKeyboardStatusProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_ZERO, getKeyboardStatusProperty);
});
}
@ -622,15 +622,15 @@ void JsInputMethodEngineSetting::OnInputStop(const std::string &imeId)
return;
}
auto getInputStopProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_ONE) {
auto getInputStopProperty = [&imeId](napi_value *args, uint8_t argc,
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc != 0) {
return false;
}
napi_create_string_utf8(item->env_, entry->imeid.c_str(), NAPI_AUTO_LENGTH, &args[ARGC_ZERO]);
napi_create_string_utf8(item->env_, imeId.c_str(), NAPI_AUTO_LENGTH, &args[ARGC_ZERO]);
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_ONE, getInputStopProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_ONE, getInputStopProperty);
});
}
@ -655,14 +655,14 @@ void JsInputMethodEngineSetting::OnSetCallingWindow(uint32_t windowId)
}
auto getCallingWindowProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_ONE) {
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc != 0) {
return false;
}
napi_create_int32(item->env_, entry->windowid, &args[ARGC_ZERO]);
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_ONE, getCallingWindowProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_ONE, getCallingWindowProperty);
});
}
@ -687,8 +687,8 @@ void JsInputMethodEngineSetting::OnSetSubtype(const SubProperty &property)
}
auto getSubtypeProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_ONE) {
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc != 0) {
return false;
}
napi_value jsObject = GetResultOnSetSubtype(item->env_, entry->subProperty);
@ -699,7 +699,7 @@ void JsInputMethodEngineSetting::OnSetSubtype(const SubProperty &property)
args[ARGC_ZERO] = {jsObject};
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_ONE, getSubtypeProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_ONE, getSubtypeProperty);
});
}
} // namespace MiscServices

22
interfaces/kits/js/napi/inputmethodability/js_keyboard_delegate_setting.cpp
View File

@ -372,7 +372,7 @@ bool JsKeyboardDelegateSetting::OnKeyEvent(int32_t keyCode, int32_t keyStatus)
});
auto getKeyEventProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc < ARGC_ONE) {
if (argc != 0) {
return false;
}
napi_value jsObject = GetResultOnKeyEvent(item->env_, entry->keyEventPara.keyCode,
@ -384,7 +384,7 @@ bool JsKeyboardDelegateSetting::OnKeyEvent(int32_t keyCode, int32_t keyStatus)
args[ARGC_ZERO] = { jsObject };
return true;
};
bool isOnKeyEvent = JsUtils::CallJsFunction(entry->vecCopy, ARGC_ONE, getKeyEventProperty);
bool isOnKeyEvent = JsUtils::TraverseCallback(entry->vecCopy, ARGC_ONE, getKeyEventProperty);
entry->isDone->SetValue(isOnKeyEvent);
});
return isDone->GetValue();
@ -524,8 +524,8 @@ void JsKeyboardDelegateSetting::OnCursorUpdate(int32_t positionX, int32_t positi
});
auto getCursorUpdateProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_THREE) {
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc < 3) {
return false;
}
napi_create_int32(item->env_, entry->curPara.positionX, &args[ARGC_ZERO]);
@ -533,7 +533,7 @@ void JsKeyboardDelegateSetting::OnCursorUpdate(int32_t positionX, int32_t positi
napi_create_int32(item->env_, entry->curPara.height, &args[ARGC_TWO]);
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_THREE, getCursorUpdateProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_THREE, getCursorUpdateProperty);
});
}
@ -555,8 +555,8 @@ void JsKeyboardDelegateSetting::OnSelectionChange(int32_t oldBegin, int32_t oldE
});
auto getSelectionChangeProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_FOUR) {
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc < 4) {
return false;
}
napi_create_int32(item->env_, entry->selPara.oldBegin, &args[ARGC_ZERO]);
@ -565,7 +565,7 @@ void JsKeyboardDelegateSetting::OnSelectionChange(int32_t oldBegin, int32_t oldE
napi_create_int32(item->env_, entry->selPara.newEnd, &args[ARGC_THREE]);
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_FOUR, getSelectionChangeProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_FOUR, getSelectionChangeProperty);
});
}
@ -586,14 +586,14 @@ void JsKeyboardDelegateSetting::OnTextChange(const std::string &text)
});
auto getTextChangeProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_ONE) {
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc != 0) {
return false;
}
napi_create_string_utf8(item->env_, entry->text.c_str(), NAPI_AUTO_LENGTH, &args[ARGC_ZERO]);
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_ONE, getTextChangeProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_ONE, getTextChangeProperty);
});
}
} // namespace MiscServices

6
interfaces/kits/js/napi/inputmethodclient/js_get_input_method_setting.cpp
View File

@ -591,8 +591,8 @@ void JsGetInputMethodSetting::OnImeChange(const Property &property, const SubPro
return;
}
auto getImeChangeProperty = [entry](napi_value *args, uint8_t argc,
std::shared_ptr <JSCallbackObject> item) -> bool {
if (argc < ARGC_TWO) {
std::shared_ptr<JSCallbackObject> item) -> bool {
if (argc < 2) {
return false;
}
napi_value subProperty = JsInputMethod::GetJsInputMethodSubProperty(item->env_, entry->subProperty);
@ -605,7 +605,7 @@ void JsGetInputMethodSetting::OnImeChange(const Property &property, const SubPro
args[ARGC_ONE] = subProperty;
return true;
};
JsUtils::CallJsFunction(entry->vecCopy, ARGC_TWO, getImeChangeProperty);
JsUtils::TraverseCallback(entry->vecCopy, ARGC_TWO, getImeChangeProperty);
});
}
} // namespace MiscServices

2
interfaces/kits/js/napi/inputmethodclient/js_utils.cpp
View File

@ -161,7 +161,7 @@ const std::string JsUtils::ToMessage(int32_t code)
return "error is out of definition.";
}
bool JsUtils::CallJsFunction(std::vector <std::shared_ptr<JSCallbackObject>> &vecCopy, size_t paramNum,
bool JsUtils::TraverseCallback(std::vector<std::shared_ptr<JSCallbackObject>> &vecCopy, size_t paramNum,
ArgsProvider argsProvider)
{
bool isResult = false;

2
interfaces/kits/js/napi/inputmethodclient/js_utils.h
View File

@ -64,7 +64,7 @@ public:
static napi_value ToError(napi_env env, int32_t err);
static bool CallJsFunction(std::vector <std::shared_ptr<JSCallbackObject>> &vecCopy, size_t paramNum,
static bool TraverseCallback(std::vector <std::shared_ptr<JSCallbackObject>> &vecCopy, size_t paramNum,
ArgsProvider argsProvider);
private: