openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-12-02 12:06:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modify code

Browse Source 
Signed-off-by: zhaolinglan <zhaolinglan@huawei.com>
This commit is contained in:
zhaolinglan 2024-03-16 18:34:43 +08:00
parent adc4ae816e
commit 5bdcac9812
4 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
services/include/freeze_manager.h
View File

@ -31,7 +31,7 @@ public:
void AfterIpc(RequestType type, bool isSuccess);
private:
void SetFrozen(bool isFrozen);
void ControlIme(bool shouldFreeze);
std::mutex mutex_;
bool isImeInUse_{ false };
bool isFrozen_{ true };

4
services/include/peruser_session.h
View File

@ -124,7 +124,7 @@ private:
sptr<IInputClient> currentClient_; // the current input client
std::mutex resetLock;
ResetManager manager;
using IPCExec = std::function<int32_t()>;
using IpcExec = std::function<int32_t()>;
PerUserSession(const PerUserSession &);
PerUserSession &operator=(const PerUserSession &);
@ -178,7 +178,7 @@ private:
bool IsBindImeInProxyImeBind(ImeType bindImeType);
bool IsImeBindChanged(ImeType bindImeType);
std::map<sptr<IRemoteObject>, std::shared_ptr<InputClientInfo>> GetClientMap();
int32_t RequestIme(const std::shared_ptr<ImeData> &data, RequestType type, const IPCExec &exec);
int32_t RequestIme(const std::shared_ptr<ImeData> &data, RequestType type, const IpcExec &exec);
BlockData<bool> isImeStarted_{ MAX_IME_START_TIME, false };
std::mutex imeDataLock_;

69
services/src/freeze_manager.cpp
View File

@ -32,45 +32,56 @@ bool FreezeManager::IsIpcNeeded(RequestType type)
void FreezeManager::BeforeIpc(RequestType type)
{
std::lock_guard<std::mutex> lock(mutex_);
if (type == RequestType::START_INPUT) {
isImeInUse_ = true;
{
std::lock_guard<std::mutex> lock(mutex_);
if (type == RequestType::START_INPUT) {
isImeInUse_ = true;
}
if (!isFrozen_) {
IMSA_HILOGD("already not frozen");
return;
}
isFrozen_ = false;
}
SetFrozen(false);
ControlIme(false);
}
void FreezeManager::AfterIpc(RequestType type, bool isSuccess)
{
std::lock_guard<std::mutex> lock(mutex_);
if (type == RequestType::START_INPUT) {
isImeInUse_ = isSuccess;
bool shouldFreeze = false;
{
std::lock_guard<std::mutex> lock(mutex_);
if (type == RequestType::START_INPUT) {
isImeInUse_ = isSuccess;
}
if (type == RequestType::REQUEST_HIDE && isImeInUse_) {
isImeInUse_ = !isSuccess;
}
if (type == RequestType::STOP_INPUT) {
isImeInUse_ = false;
}
if (isFrozen_ == !isImeInUse_) {
IMSA_HILOGD("frozen state already: %{public}d", isFrozen_);
return;
}
isFrozen_ = !isImeInUse_;
shouldFreeze = isFrozen_;
}
if (type == RequestType::REQUEST_HIDE && isImeInUse_) {
isImeInUse_ = !isSuccess;
}
if (type == RequestType::STOP_INPUT) {
isImeInUse_ = false;
}
SetFrozen(!isImeInUse_);
ControlIme(shouldFreeze);
}
void FreezeManager::SetFrozen(bool isFrozen)
void FreezeManager::ControlIme(bool shouldFreeze)
{
if (isFrozen_ == isFrozen) {
IMSA_HILOGD("frozen state %{public}d not changed", isFrozen);
return;
}
uint32_t type = ResourceSchedule::ResType::RES_TYPE_SA_CONTROL_APP_EVENT;
int64_t status = isFrozen ? ResourceSchedule::ResType::SaControlAppStatus::SA_STOP_APP
: ResourceSchedule::ResType::SaControlAppStatus::SA_START_APP;
std::unordered_map<std::string, std::string> payload;
payload["saId"] = std::to_string(INPUT_METHOD_SYSTEM_ABILITY_ID);
payload["saName"] = INPUT_METHOD_SERVICE_SA_NAME;
payload["extensionType"] = std::to_string(static_cast<int32_t>(AppExecFwk::ExtensionAbilityType::INPUTMETHOD));
payload["pid"] = std::to_string(pid_);
IMSA_HILOGI("report RSS freezable: %{public}d", isFrozen);
auto type = ResourceSchedule::ResType::RES_TYPE_SA_CONTROL_APP_EVENT;
auto status = shouldFreeze ? ResourceSchedule::ResType::SaControlAppStatus::SA_STOP_APP
: ResourceSchedule::ResType::SaControlAppStatus::SA_START_APP;
std::unordered_map<std::string, std::string> payload = {
{ "saId", std::to_string(INPUT_METHOD_SYSTEM_ABILITY_ID) },
{ "saName", INPUT_METHOD_SERVICE_SA_NAME },
{ "extensionType", std::to_string(static_cast<int32_t>(AppExecFwk::ExtensionAbilityType::INPUTMETHOD)) },
{ "pid", std::to_string(pid_) } };
IMSA_HILOGI("report RSS should freeze: %{public}d", shouldFreeze);
ResourceSchedule::ResSchedClient::GetInstance().ReportData(type, status, payload);
isFrozen_ = isFrozen;
}
} // namespace MiscServices
} // namespace OHOS

2
services/src/peruser_session.cpp
View File

@ -1125,7 +1125,7 @@ std::map<sptr<IRemoteObject>, std::shared_ptr<InputClientInfo>> PerUserSession::
return mapClients_;
}
int32_t PerUserSession::RequestIme(const std::shared_ptr<ImeData> &data, RequestType type, const IPCExec &exec)
int32_t PerUserSession::RequestIme(const std::shared_ptr<ImeData> &data, RequestType type, const IpcExec &exec)
{
if (IsProxyImeEnable()) {
IMSA_HILOGD("proxy enable");