From a1ffd4bb9ff6b9eaa94a787cd5429595edbe4823 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 11 五月 2024 16:40:41 +0800
Subject: [PATCH] 群控分享功能
---
HDL_ON/Common/Constant.cs | 4 ++++
HDL_ON/DAL/Server/NewApiRes.cs | 2 +-
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs | 2 +-
HDL_ON/Entity/Room.cs | 1 +
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs | 2 +-
5 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/Common/Constant.cs b/HDL_ON/Common/Constant.cs
index 92b1527..c79c6f1 100644
--- a/HDL_ON/Common/Constant.cs
+++ b/HDL_ON/Common/Constant.cs
@@ -239,6 +239,10 @@
///
/// </summary>
LOGIC,
+ /// <summary>
+ /// 缁勬帶
+ /// </summary>
+ GROUPCONTROL,
}
/// <summary>
diff --git a/HDL_ON/DAL/Server/NewApiRes.cs b/HDL_ON/DAL/Server/NewApiRes.cs
index ecf9da4..41a7f5e 100644
--- a/HDL_ON/DAL/Server/NewApiRes.cs
+++ b/HDL_ON/DAL/Server/NewApiRes.cs
@@ -1396,7 +1396,7 @@
/// </summary>
public string childAccountId;
/// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE 4.DEVICE_GROUP_CONTROL
/// </summary>
public string shareType = "DEVICE";
}
diff --git a/HDL_ON/Entity/Room.cs b/HDL_ON/Entity/Room.cs
index 2606c6c..2516c3e 100644
--- a/HDL_ON/Entity/Room.cs
+++ b/HDL_ON/Entity/Room.cs
@@ -508,6 +508,7 @@
{
if (g.roomIds.Contains(roomId) && roomId != null)
{
+ g.deviceId = g.userDeviceGroupControlId;
functions.Add(g);
}
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
index 222d6c7..2b6d410 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberFunctionPermissionPage.cs
@@ -241,7 +241,7 @@
/// </summary>
public string name;
/// <summary>
- /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE
+ /// 鍒嗕韩绫诲瀷 1.ROOM 2.DEVICE 3.SCENE 4.DEVICE_GROUP_CONTROL
/// </summary>
public string shareType = ShareType.DEVICE.ToString();
}
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
index 0d70570..b154121 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberPermissionPage.cs
@@ -315,7 +315,7 @@
roomFunctionOrSceneList.Add(new RoomData()
{
shareTypeId = fun.deviceId,
- shareType = ShareType.DEVICE.ToString(),
+ shareType = fun.spk == SPK.GroupControl ? "DEVICE_GROUP_CONTROL" : ShareType.DEVICE.ToString(),
name = fun.name,
});
}
--
Gitblit v1.8.0