Description: modify dinput PartI and PartII conflit

Match-id-95701c9f395e01f22f32df0471d2b2e76d2edc0f

frameworks/include/i_distributed_sink_input.h

@@ -23,7 +23,8 @@
 
 #include "constants_dinput.h"
 #include "dinput_context.h"
-#include "i_start_d_input_server_call_back.h"
+#include "i_distributed_sink_input.h"
+#include "i_sharing_dhid_listener.h"
 
 namespace OHOS {
 namespace DistributedHardware {
@@ -33,16 +34,13 @@ public:
     DECLARE_INTERFACE_DESCRIPTOR(u"ohos.DistributedHardware.DistributedInput.IDistributedSinkInput");
 
     /*
-     * Init, Release and IsStartDistributedInput are IPC interface,
+     * Init and Release are IPC interface,
      * which are used for interacting by dhareware and dinput
      */
     virtual int32_t Init() = 0;
 
     virtual int32_t Release() = 0;
 
-    virtual int32_t IsStartDistributedInput(
-        const uint32_t& inputType, sptr<IStartDInputServerCallback> callback) = 0;
-
     /*
      * NotifyStartDScreen and NotifyStopDScreen are RPC interface,
      * which are used for interacting by dinput source and dinput sink
@@ -51,12 +49,14 @@ public:
 
     virtual int32_t NotifyStopDScreen(const std::string &srcScreenInfoKey) = 0;
 
+    virtual int32_t RegisterSharingDhIdListener(sptr<ISharingDhIdListener> sharingDhIdListener) = 0;
+
     enum {
         INIT = 0xf011U,
         RELEASE = 0xf012U,
-        IS_START_REMOTE_INPUT = 0xf013U,
-        NOTIFY_START_DSCREEN = 0xf014U,
-        NOTIFY_STOP_DSCREEN = 0xf015U,
+        NOTIFY_START_DSCREEN = 0xf013U,
+        NOTIFY_STOP_DSCREEN = 0xf014U,
+        REGISTER_SHARING_DHID_LISTENER = 0xf015U,
     };
 };
 } // namespace DistributedInput

frameworks/include/i_distributed_source_input.h

@@ -28,7 +28,6 @@
 #include "i_prepare_d_input_call_back.h"
 #include "i_register_d_input_call_back.h"
 #include "i_start_d_input_call_back.h"
-#include "i_start_d_input_server_call_back.h"
 #include "i_stop_d_input_call_back.h"
 #include "i_start_stop_d_inputs_call_back.h"
 #include "i_start_stop_result_call_back.h"
@@ -90,9 +89,6 @@ public:
     virtual int32_t StopRemoteInput(const std::string &srcId, const std::string &sinkId,
         const std::vector<std::string> &dhIds, sptr<IStartStopDInputsCallback> callback) = 0;
 
-    virtual int32_t IsStartDistributedInput(
-        const uint32_t& inputType, sptr<IStartDInputServerCallback> callback) = 0;
-
     virtual int32_t RegisterAddWhiteListCallback(sptr<IAddWhiteListInfosCallback> addWhiteListCallback) = 0;
     virtual int32_t RegisterDelWhiteListCallback(sptr<IDelWhiteListInfosCallback> delWhiteListCallback) = 0;
     virtual int32_t RegisterInputNodeListener(sptr<InputNodeListener> listener) = 0;
@@ -112,7 +108,6 @@ public:
         UNPREPARE_REMOTE_INPUT = 0xf006,
         START_REMOTE_INPUT = 0xf007,
         STOP_REMOTE_INPUT = 0xf008,
-        ISSTART_REMOTE_INPUT = 0xf009,
         PREPARE_RELAY_REMOTE_INPUT = 0xf00a,
         UNPREPARE_RELAY_REMOTE_INPUT = 0xf00b,
         START_RELAY_TYPE_REMOTE_INPUT = 0xf00c,

frameworks/include/i_sharing_dhid_listener.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2022 Huawei Device Co., Ltd.
+ * Copyright (c) 2022 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
@@ -13,30 +13,30 @@
  * limitations under the License.
  */
 
-#ifndef I_START_D_INPUT_SERVER_CALL_BACK_H
-#define I_START_D_INPUT_SERVER_CALL_BACK_H
+#ifndef I_SHARING_DHID_LISTENER_H
+#define I_SHARING_DHID_LISTENER_H
 
 #include <string>
 
 #include <iremote_broker.h>
 
-#include "constants_dinput.h"
-
 namespace OHOS {
 namespace DistributedHardware {
 namespace DistributedInput {
-class IStartDInputServerCallback : public IRemoteBroker {
+class ISharingDhIdListener : public IRemoteBroker {
 public:
-    virtual void OnResult(const int32_t& status, const uint32_t& inputTypes) = 0;
+    virtual int32_t OnSharing(std::string dhId) = 0;
+    virtual int32_t OnNoSharing(std::string dhId) = 0;
 
     enum class Message {
-        RESULT,
+        SHARING,
+        NO_SHARING
     };
 
-    DECLARE_INTERFACE_DESCRIPTOR(u"ohos.DistributedHardware.DistributedInput.IStartDInputServerCallback");
+    DECLARE_INTERFACE_DESCRIPTOR(u"ohos.DistributedHardware.DistributedInput.ISharingDhIdListener");
 };
 } // namespace DistributedInput
 } // namespace DistributedHardware
 } // namespace OHOS
 
-#endif // I_START_D_INPUT_SERVER_CALL_BACK_H
+#endif // I_SHARING_DHID_LISTENER_H