diff --git a/common/include/dscreen_ipc_interface_code.h b/common/include/dscreen_ipc_interface_code.h index d7d3901b1adbafc744095dd6b97dc22af3639195..cb2f2496fd7f541608f669c927d5be3e0f9baaf7 100644 --- a/common/include/dscreen_ipc_interface_code.h +++ b/common/include/dscreen_ipc_interface_code.h @@ -38,12 +38,6 @@ enum class IDScreenSinkInterfaceCode : uint32_t { UNSUBSCRIBE_DISTRIBUTED_HARDWARE = 3, DSCREEN_NOTIFY = 4, }; - -/* SAID: 4807*/ -enum class IDScreenSourceCBInterfaceCode : uint32_t { - NOTIFY_REG_RESULT = 0, - NOTIFY_UNREG_RESULT = 1, -}; } // namespace DistributedHardware } // namespace OHOS #endif \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/screen_sink/include/idscreen_sink.h b/interfaces/innerkits/native_cpp/screen_sink/include/idscreen_sink.h index 67f398b575fa657af862f090e784ed434e21e8e9..3de478bf74398c65630543345dee64cf2fc13282 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/include/idscreen_sink.h +++ b/interfaces/innerkits/native_cpp/screen_sink/include/idscreen_sink.h @@ -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 @@ -23,13 +23,6 @@ namespace DistributedHardware { class IDScreenSink : public OHOS::IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.distributedhardware.distributedscreensink"); - enum { - INIT_SINK = 0, - RELEASE_SINK = 1, - SUBSCRIBE_DISTRIBUTED_HARDWARE = 2, - UNSUBSCRIBE_DISTRIBUTED_HARDWARE = 3, - DSCREEN_NOTIFY = 4, - }; IDScreenSink() = default; ~IDScreenSink() override = default; diff --git a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp index c9e8e580e51a1b0a99e4cb46446cdc2a12a4659e..43e48c3bcee13982db2f3a021494155d8930a1d8 100644 --- a/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_sink/src/dscreen_sink_proxy.cpp @@ -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 @@ -21,6 +21,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" +#include "dscreen_ipc_interface_code.h" #include "dscreen_log.h" #include "dscreen_util.h" @@ -50,7 +51,7 @@ int32_t DScreenSinkProxy::InitSink(const std::string ¶ms) return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } - remote->SendRequest(INIT_SINK, data, reply, option); + remote->SendRequest(static_cast(IDScreenSinkInterfaceCode::INIT_SINK), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -70,7 +71,7 @@ int32_t DScreenSinkProxy::ReleaseSink() return ERR_DH_SCREEN_SA_WRITEINTERFACETOKEN_FAILED; } - remote->SendRequest(RELEASE_SINK, data, reply, option); + remote->SendRequest(static_cast(IDScreenSinkInterfaceCode::RELEASE_SINK), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -99,7 +100,8 @@ int32_t DScreenSinkProxy::SubscribeLocalHardware(const std::string &dhId, const return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } - remote->SendRequest(SUBSCRIBE_DISTRIBUTED_HARDWARE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSinkInterfaceCode::SUBSCRIBE_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -128,7 +130,8 @@ int32_t DScreenSinkProxy::UnsubscribeLocalHardware(const std::string &dhId) return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } - remote->SendRequest(UNSUBSCRIBE_DISTRIBUTED_HARDWARE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSinkInterfaceCode::UNSUBSCRIBE_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -158,7 +161,7 @@ void DScreenSinkProxy::DScreenNotify(const std::string &devId, int32_t eventCode return; } - remote->SendRequest(DSCREEN_NOTIFY, data, reply, option); + remote->SendRequest(static_cast(IDScreenSinkInterfaceCode::DSCREEN_NOTIFY), data, reply, option); } } // namespace DistributedHardware } // namespace OHOS \ No newline at end of file diff --git a/interfaces/innerkits/native_cpp/screen_source/include/idscreen_source.h b/interfaces/innerkits/native_cpp/screen_source/include/idscreen_source.h index d5c5b117768047ad0a59840898b50605f3abe43f..79889069c50d2ab6166f66dc849d47d0919b5834 100644 --- a/interfaces/innerkits/native_cpp/screen_source/include/idscreen_source.h +++ b/interfaces/innerkits/native_cpp/screen_source/include/idscreen_source.h @@ -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 @@ -25,14 +25,6 @@ namespace DistributedHardware { class IDScreenSource : public OHOS::IRemoteBroker { public: DECLARE_INTERFACE_DESCRIPTOR(u"ohos.distributedhardware.distributedscreensource"); - enum { - INIT_SOURCE = 0, - RELEASE_SOURCE, - REGISTER_DISTRIBUTED_HARDWARE, - UNREGISTER_DISTRIBUTED_HARDWARE, - CONFIG_DISTRIBUTED_HARDWARE, - DSCREEN_NOTIFY, - }; ~IDScreenSource() override {} virtual int32_t InitSource(const std::string ¶ms, const sptr &callback) = 0; diff --git a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp index 26c8e97b81aa96df619cc1b1f3f1d8b4da84df0c..127910f94fefc1da8b01686198cd436fcd1eeadd 100644 --- a/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp +++ b/interfaces/innerkits/native_cpp/screen_source/src/dscreen_source_proxy.cpp @@ -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 @@ -15,6 +15,7 @@ #include "dscreen_source_proxy.h" +#include "dscreen_ipc_interface_code.h" #include "idscreen_source_callback.h" #include "iremote_object.h" #include "message_option.h" @@ -52,7 +53,7 @@ int32_t DScreenSourceProxy::InitSource(const std::string ¶ms, const sptrSendRequest(INIT_SOURCE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSourceInterfaceCode::INIT_SOURCE), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -73,7 +74,7 @@ int32_t DScreenSourceProxy::ReleaseSource() return ERR_DH_SCREEN_SA_WRITEINTERFACETOKEN_FAILED; } - remote->SendRequest(RELEASE_SOURCE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSourceInterfaceCode::RELEASE_SOURCE), data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -104,7 +105,8 @@ int32_t DScreenSourceProxy::RegisterDistributedHardware(const std::string &devId DHLOGE("Write param failed."); return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } - remote->SendRequest(REGISTER_DISTRIBUTED_HARDWARE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSourceInterfaceCode::REGISTER_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -134,7 +136,8 @@ int32_t DScreenSourceProxy::UnregisterDistributedHardware(const std::string &dev DHLOGE("Write param failed."); return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } - remote->SendRequest(UNREGISTER_DISTRIBUTED_HARDWARE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSourceInterfaceCode::UNREGISTER_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -164,7 +167,8 @@ int32_t DScreenSourceProxy::ConfigDistributedHardware(const std::string &devId, DHLOGE("Write param failed."); return ERR_DH_SCREEN_SA_WRITEPARAM_FAILED; } - remote->SendRequest(CONFIG_DISTRIBUTED_HARDWARE, data, reply, option); + remote->SendRequest(static_cast(IDScreenSourceInterfaceCode::CONFIG_DISTRIBUTED_HARDWARE), + data, reply, option); int32_t ret = reply.ReadInt32(); return ret; } @@ -195,7 +199,8 @@ void DScreenSourceProxy::DScreenNotify(const std::string &devId, int32_t eventCo return; } - remote->SendRequest(DSCREEN_NOTIFY, data, reply, option); + remote->SendRequest(static_cast(IDScreenSourceInterfaceCode::DSCREEN_NOTIFY), + data, reply, option); } bool DScreenSourceProxy::CheckRegParams(const std::string &devId, const std::string &dhId, diff --git a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp index bd46251192b9b669e6194398cf9b5112fd1c25de..fe309f317e285077e882d181103e8cc9074377b8 100644 --- a/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp +++ b/services/screenservice/sinkservice/dscreenservice/src/dscreen_sink_stub.cpp @@ -17,17 +17,23 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" +#include "dscreen_ipc_interface_code.h" #include "dscreen_log.h" namespace OHOS { namespace DistributedHardware { DScreenSinkStub::DScreenSinkStub() { - memberFuncMap_[INIT_SINK] = &DScreenSinkStub::InitSinkInner; - memberFuncMap_[RELEASE_SINK] = &DScreenSinkStub::ReleaseSinkInner; - memberFuncMap_[SUBSCRIBE_DISTRIBUTED_HARDWARE] = &DScreenSinkStub::SubscribeDistributedHardwareInner; - memberFuncMap_[UNSUBSCRIBE_DISTRIBUTED_HARDWARE] = &DScreenSinkStub::UnsubscribeDistributedHardwareInner; - memberFuncMap_[DSCREEN_NOTIFY] = &DScreenSinkStub::DScreenNotifyInner; + memberFuncMap_[static_cast(IDScreenSinkInterfaceCode::INIT_SINK)] = + &DScreenSinkStub::InitSinkInner; + memberFuncMap_[static_cast(IDScreenSinkInterfaceCode::RELEASE_SINK)] = + &DScreenSinkStub::ReleaseSinkInner; + memberFuncMap_[static_cast(IDScreenSinkInterfaceCode::SUBSCRIBE_DISTRIBUTED_HARDWARE)] = + &DScreenSinkStub::SubscribeDistributedHardwareInner; + memberFuncMap_[static_cast(IDScreenSinkInterfaceCode::UNSUBSCRIBE_DISTRIBUTED_HARDWARE)] = + &DScreenSinkStub::UnsubscribeDistributedHardwareInner; + memberFuncMap_[static_cast(IDScreenSinkInterfaceCode::DSCREEN_NOTIFY)] = + &DScreenSinkStub::DScreenNotifyInner; } int32_t DScreenSinkStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply, diff --git a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp index 2edc419678f913c076ea3df1e2ffb0014afdfbd0..140a13a3f6a9e30216c2ff32aa635770086fcdfa 100644 --- a/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp +++ b/services/screenservice/sourceservice/dscreenservice/src/dscreen_source_stub.cpp @@ -19,6 +19,7 @@ #include "dscreen_constants.h" #include "dscreen_errcode.h" +#include "dscreen_ipc_interface_code.h" #include "dscreen_log.h" #include "dscreen_source_callback_proxy.h" @@ -26,12 +27,18 @@ namespace OHOS { namespace DistributedHardware { DScreenSourceStub::DScreenSourceStub() { - memberFuncMap_[INIT_SOURCE] = &DScreenSourceStub::InitSourceInner; - memberFuncMap_[RELEASE_SOURCE] = &DScreenSourceStub::ReleaseSourceInner; - memberFuncMap_[REGISTER_DISTRIBUTED_HARDWARE] = &DScreenSourceStub::RegisterDistributedHardwareInner; - memberFuncMap_[UNREGISTER_DISTRIBUTED_HARDWARE] = &DScreenSourceStub::UnregisterDistributedHardwareInner; - memberFuncMap_[CONFIG_DISTRIBUTED_HARDWARE] = &DScreenSourceStub::ConfigDistributedHardwareInner; - memberFuncMap_[DSCREEN_NOTIFY] = &DScreenSourceStub::DScreenNotifyInner; + memberFuncMap_[static_cast(IDScreenSourceInterfaceCode::INIT_SOURCE)] = + &DScreenSourceStub::InitSourceInner; + memberFuncMap_[static_cast(IDScreenSourceInterfaceCode::RELEASE_SOURCE)] = + &DScreenSourceStub::ReleaseSourceInner; + memberFuncMap_[static_cast(IDScreenSourceInterfaceCode::REGISTER_DISTRIBUTED_HARDWARE)] = + &DScreenSourceStub::RegisterDistributedHardwareInner; + memberFuncMap_[static_cast(IDScreenSourceInterfaceCode::UNREGISTER_DISTRIBUTED_HARDWARE)] = + &DScreenSourceStub::UnregisterDistributedHardwareInner; + memberFuncMap_[static_cast(IDScreenSourceInterfaceCode::CONFIG_DISTRIBUTED_HARDWARE)] = + &DScreenSourceStub::ConfigDistributedHardwareInner; + memberFuncMap_[static_cast(IDScreenSourceInterfaceCode::DSCREEN_NOTIFY)] = + &DScreenSourceStub::DScreenNotifyInner; } int32_t DScreenSourceStub::OnRemoteRequest(uint32_t code, MessageParcel &data, MessageParcel &reply,