From 2821837c9dd1085262120dc433de3eb52a130c0e Mon Sep 17 00:00:00 2001 From: zhouyongfei Date: Wed, 19 Jan 2022 15:33:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=85=A5=E8=BE=93=E5=85=A5=E6=B3=95se?= =?UTF-8?q?rvice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhouyongfei --- .../include/input_method_system_ability.h | 2 +- services/include/peruser_session.h | 2 +- services/src/input_control_channel_stub.cpp | 1 - services/src/input_method_system_ability.cpp | 64 +++++++------------ services/src/peruser_session.cpp | 41 ++++++------ 5 files changed, 43 insertions(+), 67 deletions(-) diff --git a/services/include/input_method_system_ability.h b/services/include/input_method_system_ability.h index c0f4b3df6..94b81e729 100644 --- a/services/include/input_method_system_ability.h +++ b/services/include/input_method_system_ability.h @@ -70,11 +70,11 @@ namespace MiscServices { void WorkThread(); PerUserSetting *GetUserSetting(int32_t userId); PerUserSession *GetUserSession(int32_t userId); + void StartInputService(); int32_t OnUserStarted(const Message *msg); int32_t OnUserStopped(const Message *msg); int32_t OnUserUnlocked(const Message *msg); int32_t OnUserLocked(const Message *msg); - int32_t OnPrepareInput(Message *msg); int32_t OnHandleMessage(Message *msg); int32_t OnRemotePeerDied(const Message *msg); int32_t OnSettingChanged(const Message *msg); diff --git a/services/include/peruser_session.h b/services/include/peruser_session.h index 77fdbb513..a6571ee3f 100644 --- a/services/include/peruser_session.h +++ b/services/include/peruser_session.h @@ -114,7 +114,7 @@ namespace MiscServices { void CreateWorkThread(MessageHandler& handler); void JoinWorkThread(); void SetInputMethodAbility(sptr &inputMethodAbility); - static void BindInputAbility(); + static bool StartInputService(); private: int userId_; // the id of the user to whom the object is linking int userState; // the state of the user to whom the object is linking diff --git a/services/src/input_control_channel_stub.cpp b/services/src/input_control_channel_stub.cpp index 4fb9204c9..a5aab9bf7 100644 --- a/services/src/input_control_channel_stub.cpp +++ b/services/src/input_control_channel_stub.cpp @@ -222,7 +222,6 @@ namespace MiscServices { if (ret) { if (retAgent) { *retAgent = agent; - agent = nullptr; } if (retChannel) { *retChannel = channel; diff --git a/services/src/input_method_system_ability.cpp b/services/src/input_method_system_ability.cpp index 246dc9812..b925752de 100644 --- a/services/src/input_method_system_ability.cpp +++ b/services/src/input_method_system_ability.cpp @@ -123,6 +123,7 @@ namespace MiscServices { } IMSA_HILOGI("Publish ErrorCode::NO_ERROR."); state_ = ServiceRunningState::STATE_RUNNING; + StartInputService(); return ErrorCode::NO_ERROR; } @@ -169,6 +170,27 @@ namespace MiscServices { setting->Initialize(); } + void InputMethodSystemAbility::StartInputService() { + PerUserSession *session = GetUserSession(0); + + std::map::const_iterator it = msgHandlers.find(0); + if (it == msgHandlers.end()) { + IMSA_HILOGE("InputMethodSystemAbility::StartInputService() need start handler"); + MessageHandler *handler = new MessageHandler(); + if (session == nullptr) { + IMSA_HILOGE("InputMethodSystemAbility::OnPrepareInput session is nullptr"); + } + session->CreateWorkThread(*handler); + msgHandlers.insert(std::pair(0, handler)); + } + + if (!session->StartInputService()) { + IMSA_HILOGE("StartInputService failed. Try again 10s later"); + auto callback = [=]() { StartInputService(); }; + serviceHandler_->PostTask(callback, INIT_INTERVAL); + } + } + /*! Get the state of user \n This API is added for unit test. \param userID the id of given user @@ -406,10 +428,7 @@ namespace MiscServices { OnSettingChanged(msg); break; } - case MSG_ID_PREPARE_INPUT: { - OnPrepareInput(msg); - break; - } + case MSG_ID_PREPARE_INPUT: case MSG_ID_RELEASE_INPUT: case MSG_ID_START_INPUT: case MSG_ID_STOP_INPUT: @@ -599,43 +618,6 @@ namespace MiscServices { return ErrorCode::NO_ERROR; } - /*! Prepare input. Called by an input client. - \n Run in work thread of input method management service - \param msg the parameters from remote client are saved in msg->msgContent_ - \return ErrorCode::NO_ERROR - \return ErrorCode::ERROR_USER_NOT_UNLOCKED user not unlocked - */ - int32_t InputMethodSystemAbility::OnPrepareInput(Message *msg) - { - IMSA_HILOGI("InputMethodSystemAbility::OnPrepareInput"); - MessageParcel *data = msg->msgContent_; - int32_t userId = data->ReadInt32(); - - PerUserSetting *setting = GetUserSetting(userId); - if (setting == nullptr || setting->GetUserState() != UserState::USER_STATE_UNLOCKED) { - IMSA_HILOGE("InputMethodSystemAbility::OnPrepareInput errorCode = ErrorCode::ERROR_USER_NOT_UNLOCKED"); - return ErrorCode::ERROR_USER_NOT_UNLOCKED; - } - - std::map::const_iterator it = msgHandlers.find(userId); - if (it == msgHandlers.end()) { - PerUserSession *session = GetUserSession(userId); - MessageHandler *handler = new MessageHandler(); - if (session == nullptr) { - IMSA_HILOGE("InputMethodSystemAbility::OnPrepareInput session is nullptr"); - } - session->CreateWorkThread(*handler); - msgHandlers.insert(std::pair(userId, handler)); - it = msgHandlers.find(userId); - } - - if (it != msgHandlers.end()) { - MessageHandler *handler = it->second; - handler->SendMessage(msg); - } - return 0; - } - /*! Handle message \param msgId the id of message to run \msg the parameters are saved in msg->msgContent_ diff --git a/services/src/peruser_session.cpp b/services/src/peruser_session.cpp index 3be9b5ad5..5b05842ca 100644 --- a/services/src/peruser_session.cpp +++ b/services/src/peruser_session.cpp @@ -490,7 +490,10 @@ namespace MiscServices { lastImeIndex = index; bool supportPhysicalKbd = Platform::Instance()->CheckPhysicalKeyboard(); - localControlChannel[index]->ResetFlag(); + if (imsCore[index] == nullptr) { + IMSA_HILOGE("PerUserSession::ShowKeyboard Aborted! imdCore[%{public}d] is nullptr", index); + return ErrorCode::ERROR_NULL_POINTER; + } bool ret = imsCore[index]->startInput(clientInfo->channel, clientInfo->attribute, supportPhysicalKbd); if (!ret || localControlChannel[index]->GetAgentAndChannel(&imsAgent, &imsChannel) == false) { @@ -574,7 +577,6 @@ namespace MiscServices { } currentClient = nullptr; imsAgent = nullptr; - imsCore[index] = nullptr; if (imsChannel != nullptr) { delete imsChannel; imsChannel = nullptr; @@ -1174,18 +1176,22 @@ namespace MiscServices { return (ClientInfo*) it->second; } - void PerUserSession::BindInputAbility() + bool PerUserSession::StartInputService() { - IMSA_HILOGE("PerUserSession::BindInputAbility"); + IMSA_HILOGE("PerUserSession::StartInputService"); + sptr ams = GetAbilityManagerService(); + if (ams == nullptr) { + return false; + } AAFwk::Want want; want.SetAction("action.system.inputmethod"); - want.SetElementName("com.example.kikakeyboard", "com.example.kikakeyboard.MainAbility"); - sptr stub(new (std::nothrow) InputMethodAbilityConnectionStub(0)); - sptr connCallback = new (std::nothrow) AAFwk::AbilityConnectionProxy(stub); - std::shared_ptr setting = AAFwk::AbilityStartSetting::GetEmptySetting(); - setting->AddProperty(AAFwk::AbilityStartSetting::WINDOW_MODE_KEY, - std::to_string(AAFwk::AbilityWindowConfiguration::MULTI_WINDOW_DISPLAY_FLOATING)); - GetAbilityManagerService()->StartAbility(want, *setting, nullptr, -1); + want.SetElementName("com.example.kikakeyboard", "com.example.kikakeyboard.ServiceExtAbility"); + int32_t result = ams->StartAbility(want); + if(result != 0){ + IMSA_HILOGE("PerUserSession::StartInputService fail. result = %{public}d",result); + return false; + } + return true; } sptr PerUserSession::GetAbilityManagerService() @@ -1237,9 +1243,7 @@ namespace MiscServices { int index = GetImeIndex(client); IMSA_HILOGI("PerUserSession::OnPrepareInput index = %{public}d", index); currentIndex = index; - IMSA_HILOGI("PerUserSession::OnPrepareInput BindInputAbility start"); - BindInputAbility(); - IMSA_HILOGI("PerUserSession::OnPrepareInput BindInputAbility end"); + ShowKeyboard(client); currentClient = client; } @@ -1307,15 +1311,6 @@ namespace MiscServices { } else { IMSA_HILOGI("PerUserSession::onSetInputMethodCore End...[%{public}d]\n", userId_); } - if (currentClient != nullptr) { - usleep(SLEEP_TIME); - ret = ShowKeyboard(currentClient); - if (ret != ErrorCode::NO_ERROR) { - IMSA_HILOGE("PerUserSession::OnStartInput Aborted! %{public}s", ErrorCode::ToString(ret)); - } else { - IMSA_HILOGI("PerUserSession::OnStartInput End...[%{public}d]\n", userId_); - } - } IMSA_HILOGI("PerUserSession::OnStartInput End. currentClient is nullptr"); } -- Gitee