From 296e7209100153043a7166b167024b6daaa30687 Mon Sep 17 00:00:00 2001 From: yuanling Date: Wed, 26 Mar 2025 15:53:37 +0800 Subject: [PATCH 1/3] add DM_CAPABILITY_OH_APPROACH --- common/include/dm_constants.h | 1 + common/src/dm_constants.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index ecd06f4ab..cfe8afa2e 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -37,6 +37,7 @@ extern const char* DM_PIN_HOLDER_SESSION_NAME; extern const char* DM_SYNC_USERID_SESSION_NAME; extern const char* DM_CAPABILITY_OSD; extern const char* DM_CAPABILITY_APPROACH; +extern const char* DM_CAPABILITY_OH_APPROACH; extern const char* DM_CAPABILITY_TOUCH; extern const char* DM_CAPABILITY_CASTPLUS; extern const char* DM_CAPABILITY_VIRTUAL_LINK; diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp index 04a9ca3a5..fb296b26a 100644 --- a/common/src/dm_constants.cpp +++ b/common/src/dm_constants.cpp @@ -32,6 +32,7 @@ const char* DM_PIN_HOLDER_SESSION_NAME = "ohos.distributedhardware.devicemanager const char* DM_SYNC_USERID_SESSION_NAME = "ohos.distributedhardware.devicemanager.syncuserid"; const char* DM_CAPABILITY_OSD = "osdCapability"; const char* DM_CAPABILITY_APPROACH = "approach"; +const char* DM_CAPABILITY_OH_APPROACH = "oh_approach"; const char* DM_CAPABILITY_TOUCH = "touch"; const char* DM_CAPABILITY_CASTPLUS = "castPlus"; const char* DM_CAPABILITY_VIRTUAL_LINK = "virtualLink"; -- Gitee From f62da00c22a9bbc4de1cc39828f09df1509eb694 Mon Sep 17 00:00:00 2001 From: yuanling Date: Wed, 26 Mar 2025 08:28:48 +0000 Subject: [PATCH 2/3] Revert "add DM_CAPABILITY_OH_APPROACH" This reverts commit 296e7209100153043a7166b167024b6daaa30687. --- common/include/dm_constants.h | 1 - common/src/dm_constants.cpp | 1 - 2 files changed, 2 deletions(-) diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index cfe8afa2e..ecd06f4ab 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -37,7 +37,6 @@ extern const char* DM_PIN_HOLDER_SESSION_NAME; extern const char* DM_SYNC_USERID_SESSION_NAME; extern const char* DM_CAPABILITY_OSD; extern const char* DM_CAPABILITY_APPROACH; -extern const char* DM_CAPABILITY_OH_APPROACH; extern const char* DM_CAPABILITY_TOUCH; extern const char* DM_CAPABILITY_CASTPLUS; extern const char* DM_CAPABILITY_VIRTUAL_LINK; diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp index fb296b26a..04a9ca3a5 100644 --- a/common/src/dm_constants.cpp +++ b/common/src/dm_constants.cpp @@ -32,7 +32,6 @@ const char* DM_PIN_HOLDER_SESSION_NAME = "ohos.distributedhardware.devicemanager const char* DM_SYNC_USERID_SESSION_NAME = "ohos.distributedhardware.devicemanager.syncuserid"; const char* DM_CAPABILITY_OSD = "osdCapability"; const char* DM_CAPABILITY_APPROACH = "approach"; -const char* DM_CAPABILITY_OH_APPROACH = "oh_approach"; const char* DM_CAPABILITY_TOUCH = "touch"; const char* DM_CAPABILITY_CASTPLUS = "castPlus"; const char* DM_CAPABILITY_VIRTUAL_LINK = "virtualLink"; -- Gitee From 42611e494f71373d42a83c34e2fbf0dd7bd020d4 Mon Sep 17 00:00:00 2001 From: yuanling Date: Wed, 26 Mar 2025 16:29:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?#IBWGV8:[=E6=96=B0=E9=9C=80=E6=B1=82]:=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=B8=BF=E8=92=99=E7=94=9F=E6=80=81=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E9=9D=A0=E8=BF=91=E5=8F=91=E7=8E=B0=E8=83=BD=E5=8A=9B?= =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E5=86=85=E5=AE=B9=EF=BC=9Adevice=5Fmanage?= =?UTF-8?q?r=E6=A8=A1=E5=9D=97=E6=96=B0=E5=A2=9E=E8=83=BD=E5=8A=9BDM=5FCAP?= =?UTF-8?q?ABILITY=5FOH=5FAPPROACH=20=E6=98=AF=E5=90=A6=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E5=8F=98=E6=88=90=E8=A7=84=E8=8C=83=E8=87=AA=E6=A3=80=EF=BC=9A?= =?UTF-8?q?Y=20=E6=98=AF=E5=90=A6=E7=BC=96=E8=AF=91=E4=B8=94=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E9=80=9A=E8=BF=87=EF=BC=9AY=20=E5=BD=B1=E5=93=8D?= =?UTF-8?q?=E7=9A=84=E8=AE=BE=E5=A4=87=E4=B8=8E=E5=B9=B3=E5=8F=B0=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=EF=BC=9Amaster=20=E5=9B=A2=E9=98=9F:=20H=20Signed-off?= =?UTF-8?q?-by:yuanling?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/include/dm_constants.h | 1 + common/src/dm_constants.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/common/include/dm_constants.h b/common/include/dm_constants.h index ecd06f4ab..cfe8afa2e 100755 --- a/common/include/dm_constants.h +++ b/common/include/dm_constants.h @@ -37,6 +37,7 @@ extern const char* DM_PIN_HOLDER_SESSION_NAME; extern const char* DM_SYNC_USERID_SESSION_NAME; extern const char* DM_CAPABILITY_OSD; extern const char* DM_CAPABILITY_APPROACH; +extern const char* DM_CAPABILITY_OH_APPROACH; extern const char* DM_CAPABILITY_TOUCH; extern const char* DM_CAPABILITY_CASTPLUS; extern const char* DM_CAPABILITY_VIRTUAL_LINK; diff --git a/common/src/dm_constants.cpp b/common/src/dm_constants.cpp index 04a9ca3a5..fb296b26a 100644 --- a/common/src/dm_constants.cpp +++ b/common/src/dm_constants.cpp @@ -32,6 +32,7 @@ const char* DM_PIN_HOLDER_SESSION_NAME = "ohos.distributedhardware.devicemanager const char* DM_SYNC_USERID_SESSION_NAME = "ohos.distributedhardware.devicemanager.syncuserid"; const char* DM_CAPABILITY_OSD = "osdCapability"; const char* DM_CAPABILITY_APPROACH = "approach"; +const char* DM_CAPABILITY_OH_APPROACH = "oh_approach"; const char* DM_CAPABILITY_TOUCH = "touch"; const char* DM_CAPABILITY_CASTPLUS = "castPlus"; const char* DM_CAPABILITY_VIRTUAL_LINK = "virtualLink"; -- Gitee