mirror of
https://github.com/openharmony/distributedhardware_distributed_input.git
synced 2026-07-20 21:41:02 -04:00
!20 OH系统服务接口管控需求,IPC Code统一整改
Merge pull request !20 from zhangchuang/master
This commit is contained in:
@@ -21,13 +21,30 @@
|
||||
namespace OHOS {
|
||||
namespace DistributedHardware {
|
||||
/* SAID: 4809 */
|
||||
enum class IAddWhiteListInfosCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IDelWhiteListInfosCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
enum class IDInputSourceInterfaceCode : uint32_t {
|
||||
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 */
|
||||
@@ -39,96 +56,6 @@ enum class IDInputSinkInterfaceCode : uint32_t {
|
||||
REGISTER_SHARING_DHID_LISTENER = 0xf015U,
|
||||
GET_SINK_SCREEN_INFOS = 0xf016U,
|
||||
};
|
||||
|
||||
/* 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,
|
||||
};
|
||||
|
||||
/* SAID: 4810 */
|
||||
enum class IGetSinkScreenInfosCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4810 */
|
||||
enum class InputNodeListenerInterfaceCode : uint32_t {
|
||||
RESULT_ON = 0,
|
||||
RESULT_OFF = 1
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IPrepareDInputCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IRegisterDInputCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class ISharingDhIdListenerInterfaceCode : uint32_t {
|
||||
SHARING = 0,
|
||||
NO_SHARING = 1
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class ISimulationEventListenerInterfaceCode : uint32_t {
|
||||
RESULT_ON = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IStartDInputCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IStartStopDInputsCBInterfaceCode : uint32_t {
|
||||
RESULT_STRING = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IStartStopResultCBInterfaceCode : uint32_t {
|
||||
RESULT_START = 0,
|
||||
RESULT_STOP = 1
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IStopDInputCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IUnprepareDInputCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
|
||||
/* SAID: 4809 */
|
||||
enum class IUnregisterDInputCBInterfaceCode : uint32_t {
|
||||
RESULT = 0
|
||||
};
|
||||
} // namespace DistributedHardware
|
||||
} // namespace OHOS
|
||||
#endif
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -53,15 +53,6 @@ public:
|
||||
virtual int32_t NotifyStopDScreen(const std::string &srcScreenInfoKey) = 0;
|
||||
|
||||
virtual int32_t RegisterSharingDhIdListener(sptr<ISharingDhIdListener> 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -98,32 +98,6 @@ public:
|
||||
const std::string &nodeDesc) = 0;
|
||||
virtual int32_t RegisterSimulationEventListener(sptr<ISimulationEventListener> listener) = 0;
|
||||
virtual int32_t UnregisterSimulationEventListener(sptr<ISimulationEventListener> 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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -85,7 +85,7 @@ public:
|
||||
int32_t UnregisterSimulationEventListener(sptr<ISimulationEventListener> 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<DistributedInputSourceProxy> delegator_;
|
||||
};
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -54,7 +54,7 @@ void AddWhiteListInfosCallbackProxy::OnResult(const std::string& deviceId, const
|
||||
DHLOGE("AddWhiteListInfosCallbackProxy write strJson failed");
|
||||
return;
|
||||
}
|
||||
remote->SendRequest(static_cast<int32_t>(IAddWhiteListInfosCallback::Message::RESULT), data, reply, option);
|
||||
remote->SendRequest(static_cast<uint32_t>(IAddWhiteListInfosCallback::Message::RESULT), data, reply, option);
|
||||
}
|
||||
} // namespace DistributedInput
|
||||
} // namespace DistributedHardware
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -50,7 +50,7 @@ void DelWhiteListInfosCallbackProxy::OnResult(const std::string& deviceId)
|
||||
DHLOGE("DelWhiteListInfosCallbackProxy write deviceId failed");
|
||||
return;
|
||||
}
|
||||
remote->SendRequest(static_cast<int32_t>(IDelWhiteListInfosCallback::Message::RESULT), data, reply, option);
|
||||
remote->SendRequest(static_cast<uint32_t>(IDelWhiteListInfosCallback::Message::RESULT), data, reply, option);
|
||||
}
|
||||
} // namespace DistributedInput
|
||||
} // namespace DistributedHardware
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -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<uint32_t>(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<uint32_t>(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<IGetS
|
||||
}
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SINK_PROXY_REGISTER_GETSINKSCREENINFOS_FAIL;
|
||||
bool ret = SendRequest(GET_SINK_SCREEN_INFOS, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(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<uint32_t>(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<uint32_t>(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<ISharingDhId
|
||||
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SINK_PROXY_REGISTER_SHARING_DHID_LISTENER_FAIL;
|
||||
bool ret = SendRequest(REGISTER_SHARING_DHID_LISTENER, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSinkInterfaceCode::REGISTER_SHARING_DHID_LISTENER),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
|
||||
@@ -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<uint32_t>(IDInputSinkInterfaceCode::INIT)] =
|
||||
&DistributedInputSinkStub::InitInner;
|
||||
memberFuncMap_[static_cast<uint32_t>(IDInputSinkInterfaceCode::RELEASE)] =
|
||||
&DistributedInputSinkStub::ReleaseInner;
|
||||
memberFuncMap_[static_cast<uint32_t>(IDInputSinkInterfaceCode::NOTIFY_START_DSCREEN)] =
|
||||
&DistributedInputSinkStub::NotifyStartDScreenInner;
|
||||
memberFuncMap_[static_cast<uint32_t>(IDInputSinkInterfaceCode::NOTIFY_STOP_DSCREEN)] =
|
||||
&DistributedInputSinkStub::NotifyStopDScreenInner;
|
||||
memberFuncMap_[static_cast<uint32_t>(IDInputSinkInterfaceCode::REGISTER_SHARING_DHID_LISTENER)] =
|
||||
&DistributedInputSinkStub::RegisterSharingDhIdListenerInner;
|
||||
memberFuncMap_[static_cast<uint32_t>(IDInputSinkInterfaceCode::GET_SINK_SCREEN_INFOS)] =
|
||||
&DistributedInputSinkStub::RegisterGetSinkScreenInfosInner;
|
||||
}
|
||||
|
||||
DistributedInputSinkStub::~DistributedInputSinkStub()
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -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<uint32_t>(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<uint32_t>(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<uint32_t>(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<uint32_t>(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<uint32_t>(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<uint32_t>(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<uint32_t>(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<uint32_t>(IDInputSourceInterfaceCode::STOP_REMOTE_INPUT), data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -262,7 +263,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_TYPE_REMOTE_INPUT, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::START_RELAY_TYPE_REMOTE_INPUT), data,
|
||||
reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -296,7 +298,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<uint32_t>(IDInputSourceInterfaceCode::STOP_RELAY_TYPE_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -326,7 +329,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<uint32_t>(IDInputSourceInterfaceCode::PREPARE_RELAY_REMOTE_INPUT), data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -356,7 +359,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<uint32_t>(IDInputSourceInterfaceCode::UNPREPARE_RELAY_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -394,7 +398,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<uint32_t>(IDInputSourceInterfaceCode::START_DHID_REMOTE_INPUT), data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -432,7 +436,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<uint32_t>(IDInputSourceInterfaceCode::STOP_DHID_REMOTE_INPUT), data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -474,7 +478,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<uint32_t>(IDInputSourceInterfaceCode::START_RELAY_DHID_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -516,7 +521,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<uint32_t>(IDInputSourceInterfaceCode::STOP_RELAY_DHID_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -541,7 +547,8 @@ int32_t DistributedInputSourceProxy::RegisterAddWhiteListCallback(sptr<IAddWhite
|
||||
}
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SOURCE_PROXY_REGISTER_WHITELIST_FAIL;
|
||||
bool ret = SendRequest(IDistributedSourceInput::MessageCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -565,7 +572,8 @@ int32_t DistributedInputSourceProxy::RegisterDelWhiteListCallback(sptr<IDelWhite
|
||||
}
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SOURCE_PROXY_REGISTER_WHITELIST_FAIL;
|
||||
bool ret = SendRequest(IDistributedSourceInput::MessageCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -586,7 +594,8 @@ int32_t DistributedInputSourceProxy::RegisterInputNodeListener(sptr<InputNodeLis
|
||||
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SOURCE_PROXY_REGISTER_NODE_LISTENER_FAIL;
|
||||
bool ret = SendRequest(IDistributedSourceInput::MessageCode::REGISTER_NODE_LISTENER, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_NODE_LISTENER),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -608,7 +617,8 @@ int32_t DistributedInputSourceProxy::UnregisterInputNodeListener(sptr<InputNodeL
|
||||
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SOURCE_PROXY_UNREGISTER_NODE_LISTENER_FAIL;
|
||||
bool ret = SendRequest(IDistributedSourceInput::MessageCode::UNREGISTER_NODE_LISTENER, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::UNREGISTER_NODE_LISTENER),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -637,7 +647,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<uint32_t>(IDInputSourceInterfaceCode::SYNC_NODE_INFO_REMOTE_INPUT),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -660,7 +671,8 @@ int32_t DistributedInputSourceProxy::RegisterSimulationEventListener(sptr<ISimul
|
||||
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SOURCE_PROXY_REGISTER_SIMULATION_LISTENER_FAIL;
|
||||
bool ret = SendRequest(IDistributedSourceInput::MessageCode::REGISTER_SIMULATION_EVENT_LISTENER, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_SIMULATION_EVENT_LISTENER),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
@@ -682,15 +694,15 @@ int32_t DistributedInputSourceProxy::UnregisterSimulationEventListener(sptr<ISim
|
||||
|
||||
MessageParcel reply;
|
||||
int32_t result = ERR_DH_INPUT_SOURCE_PROXY_UNREGISTER_SIMULATION_LISTENER_FAIL;
|
||||
bool ret = SendRequest(IDistributedSourceInput::MessageCode::UNREGISTER_SIMULATION_EVENT_LISTENER, data, reply);
|
||||
bool ret = SendRequest(static_cast<uint32_t>(IDInputSourceInterfaceCode::UNREGISTER_SIMULATION_EVENT_LISTENER),
|
||||
data, reply);
|
||||
if (ret) {
|
||||
result = reply.ReadInt32();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
bool DistributedInputSourceProxy::SendRequest(const IDistributedSourceInput::MessageCode code, MessageParcel &data,
|
||||
MessageParcel &reply)
|
||||
bool DistributedInputSourceProxy::SendRequest(const uint32_t code, MessageParcel &data, MessageParcel &reply)
|
||||
{
|
||||
sptr<IRemoteObject> remote = Remote();
|
||||
if (remote == nullptr) {
|
||||
|
||||
@@ -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<uint32_t>(IDistributedSourceInput::MessageCode::INIT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::INIT): {
|
||||
return HandleInitDistributedHardware(reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::RELEASE): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::RELEASE): {
|
||||
return HandleReleaseDistributedHardware(reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::REGISTER_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_REMOTE_INPUT): {
|
||||
return HandleRegisterDistributedHardware(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::UNREGISTER_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::UNREGISTER_REMOTE_INPUT): {
|
||||
return HandleUnregisterDistributedHardware(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::PREPARE_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::PREPARE_REMOTE_INPUT): {
|
||||
return HandlePrepareRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::UNPREPARE_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::UNPREPARE_REMOTE_INPUT): {
|
||||
return HandleUnprepareRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::START_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::START_REMOTE_INPUT): {
|
||||
return HandleStartRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::STOP_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::STOP_REMOTE_INPUT): {
|
||||
return HandleStopRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::START_RELAY_TYPE_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::START_RELAY_TYPE_REMOTE_INPUT): {
|
||||
return HandleStartRelayTypeRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::STOP_RELAY_TYPE_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::STOP_RELAY_TYPE_REMOTE_INPUT): {
|
||||
return HandleStopRelayTypeRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::PREPARE_RELAY_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::PREPARE_RELAY_REMOTE_INPUT): {
|
||||
return HandlePrepareRelayRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::UNPREPARE_RELAY_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::UNPREPARE_RELAY_REMOTE_INPUT): {
|
||||
return HandleUnprepareRelayRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::START_DHID_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::START_DHID_REMOTE_INPUT): {
|
||||
return HandleStartDhidRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::STOP_DHID_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::STOP_DHID_REMOTE_INPUT): {
|
||||
return HandleStopDhidRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::START_RELAY_DHID_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::START_RELAY_DHID_REMOTE_INPUT): {
|
||||
return HandleStartRelayDhidRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::STOP_RELAY_DHID_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::STOP_RELAY_DHID_REMOTE_INPUT): {
|
||||
return HandleStopRelayDhidRemoteInput(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_ADD_WHITE_LIST_CB_REMOTE_INPUT): {
|
||||
return HandleRegisterAddWhiteListCallback(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_DEL_WHITE_LIST_CB_REMOTE_INPUT): {
|
||||
return HandleRegisterDelWhiteListCallback(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::REGISTER_NODE_LISTENER): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_NODE_LISTENER): {
|
||||
return HandleRegisterInputNodeListener(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::UNREGISTER_NODE_LISTENER): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::UNREGISTER_NODE_LISTENER): {
|
||||
return HandleUnRegisterInputNodeListener(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::REGISTER_SIMULATION_EVENT_LISTENER): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::REGISTER_SIMULATION_EVENT_LISTENER): {
|
||||
return HandleRegisterSimulationEventListener(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::UNREGISTER_SIMULATION_EVENT_LISTENER): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::UNREGISTER_SIMULATION_EVENT_LISTENER): {
|
||||
return HandleUnregisterSimulationEventListener(data, reply);
|
||||
}
|
||||
case static_cast<uint32_t>(IDistributedSourceInput::MessageCode::SYNC_NODE_INFO_REMOTE_INPUT): {
|
||||
case static_cast<uint32_t>(IDInputSourceInterfaceCode::SYNC_NODE_INFO_REMOTE_INPUT): {
|
||||
return HandleSyncNodeInfoRemoteInput(data, reply);
|
||||
}
|
||||
default:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -50,7 +50,7 @@ void GetSinkScreenInfosCallbackProxy::OnResult(const std::string& strJson)
|
||||
DHLOGE("write strJson failed");
|
||||
return;
|
||||
}
|
||||
remote->SendRequest(static_cast<int32_t>(IGetSinkScreenInfosCallback::Message::RESULT), data, reply, option);
|
||||
remote->SendRequest(static_cast<uint32_t>(IGetSinkScreenInfosCallback::Message::RESULT), data, reply, option);
|
||||
}
|
||||
} // namespace DistributedInput
|
||||
} // namespace DistributedHardware
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -61,7 +61,8 @@ void InputNodeListenerProxy::OnNodeOnLine(const std::string srcDevId, const std:
|
||||
DHLOGE("InputNodeListenerProxy write sinkNodeDesc failed");
|
||||
return;
|
||||
}
|
||||
int32_t ret = remote->SendRequest(static_cast<int32_t>(InputNodeListener::Message::RESULT_ON), data, reply, option);
|
||||
int32_t ret = remote->SendRequest(static_cast<uint32_t>(InputNodeListener::Message::RESULT_ON), data, reply,
|
||||
option);
|
||||
if (ret != 0) {
|
||||
return;
|
||||
}
|
||||
@@ -94,8 +95,8 @@ void InputNodeListenerProxy::OnNodeOffLine(const std::string srcDevId, const std
|
||||
DHLOGE("InputNodeListenerProxy write sinkNodeId failed");
|
||||
return;
|
||||
}
|
||||
int32_t ret =
|
||||
remote->SendRequest(static_cast<int32_t>(InputNodeListener::Message::RESULT_OFF), data, reply, option);
|
||||
int32_t ret = remote->SendRequest(static_cast<uint32_t>(InputNodeListener::Message::RESULT_OFF), data, reply,
|
||||
option);
|
||||
if (ret != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -53,7 +53,7 @@ void PrepareDInputCallbackProxy::OnResult(const std::string& deviceId, const int
|
||||
return;
|
||||
}
|
||||
int32_t ret = remote->SendRequest(
|
||||
static_cast<int32_t>(IPrepareDInputCallback::Message::RESULT), data, reply, option);
|
||||
static_cast<uint32_t>(IPrepareDInputCallback::Message::RESULT), data, reply, option);
|
||||
if (ret != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -56,7 +56,7 @@ void RegisterDInputCallbackProxy::OnResult(const std::string& devId, const std::
|
||||
return;
|
||||
}
|
||||
int32_t ret = remote->SendRequest(
|
||||
static_cast<int32_t>(IRegisterDInputCallback::Message::RESULT), data, reply, option);
|
||||
static_cast<uint32_t>(IRegisterDInputCallback::Message::RESULT), data, reply, option);
|
||||
if (ret != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -53,7 +53,7 @@ int32_t SharingDhIdListenerProxy::OnSharing(std::string dhId)
|
||||
}
|
||||
|
||||
int32_t ret =
|
||||
remote->SendRequest(static_cast<int32_t>(ISharingDhIdListener::Message::SHARING), data, reply, option);
|
||||
remote->SendRequest(static_cast<uint32_t>(ISharingDhIdListener::Message::SHARING), data, reply, option);
|
||||
if (ret == DH_SUCCESS) {
|
||||
result = reply.ReadInt32();
|
||||
} else {
|
||||
@@ -84,7 +84,7 @@ int32_t SharingDhIdListenerProxy::OnNoSharing(std::string dhId)
|
||||
}
|
||||
|
||||
int32_t ret =
|
||||
remote->SendRequest(static_cast<int32_t>(ISharingDhIdListener::Message::NO_SHARING), data, reply, option);
|
||||
remote->SendRequest(static_cast<uint32_t>(ISharingDhIdListener::Message::NO_SHARING), data, reply, option);
|
||||
if (ret == DH_SUCCESS) {
|
||||
result = reply.ReadInt32();
|
||||
} else {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -60,7 +60,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<int32_t>(ISimulationEventListener::Message::RESULT_ON), data, reply, option);
|
||||
remote->SendRequest(static_cast<uint32_t>(ISimulationEventListener::Message::RESULT_ON), data, reply, option);
|
||||
if (ret == DH_SUCCESS) {
|
||||
result = reply.ReadInt32();
|
||||
} else {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -59,7 +59,7 @@ void StartDInputCallbackProxy::OnResult(const std::string& devId, const uint32_t
|
||||
return;
|
||||
}
|
||||
int32_t ret = remote->SendRequest(
|
||||
static_cast<int32_t>(IStartDInputCallback::Message::RESULT), data, reply, option);
|
||||
static_cast<uint32_t>(IStartDInputCallback::Message::RESULT), data, reply, option);
|
||||
if (ret != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -52,7 +52,7 @@ void StartStopDInputsCallbackProxy::OnResultDhids(const std::string &devId, cons
|
||||
DHLOGE("StartStopDInputsCallbackProxy write status valid failed");
|
||||
return;
|
||||
}
|
||||
int32_t ret = remote->SendRequest(static_cast<int32_t>(IStartStopDInputsCallback::Message::RESULT_STRING),
|
||||
int32_t ret = remote->SendRequest(static_cast<uint32_t>(IStartStopDInputsCallback::Message::RESULT_STRING),
|
||||
data, reply, option);
|
||||
if (ret != 0) {
|
||||
DHLOGE("OnResultDhids error, ret = %d", ret);
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2022-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -66,8 +66,8 @@ void StartStopResultCallbackProxy::OnStart(
|
||||
}
|
||||
}
|
||||
|
||||
int32_t ret =
|
||||
remote->SendRequest(static_cast<int32_t>(IStartStopResultCallback::Message::RESULT_START), data, reply, option);
|
||||
int32_t ret = remote->SendRequest(static_cast<uint32_t>(IStartStopResultCallback::Message::RESULT_START), data,
|
||||
reply, option);
|
||||
if (ret != 0) {
|
||||
DHLOGE("StartStopResultCallbackProxy SendRequest errno:%d", ret);
|
||||
return;
|
||||
@@ -111,8 +111,8 @@ void StartStopResultCallbackProxy::OnStop(
|
||||
}
|
||||
}
|
||||
|
||||
int32_t ret =
|
||||
remote->SendRequest(static_cast<int32_t>(IStartStopResultCallback::Message::RESULT_STOP), data, reply, option);
|
||||
int32_t ret = remote->SendRequest(static_cast<uint32_t>(IStartStopResultCallback::Message::RESULT_STOP), data,
|
||||
reply, option);
|
||||
if (ret != 0) {
|
||||
DHLOGE("StartStopResultCallbackProxy SendRequest errno:%d", ret);
|
||||
return;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2021-2022 Huawei Device Co., Ltd.
|
||||
* Copyright (c) 2021-2023 Huawei Device Co., Ltd.
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
@@ -59,7 +59,7 @@ void UnregisterDInputCallbackProxy::OnResult(const std::string& devId, const std
|
||||
return;
|
||||
}
|
||||
int32_t ret = remote->SendRequest(
|
||||
static_cast<int32_t>(IUnregisterDInputCallback::Message::RESULT), data, reply, option);
|
||||
static_cast<uint32_t>(IUnregisterDInputCallback::Message::RESULT), data, reply, option);
|
||||
if (ret != 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
+3
-2
@@ -17,6 +17,7 @@
|
||||
|
||||
#include <memory>
|
||||
#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<IRemoteObject> 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<uint32_t>(code), data, reply);
|
||||
EXPECT_EQ(false, ret);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user