群控分享功能

wxr

2024-05-11 a1ffd4bb9ff6b9eaa94a787cd5429595edbe4823

群控分享功能

 HDL_ON/Common/Constant.cs

@@ -239,6 +239,10 @@
        /// 
        /// </summary>
        LOGIC,
        /// <summary>
        /// 组控
        /// </summary>
        GROUPCONTROL,
    }

    /// <summary>

 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";
    }

 HDL_ON/Entity/Room.cs

@@ -508,6 +508,7 @@
                {
                    if (g.roomIds.Contains(roomId) && roomId != null)
                    {
                        g.deviceId = g.userDeviceGroupControlId;
                        functions.Add(g);
                    }
                }

 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();
    }

 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,
                        });
                    }