modify code

Signed-off-by: zhaolinglan <zhaolinglan@huawei.com>
This commit is contained in:
zhaolinglan 2022-11-23 21:39:56 +08:00
parent 71bee2ef11
commit 80ca01aaf4
2 changed files with 5 additions and 3 deletions

View File

@ -23,6 +23,7 @@ config("inputmethod_services_native_config") {
"//base/notification/common_event_service/frameworks/core/include",
"//base/notification/common_event_service/interfaces/innerkits/native/include",
"//foundation/multimodalinput/input/interfaces/native/innerkits/event/include",
"${inputmethod_path}/services/adapter/keyboard/include",
"${inputmethod_path}/services/dfx/include",
]

View File

@ -39,19 +39,20 @@ void InputEventCallback::OnInputEvent(std::shared_ptr<MMI::KeyEvent> keyEvent) c
{
auto keyCode = keyEvent->GetKeyCode();
auto keyAction = keyEvent->GetKeyAction();
if (MASK_MAP.find(keyCode) == MASK_MAP.end() || keyAction == MMI::KeyEvent::KEY_ACTION_UNKNOWN) {
auto currKey = MASK_MAP.find(keyCode);
if (currKey == MASK_MAP.end() || keyAction == MMI::KeyEvent::KEY_ACTION_UNKNOWN) {
IMSA_HILOGD("key event unknown");
return;
}
IMSA_HILOGD("keyCode: %{public}d, keyAction: %{public}d", keyCode, keyAction);
if (keyAction == MMI::KeyEvent::KEY_ACTION_DOWN) {
IMSA_HILOGD("key %{public}d pressed down", keyCode);
keyState = keyState | MASK_MAP[keyCode];
keyState = keyState | currKey->second;
return;
}
CombinationKey key = FindCombinationKey(keyState);
keyState = keyState & ~MASK_MAP[keyCode];
keyState = keyState & ~currKey->second;
if (key == CombinationKey::UNKNOWN) {
IMSA_HILOGE("combination key unknown");
return;