openharmony/inputmethod_imf
1
0
Fork 0
mirror of https://gitee.com/openharmony/inputmethod_imf synced 2024-11-23 22:59:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

modfiy code

Browse Source 
Signed-off-by: zhaolinglan <zhaolinglan@huawei.com>
This commit is contained in:
zhaolinglan 2022-09-23 23:24:47 +08:00
parent c01c8827eb
commit d716920375
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frameworks/inputmethod_ability/src/input_method_ability.cpp
View File

@ -105,7 +105,6 @@ namespace MiscServices {
}
sptr<InputMethodCoreStub> stub = new InputMethodCoreStub(0);
stub->SetMessageHandler(msgHandler);
sptr<IInputMethodCore> stub2 = stub;
sptr<InputMethodAgentStub> inputMethodAgentStub(new InputMethodAgentStub());
inputMethodAgentStub->SetMessageHandler(msgHandler);
@ -113,7 +112,7 @@ namespace MiscServices {
MessageParcel data;
if (!(data.WriteInterfaceToken(mImms->GetDescriptor())
&& data.WriteRemoteObject(stub2->AsObject())
&& data.WriteRemoteObject(stub->AsObject())
&& data.WriteRemoteObject(inputMethodAgent->AsObject()))) {
return;
}
@ -554,7 +553,6 @@ namespace MiscServices {
}
sptr<InputMethodCoreStub> stub = new InputMethodCoreStub(0);
stub->SetMessageHandler(msgHandler);
sptr<IInputMethodCore> stub2 = stub;
sptr<InputMethodAgentStub> inputMethodAgentStub(new InputMethodAgentStub());
inputMethodAgentStub->SetMessageHandler(msgHandler);
@ -562,7 +560,7 @@ namespace MiscServices {
MessageParcel data;
if (!(data.WriteInterfaceToken(mImms->GetDescriptor())
&& data.WriteRemoteObject(stub2->AsObject())
&& data.WriteRemoteObject(stub->AsObject())
&& data.WriteRemoteObject(inputMethodAgent->AsObject()))) {
return;
}

38
frameworks/inputmethod_controller/src/input_method_controller.cpp
View File

@ -246,16 +246,16 @@ using namespace MessageID;
int32_t InputMethodController::HideCurrentInput()
{
IMSA_HILOGI("InputMethodController::HideCurrentInput");
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &service, MessageParcel &data) -> int32_t {
return service->HideCurrentInputDeprecated(data);
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &proxy, MessageParcel &data) -> int32_t {
return proxy->HideCurrentInputDeprecated(data);
});
}
int32_t InputMethodController::ShowCurrentInput()
{
IMSA_HILOGI("InputMethodController::ShowCurrentInput");
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &service, MessageParcel &data) -> int32_t {
return service->ShowCurrentInputDeprecated(data);
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &proxy, MessageParcel &data) -> int32_t {
return proxy->ShowCurrentInputDeprecated(data);
});
}
@ -288,8 +288,8 @@ using namespace MessageID;
int32_t InputMethodController::DisplayOptionalInputMethod()
{
IMSA_HILOGI("InputMethodController::DisplayOptionalInputMethod");
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &service, MessageParcel &data) -> int32_t {
return service->DisplayOptionalInputMethodDeprecated(data);
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &proxy, MessageParcel &data) -> int32_t {
return proxy->DisplayOptionalInputMethodDeprecated(data);
});
}
@ -555,24 +555,24 @@ using namespace MessageID;
int32_t InputMethodController::ShowSoftKeyboard()
{
IMSA_HILOGI("InputMethodController ShowSoftKeyboard");
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &service, MessageParcel &data) -> int32_t {
return service->ShowCurrentInput(data);
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &proxy, MessageParcel &data) -> int32_t {
return proxy->ShowCurrentInput(data);
});
}
int32_t InputMethodController::HideSoftKeyboard()
{
IMSA_HILOGI("InputMethodController HideSoftKeyboard");
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &service, MessageParcel &data) -> int32_t {
return service->HideCurrentInput(data);
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &proxy, MessageParcel &data) -> int32_t {
return proxy->HideCurrentInput(data);
});
}
int32_t InputMethodController::ShowOptionalInputMethod()
{
IMSA_HILOGI("InputMethodController::ShowOptionalInputMethod");
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &service, MessageParcel &data) -> int32_t {
return service->displayOptionalInputMethod(data);
return SendDataByProxy([](sptr<IInputMethodSystemAbility> &proxy, MessageParcel &data) -> int32_t {
return proxy->displayOptionalInputMethod(data);
});
}
@ -580,17 +580,17 @@ using namespace MessageID;
std::function<int32_t(sptr<IInputMethodSystemAbility> &, MessageParcel &)> callback)
{
IMSA_HILOGI("InputMethodController::SendDataToByProxy");
sptr<IInputMethodSystemAbility> service = mImms;
if (service == nullptr) {
IMSA_HILOGE("service is nullptr");
return ErrorCode::ERROR_STATUS_BAD_VALUE;
sptr<IInputMethodSystemAbility> proxy = mImms;
if (proxy == nullptr) {
IMSA_HILOGE("proxy is nullptr");
return ErrorCode::ERROR_NULL_POINTER;
}
MessageParcel data;
if (!(data.WriteInterfaceToken(mImms->GetDescriptor()))) {
if (!(data.WriteInterfaceToken(proxy->GetDescriptor()))) {
IMSA_HILOGE("write descriptor failed");
return ErrorCode::ERROR_STATUS_BAD_VALUE;
return ErrorCode::ERROR_STATUS_FAILED_TRANSACTION;
}
return callback(service, data);
return callback(proxy, data);
}
} // namespace MiscServices
} // namespace OHOS

2
frameworks/inputmethod_controller/src/input_method_system_ability_proxy.cpp
View File

@ -460,7 +460,7 @@ namespace MiscServices {
{
IMSA_HILOGI("InputMethodSystemAbilityProxy::SendRequestToService");
MessageParcel reply;
MessageOption option;
MessageOption option{ MessageOption::TF_SYNC };
auto ret = Remote()->SendRequest(code, data, reply, option);
if (ret != NO_ERROR) {
IMSA_HILOGE("SendRequest failed");