openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-30 18:31:01 +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 2024-04-14 16:51:59 +08:00
parent 46c2eb7c46
commit 9d8a83529c
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/include/input_method_system_ability.h
View File

@ -158,7 +158,7 @@ private:
std::atomic<bool> imeStarting_ = false;
std::mutex switchImeMutex_;
std::atomic<int32_t> switchImeCount_ = 0;
uint32_t targetSwitchCount_ = 0;
std::atomic<uint32_t> targetSwitchCount_ = 0;
};
} // namespace MiscServices
} // namespace OHOS

14
services/src/input_method_system_ability.cpp
View File

@ -927,9 +927,14 @@ int32_t InputMethodSystemAbility::SwitchByCombinationKey(uint32_t state)
if (CombinationKey::IsMatch(CombinationKeyFunction::SWITCH_IME, state)) {
IMSA_HILOGI("switch ime");
{
if (switchImeCount_.load() != 0) {
IMSA_HILOGI("already has switch ime task.");
++targetSwitchCount_;
return ErrorCode::NO_ERROR;
}
std::lock_guard<std::mutex> lock(switchImeMutex_);
// 0 means current swich ime task count.
if (!switchQueue_.IsEmpty() || switchImeCount_.load() != 0) {
if (switchImeCount_.load() != 0) {
IMSA_HILOGI("already has switch ime task.");
++targetSwitchCount_;
return ErrorCode::NO_ERROR;
@ -942,7 +947,6 @@ int32_t InputMethodSystemAbility::SwitchByCombinationKey(uint32_t state)
std::lock_guard<std::mutex> lock(switchImeMutex_);
SwitchType();
--switchImeCount_;
targetSwitchCount_ = 0;
};
// 0 means delay time is 0.
serviceHandler_->PostTask(switchTask, "SwitchImeTask", 0, AppExecFwk::EventQueue::Priority::IMMEDIATE);
@ -1006,8 +1010,10 @@ int32_t InputMethodSystemAbility::SwitchLanguage()
int32_t InputMethodSystemAbility::SwitchType()
{
SwitchInfo switchInfo = { std::chrono::system_clock::now(), "", "" };
int32_t ret = ImeInfoInquirer::GetInstance().GetSwitchInfoBySwitchCount(
switchInfo, userId_, enableImeOn_, targetSwitchCount_);
auto cacheCount = targetSwitchCount_.load();
targetSwitchCount_.store(0);
int32_t ret =
ImeInfoInquirer::GetInstance().GetSwitchInfoBySwitchCount(switchInfo, userId_, enableImeOn_, cacheCount);
if (ret != ErrorCode::NO_ERROR) {
IMSA_HILOGE("Get next SwitchInfo failed, stop switching ime.");
return ret;