From 0c6025c3907118e1c7209179c00ba6fa562102fa Mon Sep 17 00:00:00 2001 From: MoeLight Date: Thu, 4 Sep 2025 10:44:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:IPC=E8=BE=93=E5=85=A5=E6=B3=95=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E6=97=A5=E5=BF=97=E6=9C=AA=E6=89=93=E5=8D=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=A0=81=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: MoeLight --- .../src/zidl/session_stage_proxy.cpp | 23 +++--- .../session/host/src/zidl/session_proxy.cpp | 79 ++++++++++++------- .../zidl/scene_session_manager_lite_proxy.cpp | 8 +- .../src/zidl/scene_session_manager_proxy.cpp | 32 +++++--- wm/src/zidl/window_manager_agent_proxy.cpp | 8 +- 5 files changed, 93 insertions(+), 57 deletions(-) diff --git a/window_scene/session/container/src/zidl/session_stage_proxy.cpp b/window_scene/session/container/src/zidl/session_stage_proxy.cpp index 05c8b318be..08b2bdb56a 100644 --- a/window_scene/session/container/src/zidl/session_stage_proxy.cpp +++ b/window_scene/session/container/src/zidl/session_stage_proxy.cpp @@ -1501,9 +1501,12 @@ void SessionStageProxy::NotifyKeyboardPanelInfoChange(const KeyboardPanelInfo& k TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return; } - if (remote->SendRequest(static_cast(SessionStageInterfaceCode::TRANS_ID_NOTIFY_KEYBOARD_INFO_CHANGE), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest notify keyboard panel info change failed"); + int sendCode = remote->SendRequest( + static_cast(SessionStageInterfaceCode::TRANS_ID_NOTIFY_KEYBOARD_INFO_CHANGE), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, + "SendRequest notify keyboard panel info change failed, code: %{public}d", sendCode); return; } } @@ -1967,10 +1970,11 @@ void SessionStageProxy::NotifyKeyboardAnimationCompleted(const KeyboardPanelInfo TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return; } - if (remote->SendRequest( + int sendCode = remote->SendRequest( static_cast(SessionStageInterfaceCode::TRANS_ID_NOTIFY_KEYBOARD_ANIMATION_COMPLETED), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); } } @@ -2112,10 +2116,11 @@ void SessionStageProxy::NotifyKeyboardAnimationWillBegin(const KeyboardAnimation TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return; } - if (remote->SendRequest( + int sendCode = remote->SendRequest( static_cast(SessionStageInterfaceCode::TRANS_ID_NOTIFY_KEYBOARD_ANIMATION_WILLBEGIN), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); } } diff --git a/window_scene/session/host/src/zidl/session_proxy.cpp b/window_scene/session/host/src/zidl/session_proxy.cpp index 00d3dd6a18..6f3430cef9 100644 --- a/window_scene/session/host/src/zidl/session_proxy.cpp +++ b/window_scene/session/host/src/zidl/session_proxy.cpp @@ -964,9 +964,11 @@ WMError SessionProxy::OnUpdateColorMode(const std::string& colorMode, bool hasDa TLOGE(WmsLogTag::WMS_ATTRIBUTE, "remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_UPDATE_COLOR_MODE), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_ATTRIBUTE, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_UPDATE_COLOR_MODE), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_ATTRIBUTE, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } return WMError::WM_OK; @@ -1262,9 +1264,11 @@ WMError SessionProxy::NotifySnapshotUpdate() TLOGE(WmsLogTag::WMS_PATTERN, "remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_NOTIFY_SNAPSHOT_UPDATE), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_PATTERN, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_NOTIFY_SNAPSHOT_UPDATE), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_PATTERN, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } return WMError::WM_OK; @@ -2363,9 +2367,11 @@ void SessionProxy::SetCallingSessionId(const uint32_t callingSessionId) TLOGE(WmsLogTag::DEFAULT, "remote is null"); return; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_SET_CALLING_SESSION_ID), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_SET_CALLING_SESSION_ID), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); return; } } @@ -2413,9 +2419,11 @@ WSError SessionProxy::AdjustKeyboardLayout(const KeyboardLayoutParams& params) TLOGE(WmsLogTag::DEFAULT, "remote is null"); return WSError::WS_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_ADJUST_KEYBOARD_LAYOUT), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_ADJUST_KEYBOARD_LAYOUT), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); return WSError::WS_ERROR_IPC_FAILED; } return static_cast(reply.ReadInt32()); @@ -2439,9 +2447,11 @@ WSError SessionProxy::ChangeKeyboardEffectOption(const KeyboardEffectOption& eff TLOGE(WmsLogTag::DEFAULT, "remote is null"); return WSError::WS_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_CHANGE_KEYBOARD_VIEW_MODE), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_CHANGE_KEYBOARD_VIEW_MODE), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); return WSError::WS_ERROR_IPC_FAILED; } return WSError::WS_OK; @@ -3308,10 +3318,11 @@ void SessionProxy::NotifyWindowAttachStateListenerRegistered(bool registered) TLOGE(WmsLogTag::WMS_MAIN, "remote is null"); return; } - if (remote->SendRequest( + int sendCode = remote->SendRequest( static_cast(SessionInterfaceCode::TRANS_ID_NOTIFY_WINDOW_ATTACH_STATE_LISTENER_REGISTERED), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_MAIN, "SendRequest failed"); + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_MAIN, "SendRequest failed, code: %{public}d", sendCode); } } @@ -3333,9 +3344,11 @@ void SessionProxy::NotifyKeyboardWillShowRegistered(bool registered) TLOGE(WmsLogTag::WMS_KEYBOARD, "Remote is null"); return; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_WILL_SHOW_REGISTERED), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_WILL_SHOW_REGISTERED), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); } } @@ -3357,9 +3370,11 @@ void SessionProxy::NotifyKeyboardWillHideRegistered(bool registered) TLOGE(WmsLogTag::WMS_KEYBOARD, "Remote is null"); return; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_WILL_HIDE_REGISTERED), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_WILL_HIDE_REGISTERED), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); } } @@ -3381,9 +3396,11 @@ void SessionProxy::NotifyKeyboardDidShowRegistered(bool registered) TLOGE(WmsLogTag::WMS_KEYBOARD, "Remote is null"); return; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_DID_SHOW_REGISTERED), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_DID_SHOW_REGISTERED), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); } } @@ -3405,9 +3422,11 @@ void SessionProxy::NotifyKeyboardDidHideRegistered(bool registered) TLOGE(WmsLogTag::WMS_KEYBOARD, "Remote is null"); return; } - if (remote->SendRequest(static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_DID_HIDE_REGISTERED), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SessionInterfaceCode::TRANS_ID_SET_KEYBOARD_DID_HIDE_REGISTERED), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); } } diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp index f291e1e11e..2a7139fc5b 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_lite_proxy.cpp @@ -1205,9 +1205,11 @@ WMError SceneSessionManagerLiteProxy::GetCallingWindowInfo(CallingWindowInfo& ca TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SceneSessionManagerLiteMessage::TRANS_ID_GET_CALLING_WINDOW_INFO), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SceneSessionManagerLiteMessage::TRANS_ID_GET_CALLING_WINDOW_INFO), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } auto ret = static_cast(reply.ReadInt32()); diff --git a/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp b/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp index 9aa2f8e956..ff0e9f6d4d 100644 --- a/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp +++ b/window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp @@ -2743,9 +2743,11 @@ WMError SceneSessionManagerProxy::GetCallingWindowWindowStatus(int32_t persisten TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SceneSessionManagerMessage::TRANS_ID_GET_WINDOW_STATUS), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SceneSessionManagerMessage::TRANS_ID_GET_WINDOW_STATUS), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } auto ret = static_cast(reply.ReadInt32()); @@ -2773,9 +2775,11 @@ WMError SceneSessionManagerProxy::GetCallingWindowRect(int32_t persistentId, Rec TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SceneSessionManagerMessage::TRANS_ID_GET_WINDOW_RECT), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SceneSessionManagerMessage::TRANS_ID_GET_WINDOW_RECT), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } auto ret = static_cast(reply.ReadInt32()); @@ -3360,9 +3364,11 @@ WMError SceneSessionManagerProxy::SetImageForRecent(uint32_t imgResourceId, Imag TLOGE(WmsLogTag::WMS_PATTERN, "remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast(SceneSessionManagerMessage::TRANS_ID_SET_IMAGE_FOR_RECENT), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_PATTERN, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SceneSessionManagerMessage::TRANS_ID_SET_IMAGE_FOR_RECENT), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_PATTERN, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } uint32_t ret = 0; @@ -3619,9 +3625,11 @@ WMError SceneSessionManagerProxy::SetStartWindowBackgroundColor( TLOGE(WmsLogTag::WMS_PATTERN, "Remote is null"); return WMError::WM_ERROR_IPC_FAILED; } - if (remote->SendRequest(static_cast( - SceneSessionManagerMessage::TRANS_ID_SET_START_WINDOW_BACKGROUND_COLOR), data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_PATTERN, "SendRequest failed"); + int sendCode = remote->SendRequest( + static_cast(SceneSessionManagerMessage::TRANS_ID_SET_START_WINDOW_BACKGROUND_COLOR), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_PATTERN, "SendRequest failed, code: %{public}d", sendCode); return WMError::WM_ERROR_IPC_FAILED; } int32_t ret = 0; diff --git a/wm/src/zidl/window_manager_agent_proxy.cpp b/wm/src/zidl/window_manager_agent_proxy.cpp index c9ac93e71e..fd4c6dd700 100644 --- a/wm/src/zidl/window_manager_agent_proxy.cpp +++ b/wm/src/zidl/window_manager_agent_proxy.cpp @@ -445,9 +445,11 @@ void WindowManagerAgentProxy::NotifyCallingWindowDisplayChanged(const CallingWin TLOGE(WmsLogTag::WMS_KEYBOARD, "remote is null"); return; } - if (remote->SendRequest(static_cast(WindowManagerAgentMsg::TRANS_ID_NOTIFY_CALLING_DISPLAY_CHANGE), - data, reply, option) != ERR_NONE) { - TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest calling display info change failed"); + int sendCode = remote->SendRequest( + static_cast(WindowManagerAgentMsg::TRANS_ID_NOTIFY_CALLING_DISPLAY_CHANGE), + data, reply, option); + if (sendCode != ERR_NONE) { + TLOGE(WmsLogTag::WMS_KEYBOARD, "SendRequest calling display info change failed, code: %{public}d", sendCode); } } -- Gitee