diff --git a/common/include/dinput_ipc_interface_code.h b/common/include/dinput_ipc_interface_code.h index e503c2c..d3e1ba7 100644 --- a/common/include/dinput_ipc_interface_code.h +++ b/common/include/dinput_ipc_interface_code.h @@ -42,29 +42,29 @@ enum class IDInputSinkInterfaceCode : uint32_t { /* SAID: 4809 */ enum class IDInputSourceInterfaceCode : uint32_t { - INIT = 0xf001, - RELEASE = 0xf002, - REGISTER_REMOTE_INPUT = 0xf003, - UNREGISTER_REMOTE_INPUT = 0xf004, - PREPARE_REMOTE_INPUT = 0xf005, - UNPREPARE_REMOTE_INPUT = 0xf006, - START_REMOTE_INPUT = 0xf007, - STOP_REMOTE_INPUT = 0xf008, - PREPARE_RELAY_REMOTE_INPUT = 0xf00a, - UNPREPARE_RELAY_REMOTE_INPUT = 0xf00b, - START_RELAY_TYPE_REMOTE_INPUT = 0xf00c, - STOP_RELAY_TYPE_REMOTE_INPUT = 0xf00d, - START_DHID_REMOTE_INPUT = 0xf00e, - STOP_DHID_REMOTE_INPUT = 0xf00f, - START_RELAY_DHID_REMOTE_INPUT = 0xf010, - STOP_RELAY_DHID_REMOTE_INPUT = 0xf011, - REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT = 0xf013, - REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT = 0xf014, - REGISTER_NODE_LISTENER = 0xf015, - UNREGISTER_NODE_LISTENER = 0xf016, - REGISTER_SIMULATION_EVENT_LISTENER = 0xf017, - UNREGISTER_SIMULATION_EVENT_LISTENER = 0xf018, - SYNC_NODE_INFO_REMOTE_INPUT = 0xf019, + INIT = 0xf001U, + RELEASE = 0xf002U, + REGISTER_REMOTE_INPUT = 0xf003U, + UNREGISTER_REMOTE_INPUT = 0xf004U, + PREPARE_REMOTE_INPUT = 0xf005U, + UNPREPARE_REMOTE_INPUT = 0xf006U, + START_REMOTE_INPUT = 0xf007U, + STOP_REMOTE_INPUT = 0xf008U, + PREPARE_RELAY_REMOTE_INPUT = 0xf00aU, + UNPREPARE_RELAY_REMOTE_INPUT = 0xf00bU, + START_RELAY_TYPE_REMOTE_INPUT = 0xf00cU, + STOP_RELAY_TYPE_REMOTE_INPUT = 0xf00dU, + START_DHID_REMOTE_INPUT = 0xf00eU, + STOP_DHID_REMOTE_INPUT = 0xf00fU, + START_RELAY_DHID_REMOTE_INPUT = 0xf010U, + STOP_RELAY_DHID_REMOTE_INPUT = 0xf011U, + REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT = 0xf013U, + REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT = 0xf014U, + REGISTER_NODE_LISTENER = 0xf015U, + UNREGISTER_NODE_LISTENER = 0xf016U, + REGISTER_SIMULATION_EVENT_LISTENER = 0xf017U, + UNREGISTER_SIMULATION_EVENT_LISTENER = 0xf018U, + SYNC_NODE_INFO_REMOTE_INPUT = 0xf019U, }; /* SAID: 4810 */ diff --git a/frameworks/include/i_distributed_sink_input.h b/frameworks/include/i_distributed_sink_input.h index fbc8f03..26fdf33 100644 --- a/frameworks/include/i_distributed_sink_input.h +++ b/frameworks/include/i_distributed_sink_input.h @@ -53,15 +53,6 @@ public: virtual int32_t NotifyStopDScreen(const std::string &srcScreenInfoKey) = 0; virtual int32_t RegisterSharingDhIdListener(sptr sharingDhIdListener) = 0; - - enum { - INIT = 0xf011U, - RELEASE = 0xf012U, - NOTIFY_START_DSCREEN = 0xf013U, - NOTIFY_STOP_DSCREEN = 0xf014U, - REGISTER_SHARING_DHID_LISTENER = 0xf015U, - GET_SINK_SCREEN_INFOS = 0xf016U, - }; }; } // namespace DistributedInput } // namespace DistributedHardware diff --git a/frameworks/include/i_distributed_source_input.h b/frameworks/include/i_distributed_source_input.h index 7e6ea62..f46142c 100644 --- a/frameworks/include/i_distributed_source_input.h +++ b/frameworks/include/i_distributed_source_input.h @@ -98,32 +98,6 @@ public: const std::string &nodeDesc) = 0; virtual int32_t RegisterSimulationEventListener(sptr listener) = 0; virtual int32_t UnregisterSimulationEventListener(sptr listener) = 0; - - enum class MessageCode { - INIT = 0xf001, - RELEASE = 0xf002, - REGISTER_REMOTE_INPUT = 0xf003, - UNREGISTER_REMOTE_INPUT = 0xf004, - PREPARE_REMOTE_INPUT = 0xf005, - UNPREPARE_REMOTE_INPUT = 0xf006, - START_REMOTE_INPUT = 0xf007, - STOP_REMOTE_INPUT = 0xf008, - PREPARE_RELAY_REMOTE_INPUT = 0xf00a, - UNPREPARE_RELAY_REMOTE_INPUT = 0xf00b, - START_RELAY_TYPE_REMOTE_INPUT = 0xf00c, - STOP_RELAY_TYPE_REMOTE_INPUT = 0xf00d, - START_DHID_REMOTE_INPUT = 0xf00e, - STOP_DHID_REMOTE_INPUT = 0xf00f, - START_RELAY_DHID_REMOTE_INPUT = 0xf010, - STOP_RELAY_DHID_REMOTE_INPUT = 0xf011, - REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT = 0xf013, - REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT = 0xf014, - REGISTER_NODE_LISTENER = 0xf015, - UNREGISTER_NODE_LISTENER = 0xf016, - REGISTER_SIMULATION_EVENT_LISTENER = 0xf017, - UNREGISTER_SIMULATION_EVENT_LISTENER = 0xf018, - SYNC_NODE_INFO_REMOTE_INPUT = 0xf019, - }; }; } // namespace DistributedInput } // namespace DistributedHardware diff --git a/interfaces/ipc/include/distributed_input_source_proxy.h b/interfaces/ipc/include/distributed_input_source_proxy.h index 4855fe4..1da7c16 100644 --- a/interfaces/ipc/include/distributed_input_source_proxy.h +++ b/interfaces/ipc/include/distributed_input_source_proxy.h @@ -85,7 +85,7 @@ public: int32_t UnregisterSimulationEventListener(sptr listener) override; private: - bool SendRequest(const IDistributedSourceInput::MessageCode code, MessageParcel &data, MessageParcel &reply); + bool SendRequest(const uint32_t code, MessageParcel &data, MessageParcel &reply); static inline BrokerDelegator delegator_; }; diff --git a/interfaces/ipc/src/add_white_list_infos_call_back_proxy.cpp b/interfaces/ipc/src/add_white_list_infos_call_back_proxy.cpp index 759dea0..7625ee1 100644 --- a/interfaces/ipc/src/add_white_list_infos_call_back_proxy.cpp +++ b/interfaces/ipc/src/add_white_list_infos_call_back_proxy.cpp @@ -15,6 +15,7 @@ #include "add_white_list_infos_call_back_proxy.h" +#include "dinput_ipc_interface_code.h" #include "ipc_types.h" #include "parcel.h" @@ -54,7 +55,7 @@ void AddWhiteListInfosCallbackProxy::OnResult(const std::string& deviceId, const DHLOGE("AddWhiteListInfosCallbackProxy write strJson failed"); return; } - remote->SendRequest(static_cast(IAddWhiteListInfosCallback::Message::RESULT), data, reply, option); + remote->SendRequest(static_cast(IAddWhiteListInfosCBInterfaceCode::RESULT), data, reply, option); } } // namespace DistributedInput } // namespace DistributedHardware diff --git a/interfaces/ipc/src/add_white_list_infos_call_back_stub.cpp b/interfaces/ipc/src/add_white_list_infos_call_back_stub.cpp index 622f166..e08a316 100644 --- a/interfaces/ipc/src/add_white_list_infos_call_back_stub.cpp +++ b/interfaces/ipc/src/add_white_list_infos_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t AddWhiteListInfosCallbackStub::OnRemoteRequest( DHLOGE("AddWhiteListInfosCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IAddWhiteListInfosCallback::Message msgCode = static_cast(code); + IAddWhiteListInfosCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IAddWhiteListInfosCallback::Message::RESULT: { + case IAddWhiteListInfosCBInterfaceCode::RESULT: { std::string deviceId = data.ReadString(); std::string strJsion = data.ReadString(); OnResult(deviceId, strJsion); diff --git a/interfaces/ipc/src/del_white_list_infos_call_back_proxy.cpp b/interfaces/ipc/src/del_white_list_infos_call_back_proxy.cpp index ca978e5..08cd69b 100644 --- a/interfaces/ipc/src/del_white_list_infos_call_back_proxy.cpp +++ b/interfaces/ipc/src/del_white_list_infos_call_back_proxy.cpp @@ -15,6 +15,7 @@ #include "del_white_list_infos_call_back_proxy.h" +#include "dinput_ipc_interface_code.h" #include "ipc_types.h" #include "parcel.h" @@ -50,7 +51,7 @@ void DelWhiteListInfosCallbackProxy::OnResult(const std::string& deviceId) DHLOGE("DelWhiteListInfosCallbackProxy write deviceId failed"); return; } - remote->SendRequest(static_cast(IDelWhiteListInfosCallback::Message::RESULT), data, reply, option); + remote->SendRequest(static_cast(IDelWhiteListInfosCBInterfaceCode::RESULT), data, reply, option); } } // namespace DistributedInput } // namespace DistributedHardware diff --git a/interfaces/ipc/src/del_white_list_infos_call_back_stub.cpp b/interfaces/ipc/src/del_white_list_infos_call_back_stub.cpp index 0c2b6b5..fbaffaa 100644 --- a/interfaces/ipc/src/del_white_list_infos_call_back_stub.cpp +++ b/interfaces/ipc/src/del_white_list_infos_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t DelWhiteListInfosCallbackStub::OnRemoteRequest( DHLOGE("DelWhiteListInfosCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IDelWhiteListInfosCallback::Message msgCode = static_cast(code); + IDelWhiteListInfosCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IDelWhiteListInfosCallback::Message::RESULT: { + case IDelWhiteListInfosCBInterfaceCode::RESULT: { std::string deviceId = data.ReadString(); OnResult(deviceId); break; diff --git a/interfaces/ipc/src/distributed_input_sink_proxy.cpp b/interfaces/ipc/src/distributed_input_sink_proxy.cpp index 7a435b5..8b54876 100644 --- a/interfaces/ipc/src/distributed_input_sink_proxy.cpp +++ b/interfaces/ipc/src/distributed_input_sink_proxy.cpp @@ -18,6 +18,7 @@ #include "anonymous_string.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" #include "dinput_utils_tool.h" #include "i_get_sink_screen_infos_call_back.h" @@ -41,7 +42,7 @@ int32_t DistributedInputSinkProxy::Init() return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } int32_t result = ERR_DH_INPUT_SINK_PROXY_INIT_FAIL; - bool ret = SendRequest(INIT, data, reply); + bool ret = SendRequest(static_cast(IDInputSinkInterfaceCode::INIT), data, reply); if (!ret) { DHLOGE("SendRequest fail!"); return ERR_DH_INPUT_SINK_PROXY_INIT_FAIL; @@ -59,7 +60,7 @@ int32_t DistributedInputSinkProxy::Release() return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } int32_t result = ERR_DH_INPUT_SINK_PROXY_RELEASE_FAIL; - bool ret = SendRequest(RELEASE, data, reply); + bool ret = SendRequest(static_cast(IDInputSinkInterfaceCode::RELEASE), data, reply); if (!ret) { DHLOGE("SendRequest fail!"); return ERR_DH_INPUT_SINK_PROXY_RELEASE_FAIL; @@ -85,7 +86,7 @@ int32_t DistributedInputSinkProxy::RegisterGetSinkScreenInfosCallback(sptr(IDInputSinkInterfaceCode::GET_SINK_SCREEN_INFOS), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -114,7 +115,7 @@ int32_t DistributedInputSinkProxy::NotifyStartDScreen(const SrcScreenInfo &remot return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } int32_t result = ERR_DH_INPUT_NOTIFY_START_DSCREEN_FAIL; - bool ret = SendRequest(NOTIFY_START_DSCREEN, data, reply); + bool ret = SendRequest(static_cast(IDInputSinkInterfaceCode::NOTIFY_START_DSCREEN), data, reply); if (!ret) { DHLOGE("SendRequest fail!"); return ERR_DH_INPUT_NOTIFY_START_DSCREEN_FAIL; @@ -136,7 +137,7 @@ int32_t DistributedInputSinkProxy::NotifyStopDScreen(const std::string &srcScree return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } int32_t result = ERR_DH_INPUT_NOTIFY_STOP_DSCREEN_FAIL; - bool ret = SendRequest(NOTIFY_STOP_DSCREEN, data, reply); + bool ret = SendRequest(static_cast(IDInputSinkInterfaceCode::NOTIFY_STOP_DSCREEN), data, reply); if (!ret) { DHLOGE("SendRequest fail!"); return ERR_DH_INPUT_NOTIFY_STOP_DSCREEN_FAIL; @@ -159,7 +160,8 @@ int32_t DistributedInputSinkProxy::RegisterSharingDhIdListener(sptr(IDInputSinkInterfaceCode::REGISTER_SHARING_DHID_LISTENER), + data, reply); if (ret) { result = reply.ReadInt32(); } diff --git a/interfaces/ipc/src/distributed_input_sink_stub.cpp b/interfaces/ipc/src/distributed_input_sink_stub.cpp index 28ff506..7dfca96 100644 --- a/interfaces/ipc/src/distributed_input_sink_stub.cpp +++ b/interfaces/ipc/src/distributed_input_sink_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" #include "i_sharing_dhid_listener.h" @@ -28,12 +29,18 @@ namespace DistributedInput { DistributedInputSinkStub::DistributedInputSinkStub() { DHLOGI("DistributedInputSinkStub ctor!"); - memberFuncMap_[INIT] = &DistributedInputSinkStub::InitInner; - memberFuncMap_[RELEASE] = &DistributedInputSinkStub::ReleaseInner; - memberFuncMap_[NOTIFY_START_DSCREEN] = &DistributedInputSinkStub::NotifyStartDScreenInner; - memberFuncMap_[NOTIFY_STOP_DSCREEN] = &DistributedInputSinkStub::NotifyStopDScreenInner; - memberFuncMap_[REGISTER_SHARING_DHID_LISTENER] = &DistributedInputSinkStub::RegisterSharingDhIdListenerInner; - memberFuncMap_[GET_SINK_SCREEN_INFOS] = &DistributedInputSinkStub::RegisterGetSinkScreenInfosInner; + memberFuncMap_[static_cast(IDInputSinkInterfaceCode::INIT)] = + &DistributedInputSinkStub::InitInner; + memberFuncMap_[static_cast(IDInputSinkInterfaceCode::RELEASE)] = + &DistributedInputSinkStub::ReleaseInner; + memberFuncMap_[static_cast(IDInputSinkInterfaceCode::NOTIFY_START_DSCREEN)] = + &DistributedInputSinkStub::NotifyStartDScreenInner; + memberFuncMap_[static_cast(IDInputSinkInterfaceCode::NOTIFY_STOP_DSCREEN)] = + &DistributedInputSinkStub::NotifyStopDScreenInner; + memberFuncMap_[static_cast(IDInputSinkInterfaceCode::REGISTER_SHARING_DHID_LISTENER)] = + &DistributedInputSinkStub::RegisterSharingDhIdListenerInner; + memberFuncMap_[static_cast(IDInputSinkInterfaceCode::GET_SINK_SCREEN_INFOS)] = + &DistributedInputSinkStub::RegisterGetSinkScreenInfosInner; } DistributedInputSinkStub::~DistributedInputSinkStub() diff --git a/interfaces/ipc/src/distributed_input_source_proxy.cpp b/interfaces/ipc/src/distributed_input_source_proxy.cpp index 25e95b3..dd1c4c8 100644 --- a/interfaces/ipc/src/distributed_input_source_proxy.cpp +++ b/interfaces/ipc/src/distributed_input_source_proxy.cpp @@ -16,6 +16,7 @@ #include "distributed_input_source_proxy.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -37,7 +38,7 @@ int32_t DistributedInputSourceProxy::Init() return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } int32_t result = ERR_DH_INPUT_SOURCE_PROXY_INIT_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::INIT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::INIT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -53,7 +54,7 @@ int32_t DistributedInputSourceProxy::Release() DHLOGE("DistributedInputSourceProxy write token valid failed"); return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } - bool ret = SendRequest(IDistributedSourceInput::MessageCode::RELEASE, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::RELEASE), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -86,7 +87,7 @@ int32_t DistributedInputSourceProxy::RegisterDistributedHardware(const std::stri } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_REGISTER_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::REGISTER_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::REGISTER_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -115,7 +116,7 @@ int32_t DistributedInputSourceProxy::UnregisterDistributedHardware(const std::st } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_UNREGISTER_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::UNREGISTER_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::UNREGISTER_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -141,7 +142,7 @@ int32_t DistributedInputSourceProxy::PrepareRemoteInput( MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_PREPARE_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::PREPARE_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::PREPARE_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -167,7 +168,7 @@ int32_t DistributedInputSourceProxy::UnprepareRemoteInput(const std::string &dev } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_UNPREPARE_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::UNPREPARE_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::UNPREPARE_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -198,7 +199,7 @@ int32_t DistributedInputSourceProxy::StartRemoteInput( } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_START_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::START_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::START_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -228,7 +229,7 @@ int32_t DistributedInputSourceProxy::StopRemoteInput( } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_STOP_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::STOP_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::STOP_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -262,7 +263,7 @@ int32_t DistributedInputSourceProxy::StartRemoteInput(const std::string& srcId, } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_START_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::START_RELAY_TYPE_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::START_RELAY_TYPE_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -296,7 +297,8 @@ int32_t DistributedInputSourceProxy::StopRemoteInput(const std::string& srcId, c } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_STOP_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::STOP_RELAY_TYPE_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::STOP_RELAY_TYPE_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -326,7 +328,7 @@ int32_t DistributedInputSourceProxy::PrepareRemoteInput(const std::string &srcId MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_PREPARE_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::PREPARE_RELAY_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::PREPARE_RELAY_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -356,7 +358,8 @@ int32_t DistributedInputSourceProxy::UnprepareRemoteInput(const std::string &src } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_UNPREPARE_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::UNPREPARE_RELAY_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::UNPREPARE_RELAY_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -394,7 +397,7 @@ int32_t DistributedInputSourceProxy::StartRemoteInput(const std::string &sinkId, } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_START_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::START_DHID_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::START_DHID_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -432,7 +435,7 @@ int32_t DistributedInputSourceProxy::StopRemoteInput(const std::string &sinkId, } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_STOP_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::STOP_DHID_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::STOP_DHID_REMOTE_INPUT), data, reply); if (ret) { result = reply.ReadInt32(); } @@ -474,7 +477,8 @@ int32_t DistributedInputSourceProxy::StartRemoteInput(const std::string &srcId, } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_START_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::START_RELAY_DHID_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::START_RELAY_DHID_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -516,7 +520,8 @@ int32_t DistributedInputSourceProxy::StopRemoteInput(const std::string &srcId, c } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_STOP_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::STOP_RELAY_DHID_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::STOP_RELAY_DHID_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -541,7 +546,8 @@ int32_t DistributedInputSourceProxy::RegisterAddWhiteListCallback(sptr(IDInputSourceInterfaceCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -565,7 +571,8 @@ int32_t DistributedInputSourceProxy::RegisterDelWhiteListCallback(sptr(IDInputSourceInterfaceCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -586,7 +593,8 @@ int32_t DistributedInputSourceProxy::RegisterInputNodeListener(sptr(IDInputSourceInterfaceCode::REGISTER_NODE_LISTENER), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -608,7 +616,8 @@ int32_t DistributedInputSourceProxy::UnregisterInputNodeListener(sptr(IDInputSourceInterfaceCode::UNREGISTER_NODE_LISTENER), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -637,7 +646,8 @@ int32_t DistributedInputSourceProxy::SyncNodeInfoRemoteInput(const std::string & } MessageParcel reply; int32_t result = ERR_DH_INPUT_SOURCE_PROXY_SYNC_NODE_FAIL; - bool ret = SendRequest(IDistributedSourceInput::MessageCode::SYNC_NODE_INFO_REMOTE_INPUT, data, reply); + bool ret = SendRequest(static_cast(IDInputSourceInterfaceCode::SYNC_NODE_INFO_REMOTE_INPUT), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -660,7 +670,8 @@ int32_t DistributedInputSourceProxy::RegisterSimulationEventListener(sptr(IDInputSourceInterfaceCode::REGISTER_SIMULATION_EVENT_LISTENER), + data, reply); if (ret) { result = reply.ReadInt32(); } @@ -682,14 +693,15 @@ int32_t DistributedInputSourceProxy::UnregisterSimulationEventListener(sptr(IDInputSourceInterfaceCode::UNREGISTER_SIMULATION_EVENT_LISTENER), + data, reply); if (ret) { result = reply.ReadInt32(); } return result; } -bool DistributedInputSourceProxy::SendRequest(const IDistributedSourceInput::MessageCode code, MessageParcel &data, +bool DistributedInputSourceProxy::SendRequest(const uint32_t code, MessageParcel &data, MessageParcel &reply) { sptr remote = Remote(); diff --git a/interfaces/ipc/src/distributed_input_source_stub.cpp b/interfaces/ipc/src/distributed_input_source_stub.cpp index 16e2fda..1c7ec80 100644 --- a/interfaces/ipc/src/distributed_input_source_stub.cpp +++ b/interfaces/ipc/src/distributed_input_source_stub.cpp @@ -17,6 +17,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -393,73 +394,73 @@ int32_t DistributedInputSourceStub::OnRemoteRequest( return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } switch (code) { - case static_cast(IDistributedSourceInput::MessageCode::INIT): { + case static_cast(IDInputSourceInterfaceCode::INIT): { return HandleInitDistributedHardware(reply); } - case static_cast(IDistributedSourceInput::MessageCode::RELEASE): { + case static_cast(IDInputSourceInterfaceCode::RELEASE): { return HandleReleaseDistributedHardware(reply); } - case static_cast(IDistributedSourceInput::MessageCode::REGISTER_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::REGISTER_REMOTE_INPUT): { return HandleRegisterDistributedHardware(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::UNREGISTER_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::UNREGISTER_REMOTE_INPUT): { return HandleUnregisterDistributedHardware(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::PREPARE_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::PREPARE_REMOTE_INPUT): { return HandlePrepareRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::UNPREPARE_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::UNPREPARE_REMOTE_INPUT): { return HandleUnprepareRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::START_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::START_REMOTE_INPUT): { return HandleStartRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::STOP_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::STOP_REMOTE_INPUT): { return HandleStopRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::START_RELAY_TYPE_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::START_RELAY_TYPE_REMOTE_INPUT): { return HandleStartRelayTypeRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::STOP_RELAY_TYPE_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::STOP_RELAY_TYPE_REMOTE_INPUT): { return HandleStopRelayTypeRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::PREPARE_RELAY_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::PREPARE_RELAY_REMOTE_INPUT): { return HandlePrepareRelayRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::UNPREPARE_RELAY_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::UNPREPARE_RELAY_REMOTE_INPUT): { return HandleUnprepareRelayRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::START_DHID_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::START_DHID_REMOTE_INPUT): { return HandleStartDhidRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::STOP_DHID_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::STOP_DHID_REMOTE_INPUT): { return HandleStopDhidRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::START_RELAY_DHID_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::START_RELAY_DHID_REMOTE_INPUT): { return HandleStartRelayDhidRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::STOP_RELAY_DHID_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::STOP_RELAY_DHID_REMOTE_INPUT): { return HandleStopRelayDhidRemoteInput(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT): { return HandleRegisterAddWhiteListCallback(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT): { return HandleRegisterDelWhiteListCallback(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::REGISTER_NODE_LISTENER): { + case static_cast(IDInputSourceInterfaceCode::REGISTER_NODE_LISTENER): { return HandleRegisterInputNodeListener(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::UNREGISTER_NODE_LISTENER): { + case static_cast(IDInputSourceInterfaceCode::UNREGISTER_NODE_LISTENER): { return HandleUnRegisterInputNodeListener(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::REGISTER_SIMULATION_EVENT_LISTENER): { + case static_cast(IDInputSourceInterfaceCode::REGISTER_SIMULATION_EVENT_LISTENER): { return HandleRegisterSimulationEventListener(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::UNREGISTER_SIMULATION_EVENT_LISTENER): { + case static_cast(IDInputSourceInterfaceCode::UNREGISTER_SIMULATION_EVENT_LISTENER): { return HandleUnregisterSimulationEventListener(data, reply); } - case static_cast(IDistributedSourceInput::MessageCode::SYNC_NODE_INFO_REMOTE_INPUT): { + case static_cast(IDInputSourceInterfaceCode::SYNC_NODE_INFO_REMOTE_INPUT): { return HandleSyncNodeInfoRemoteInput(data, reply); } default: diff --git a/interfaces/ipc/src/get_sink_screen_infos_call_back_proxy.cpp b/interfaces/ipc/src/get_sink_screen_infos_call_back_proxy.cpp index c20011f..8170be6 100644 --- a/interfaces/ipc/src/get_sink_screen_infos_call_back_proxy.cpp +++ b/interfaces/ipc/src/get_sink_screen_infos_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -50,7 +51,7 @@ void GetSinkScreenInfosCallbackProxy::OnResult(const std::string& strJson) DHLOGE("write strJson failed"); return; } - remote->SendRequest(static_cast(IGetSinkScreenInfosCallback::Message::RESULT), data, reply, option); + remote->SendRequest(static_cast(IGetSinkScreenInfosCBInterfaceCode::RESULT), data, reply, option); } } // namespace DistributedInput } // namespace DistributedHardware diff --git a/interfaces/ipc/src/get_sink_screen_infos_call_back_stub.cpp b/interfaces/ipc/src/get_sink_screen_infos_call_back_stub.cpp index 7537ec5..4f6d4c6 100644 --- a/interfaces/ipc/src/get_sink_screen_infos_call_back_stub.cpp +++ b/interfaces/ipc/src/get_sink_screen_infos_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t GetSinkScreenInfosCallbackStub::OnRemoteRequest( DHLOGE("GetSinkScreenInfosCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IGetSinkScreenInfosCallback::Message msgCode = static_cast(code); + IGetSinkScreenInfosCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IGetSinkScreenInfosCallback::Message::RESULT: { + case IGetSinkScreenInfosCBInterfaceCode::RESULT: { std::string strJson = data.ReadString(); OnResult(strJson); break; diff --git a/interfaces/ipc/src/input_node_listener_proxy.cpp b/interfaces/ipc/src/input_node_listener_proxy.cpp index fe7c1ea..3a84bad 100644 --- a/interfaces/ipc/src/input_node_listener_proxy.cpp +++ b/interfaces/ipc/src/input_node_listener_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -61,7 +62,7 @@ void InputNodeListenerProxy::OnNodeOnLine(const std::string srcDevId, const std: DHLOGE("InputNodeListenerProxy write sinkNodeDesc failed"); return; } - int32_t ret = remote->SendRequest(static_cast(InputNodeListener::Message::RESULT_ON), data, reply, option); + int32_t ret = remote->SendRequest(static_cast(InputNodeListenerInterfaceCode::RESULT_ON), data, reply, option); if (ret != 0) { return; } @@ -95,7 +96,7 @@ void InputNodeListenerProxy::OnNodeOffLine(const std::string srcDevId, const std return; } int32_t ret = - remote->SendRequest(static_cast(InputNodeListener::Message::RESULT_OFF), data, reply, option); + remote->SendRequest(static_cast(InputNodeListenerInterfaceCode::RESULT_OFF), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/input_node_listener_stub.cpp b/interfaces/ipc/src/input_node_listener_stub.cpp index 348a42b..2f83668 100644 --- a/interfaces/ipc/src/input_node_listener_stub.cpp +++ b/interfaces/ipc/src/input_node_listener_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -35,9 +36,9 @@ int32_t InputNodeListenerStub::OnRemoteRequest( DHLOGE("InputNodeListenerStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - InputNodeListener::Message msgCode = static_cast(code); + InputNodeListenerInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case InputNodeListener::Message::RESULT_ON: { + case InputNodeListenerInterfaceCode::RESULT_ON: { std::string srcDevId = data.ReadString(); std::string sinkDevId = data.ReadString(); std::string sinkNodeId = data.ReadString(); @@ -45,7 +46,7 @@ int32_t InputNodeListenerStub::OnRemoteRequest( OnNodeOnLine(srcDevId, sinkDevId, sinkNodeId, sinkNodeDesc); break; } - case InputNodeListener::Message::RESULT_OFF: { + case InputNodeListenerInterfaceCode::RESULT_OFF: { std::string srcDevId = data.ReadString(); std::string sinkDevId = data.ReadString(); std::string sinkNodeId = data.ReadString(); diff --git a/interfaces/ipc/src/prepare_d_input_call_back_proxy.cpp b/interfaces/ipc/src/prepare_d_input_call_back_proxy.cpp index 18b4c28..0dce4d2 100644 --- a/interfaces/ipc/src/prepare_d_input_call_back_proxy.cpp +++ b/interfaces/ipc/src/prepare_d_input_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -53,7 +54,7 @@ void PrepareDInputCallbackProxy::OnResult(const std::string& deviceId, const int return; } int32_t ret = remote->SendRequest( - static_cast(IPrepareDInputCallback::Message::RESULT), data, reply, option); + static_cast(IPrepareDInputCBInterfaceCode::RESULT), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/prepare_d_input_call_back_stub.cpp b/interfaces/ipc/src/prepare_d_input_call_back_stub.cpp index 0796aa4..48b7f9c 100644 --- a/interfaces/ipc/src/prepare_d_input_call_back_stub.cpp +++ b/interfaces/ipc/src/prepare_d_input_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t PrepareDInputCallbackStub::OnRemoteRequest( DHLOGE("PrepareDInputCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IPrepareDInputCallback::Message msgCode = static_cast(code); + IPrepareDInputCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IPrepareDInputCallback::Message::RESULT: { + case IPrepareDInputCBInterfaceCode::RESULT: { std::string deviceId = data.ReadString(); int32_t status = data.ReadInt32(); OnResult(deviceId, status); diff --git a/interfaces/ipc/src/register_d_input_call_back_proxy.cpp b/interfaces/ipc/src/register_d_input_call_back_proxy.cpp index 58302e6..7713a85 100644 --- a/interfaces/ipc/src/register_d_input_call_back_proxy.cpp +++ b/interfaces/ipc/src/register_d_input_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -56,7 +57,7 @@ void RegisterDInputCallbackProxy::OnResult(const std::string& devId, const std:: return; } int32_t ret = remote->SendRequest( - static_cast(IRegisterDInputCallback::Message::RESULT), data, reply, option); + static_cast(IRegisterDInputCBInterfaceCode::RESULT), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/register_d_input_call_back_stub.cpp b/interfaces/ipc/src/register_d_input_call_back_stub.cpp index 935c6ca..d13404f 100644 --- a/interfaces/ipc/src/register_d_input_call_back_stub.cpp +++ b/interfaces/ipc/src/register_d_input_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t RegisterDInputCallbackStub::OnRemoteRequest( DHLOGE("RegisterDInputCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IRegisterDInputCallback::Message msgCode = static_cast(code); + IRegisterDInputCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IRegisterDInputCallback::Message::RESULT: { + case IRegisterDInputCBInterfaceCode::RESULT: { std::string devId = data.ReadString(); std::string dhId = data.ReadString(); int32_t status = data.ReadInt32(); diff --git a/interfaces/ipc/src/sharing_dhid_listener_proxy.cpp b/interfaces/ipc/src/sharing_dhid_listener_proxy.cpp index daabdf8..9af1fea 100644 --- a/interfaces/ipc/src/sharing_dhid_listener_proxy.cpp +++ b/interfaces/ipc/src/sharing_dhid_listener_proxy.cpp @@ -19,6 +19,7 @@ #include "parcel.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -53,7 +54,7 @@ int32_t SharingDhIdListenerProxy::OnSharing(std::string dhId) } int32_t ret = - remote->SendRequest(static_cast(ISharingDhIdListener::Message::SHARING), data, reply, option); + remote->SendRequest(static_cast(ISharingDhIdListenerInterfaceCode::SHARING), data, reply, option); if (ret == DH_SUCCESS) { result = reply.ReadInt32(); } else { @@ -84,7 +85,7 @@ int32_t SharingDhIdListenerProxy::OnNoSharing(std::string dhId) } int32_t ret = - remote->SendRequest(static_cast(ISharingDhIdListener::Message::NO_SHARING), data, reply, option); + remote->SendRequest(static_cast(ISharingDhIdListenerInterfaceCode::NO_SHARING), data, reply, option); if (ret == DH_SUCCESS) { result = reply.ReadInt32(); } else { diff --git a/interfaces/ipc/src/sharing_dhid_listener_stub.cpp b/interfaces/ipc/src/sharing_dhid_listener_stub.cpp index 4410adb..38fdd61 100644 --- a/interfaces/ipc/src/sharing_dhid_listener_stub.cpp +++ b/interfaces/ipc/src/sharing_dhid_listener_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -35,9 +36,9 @@ int32_t SharingDhIdListenerStub::OnRemoteRequest( DHLOGE("SharingDhIdListenerStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - ISharingDhIdListener::Message msgCode = static_cast(code); + ISharingDhIdListenerInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case ISharingDhIdListener::Message::SHARING: { + case ISharingDhIdListenerInterfaceCode::SHARING: { std::string dhId = data.ReadString(); int32_t ret = OnSharing(dhId); if (!reply.WriteInt32(ret)) { @@ -46,7 +47,7 @@ int32_t SharingDhIdListenerStub::OnRemoteRequest( } break; } - case ISharingDhIdListener::Message::NO_SHARING: { + case ISharingDhIdListenerInterfaceCode::NO_SHARING: { std::string dhId = data.ReadString(); int32_t ret = OnNoSharing(dhId); if (!reply.WriteInt32(ret)) { diff --git a/interfaces/ipc/src/simulation_event_listener_proxy.cpp b/interfaces/ipc/src/simulation_event_listener_proxy.cpp index 4412a77..eaa37a5 100644 --- a/interfaces/ipc/src/simulation_event_listener_proxy.cpp +++ b/interfaces/ipc/src/simulation_event_listener_proxy.cpp @@ -19,6 +19,7 @@ #include "parcel.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -60,7 +61,7 @@ int32_t SimulationEventListenerProxy::OnSimulationEvent(uint32_t type, uint32_t return ERR_DH_INPUT_IPC_WRITE_TOKEN_VALID_FAIL; } int32_t ret = - remote->SendRequest(static_cast(ISimulationEventListener::Message::RESULT_ON), data, reply, option); + remote->SendRequest(static_cast(ISimulationEventListenerInterfaceCode::RESULT_ON), data, reply, option); if (ret == DH_SUCCESS) { result = reply.ReadInt32(); } else { diff --git a/interfaces/ipc/src/simulation_event_listener_stub.cpp b/interfaces/ipc/src/simulation_event_listener_stub.cpp index 34b2b70..03733fb 100644 --- a/interfaces/ipc/src/simulation_event_listener_stub.cpp +++ b/interfaces/ipc/src/simulation_event_listener_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -35,9 +36,9 @@ int32_t SimulationEventListenerStub::OnRemoteRequest( DHLOGE("SimulationEventListenerStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - ISimulationEventListener::Message msgCode = static_cast(code); + ISimulationEventListenerInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case ISimulationEventListener::Message::RESULT_ON: { + case ISimulationEventListenerInterfaceCode::RESULT_ON: { uint32_t eventType = data.ReadUint32(); uint32_t eventCode = data.ReadUint32(); int32_t eventValue = data.ReadInt32(); diff --git a/interfaces/ipc/src/start_d_input_call_back_proxy.cpp b/interfaces/ipc/src/start_d_input_call_back_proxy.cpp index 1384901..3439dc1 100644 --- a/interfaces/ipc/src/start_d_input_call_back_proxy.cpp +++ b/interfaces/ipc/src/start_d_input_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -59,7 +60,7 @@ void StartDInputCallbackProxy::OnResult(const std::string& devId, const uint32_t return; } int32_t ret = remote->SendRequest( - static_cast(IStartDInputCallback::Message::RESULT), data, reply, option); + static_cast(IStartDInputCBInterfaceCode::RESULT), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/start_d_input_call_back_stub.cpp b/interfaces/ipc/src/start_d_input_call_back_stub.cpp index b9243b1..9b2ce69 100644 --- a/interfaces/ipc/src/start_d_input_call_back_stub.cpp +++ b/interfaces/ipc/src/start_d_input_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t StartDInputCallbackStub::OnRemoteRequest( DHLOGE("StartDInputCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IStartDInputCallback::Message msgCode = static_cast(code); + IStartDInputCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IStartDInputCallback::Message::RESULT: { + case IStartDInputCBInterfaceCode::RESULT: { std::string deviceId = data.ReadString(); uint32_t inputTypes = data.ReadUint32(); int32_t status = data.ReadInt32(); diff --git a/interfaces/ipc/src/start_stop_d_inputs_call_back_proxy.cpp b/interfaces/ipc/src/start_stop_d_inputs_call_back_proxy.cpp index d2a4087..7160db6 100644 --- a/interfaces/ipc/src/start_stop_d_inputs_call_back_proxy.cpp +++ b/interfaces/ipc/src/start_stop_d_inputs_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -52,7 +53,7 @@ void StartStopDInputsCallbackProxy::OnResultDhids(const std::string &devId, cons DHLOGE("StartStopDInputsCallbackProxy write status valid failed"); return; } - int32_t ret = remote->SendRequest(static_cast(IStartStopDInputsCallback::Message::RESULT_STRING), + int32_t ret = remote->SendRequest(static_cast(IStartStopDInputsCBInterfaceCode::RESULT_STRING), data, reply, option); if (ret != 0) { DHLOGE("OnResultDhids error, ret = %d", ret); diff --git a/interfaces/ipc/src/start_stop_d_inputs_call_back_stub.cpp b/interfaces/ipc/src/start_stop_d_inputs_call_back_stub.cpp index 748b7a6..d04a0de 100644 --- a/interfaces/ipc/src/start_stop_d_inputs_call_back_stub.cpp +++ b/interfaces/ipc/src/start_stop_d_inputs_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -35,9 +36,9 @@ int32_t StartStopDInputsCallbackStub::OnRemoteRequest( if (descriptor != IStartStopDInputsCallback::GetDescriptor()) { return ERR_DH_INPUT_IPC_INVALID_DESCRIPTOR; } - IStartStopDInputsCallback::Message msgCode = static_cast(code); + IStartStopDInputsCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IStartStopDInputsCallback::Message::RESULT_STRING: { + case IStartStopDInputsCBInterfaceCode::RESULT_STRING: { std::string devId = data.ReadString(); int32_t status = data.ReadInt32(); DHLOGW("OnResultDhids received."); diff --git a/interfaces/ipc/src/start_stop_result_call_back_proxy.cpp b/interfaces/ipc/src/start_stop_result_call_back_proxy.cpp index 8307480..97b08ee 100644 --- a/interfaces/ipc/src/start_stop_result_call_back_proxy.cpp +++ b/interfaces/ipc/src/start_stop_result_call_back_proxy.cpp @@ -17,6 +17,7 @@ #include "parcel.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" #include "start_stop_result_call_back_proxy.h" @@ -67,7 +68,7 @@ void StartStopResultCallbackProxy::OnStart( } int32_t ret = - remote->SendRequest(static_cast(IStartStopResultCallback::Message::RESULT_START), data, reply, option); + remote->SendRequest(static_cast(IStartStopResultCBInterfaceCode::RESULT_START), data, reply, option); if (ret != 0) { DHLOGE("StartStopResultCallbackProxy SendRequest errno:%d", ret); return; @@ -112,7 +113,7 @@ void StartStopResultCallbackProxy::OnStop( } int32_t ret = - remote->SendRequest(static_cast(IStartStopResultCallback::Message::RESULT_STOP), data, reply, option); + remote->SendRequest(static_cast(IStartStopResultCBInterfaceCode::RESULT_STOP), data, reply, option); if (ret != 0) { DHLOGE("StartStopResultCallbackProxy SendRequest errno:%d", ret); return; diff --git a/interfaces/ipc/src/start_stop_result_call_back_stub.cpp b/interfaces/ipc/src/start_stop_result_call_back_stub.cpp index 5c41b09..817369a 100644 --- a/interfaces/ipc/src/start_stop_result_call_back_stub.cpp +++ b/interfaces/ipc/src/start_stop_result_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -35,9 +36,9 @@ int32_t StartStopResultCallbackStub::OnRemoteRequest( if (descriptor != IStartStopResultCallback::GetDescriptor()) { return ERR_DH_INPUT_IPC_INVALID_DESCRIPTOR; } - IStartStopResultCallback::Message msgCode = static_cast(code); + IStartStopResultCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IStartStopResultCallback::Message::RESULT_START: { + case IStartStopResultCBInterfaceCode::RESULT_START: { std::string srcId = data.ReadString(); std::string sinkId = data.ReadString(); uint32_t size = data.ReadUint32(); @@ -54,7 +55,7 @@ int32_t StartStopResultCallbackStub::OnRemoteRequest( OnStart(srcId, sinkId, dhIds); break; } - case IStartStopResultCallback::Message::RESULT_STOP: { + case IStartStopResultCBInterfaceCode::RESULT_STOP: { std::string srcId = data.ReadString(); std::string sinkId = data.ReadString(); uint32_t size = data.ReadUint32(); diff --git a/interfaces/ipc/src/stop_d_input_call_back_proxy.cpp b/interfaces/ipc/src/stop_d_input_call_back_proxy.cpp index dd787fd..056340f 100644 --- a/interfaces/ipc/src/stop_d_input_call_back_proxy.cpp +++ b/interfaces/ipc/src/stop_d_input_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -59,7 +60,7 @@ void StopDInputCallbackProxy::OnResult(const std::string& devId, const uint32_t& return; } int32_t ret = remote->SendRequest( - static_cast(IStopDInputCallback::Message::RESULT), data, reply, option); + static_cast(IStopDInputCBInterfaceCode::RESULT), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/stop_d_input_call_back_stub.cpp b/interfaces/ipc/src/stop_d_input_call_back_stub.cpp index 64f8d5f..a08ffff 100644 --- a/interfaces/ipc/src/stop_d_input_call_back_stub.cpp +++ b/interfaces/ipc/src/stop_d_input_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t StopDInputCallbackStub::OnRemoteRequest( DHLOGE("StopDInputCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IStopDInputCallback::Message msgCode = static_cast(code); + IStopDInputCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IStopDInputCallback::Message::RESULT: { + case IStopDInputCBInterfaceCode::RESULT: { std::string deviceId = data.ReadString(); uint32_t inputTypes = data.ReadUint32(); int32_t status = data.ReadInt32(); diff --git a/interfaces/ipc/src/unprepare_d_input_call_back_proxy.cpp b/interfaces/ipc/src/unprepare_d_input_call_back_proxy.cpp index ede240e..48f04ea 100644 --- a/interfaces/ipc/src/unprepare_d_input_call_back_proxy.cpp +++ b/interfaces/ipc/src/unprepare_d_input_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -55,7 +56,7 @@ void UnprepareDInputCallbackProxy::OnResult(const std::string& deviceId, const i return; } int32_t ret = remote->SendRequest( - static_cast(IUnprepareDInputCallback::Message::RESULT), data, reply, option); + static_cast(IUnprepareDInputCBInterfaceCode::RESULT), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/unprepare_d_input_call_back_stub.cpp b/interfaces/ipc/src/unprepare_d_input_call_back_stub.cpp index f248c93..5e780a9 100644 --- a/interfaces/ipc/src/unprepare_d_input_call_back_stub.cpp +++ b/interfaces/ipc/src/unprepare_d_input_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t UnprepareDInputCallbackStub::OnRemoteRequest( DHLOGE("UnprepareDInputCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IUnprepareDInputCallback::Message msgCode = static_cast(code); + IUnprepareDInputCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IUnprepareDInputCallback::Message::RESULT: { + case IUnprepareDInputCBInterfaceCode::RESULT: { std::string deviceId = data.ReadString(); int32_t status = data.ReadInt32(); OnResult(deviceId, status); diff --git a/interfaces/ipc/src/unregister_d_input_call_back_proxy.cpp b/interfaces/ipc/src/unregister_d_input_call_back_proxy.cpp index 1648dfd..60b7f33 100644 --- a/interfaces/ipc/src/unregister_d_input_call_back_proxy.cpp +++ b/interfaces/ipc/src/unregister_d_input_call_back_proxy.cpp @@ -18,6 +18,7 @@ #include "ipc_types.h" #include "parcel.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -59,7 +60,7 @@ void UnregisterDInputCallbackProxy::OnResult(const std::string& devId, const std return; } int32_t ret = remote->SendRequest( - static_cast(IUnregisterDInputCallback::Message::RESULT), data, reply, option); + static_cast(IUnregisterDInputCBInterfaceCode::RESULT), data, reply, option); if (ret != 0) { return; } diff --git a/interfaces/ipc/src/unregister_d_input_call_back_stub.cpp b/interfaces/ipc/src/unregister_d_input_call_back_stub.cpp index 6270c3c..3af8622 100644 --- a/interfaces/ipc/src/unregister_d_input_call_back_stub.cpp +++ b/interfaces/ipc/src/unregister_d_input_call_back_stub.cpp @@ -19,6 +19,7 @@ #include "constants_dinput.h" #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" #include "dinput_log.h" namespace OHOS { @@ -39,9 +40,9 @@ int32_t UnregisterDInputCallbackStub::OnRemoteRequest( DHLOGE("UnregisterDInputCallbackStub read token valid failed"); return ERR_DH_INPUT_IPC_READ_TOKEN_VALID_FAIL; } - IUnregisterDInputCallback::Message msgCode = static_cast(code); + IUnregisterDInputCBInterfaceCode msgCode = static_cast(code); switch (msgCode) { - case IUnregisterDInputCallback::Message::RESULT: { + case IUnregisterDInputCBInterfaceCode::RESULT: { std::string devId = data.ReadString(); std::string dhId = data.ReadString(); int32_t status = data.ReadInt32(); diff --git a/interfaces/ipc/test/dinputsourcecallbackunittest/dinput_source_callback_unittest.cpp b/interfaces/ipc/test/dinputsourcecallbackunittest/dinput_source_callback_unittest.cpp index 836b349..160762e 100644 --- a/interfaces/ipc/test/dinputsourcecallbackunittest/dinput_source_callback_unittest.cpp +++ b/interfaces/ipc/test/dinputsourcecallbackunittest/dinput_source_callback_unittest.cpp @@ -17,6 +17,7 @@ #include #include "dinput_errcode.h" +#include "dinput_ipc_interface_code.h" namespace OHOS { namespace DistributedHardware { @@ -352,10 +353,10 @@ HWTEST_F(DInputSourceCallBackTest, SendRequest01, testing::ext::TestSize.Level1) { sptr callBackStubPtr = new TestDInputSourceCallBackStub(); DistributedInputSourceProxy callBackProxy(callBackStubPtr); - IDistributedSourceInput::MessageCode code = IDistributedSourceInput::MessageCode::INIT; + IDInputSourceInterfaceCode code = IDInputSourceInterfaceCode::INIT; MessageParcel data; MessageParcel reply; - bool ret = callBackProxy.SendRequest(code, data, reply); + bool ret = callBackProxy.SendRequest(static_cast(code), data, reply); EXPECT_EQ(false, ret); }