2023年08月14日15:15:49

wjc

2023-08-14 a4e9d02ce5cfc501ef9fecac0047c332b5426df2

 HDL_ON/Entity/Function/Function.cs

@@ -803,25 +803,27 @@
            var list = new List<FunctionAttributes>();
            if (spk == SPK.GroupControl)
            {
                var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                if (gc != null)
                lock (list)
                {
                    foreach (var temp in gc.sids)
                    var gc = FunctionList.List.groupControls.Find((obj) => obj.sid == sid);
                    if (gc != null)
                    {
                        var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
                        if (light != null)
                        foreach (var temp in gc.sids)
                        {
                            foreach (var attr in light.attributes)
                            var light = FunctionList.List.GetLightList().Find((obj) => obj.sid == temp.sid);
                            if (light != null)
                            {
                                if (list.Find((obj) => obj.key == attr.key) == null)
                                foreach (var attr in light.attributes)
                                {
                                    list.Add(attr);
                                    if (list.Find((obj) => obj.key == attr.key) == null)
                                    {
                                        list.Add(attr);
                                    }
                                }
                            }
                        }
                    }
                }

            }
            else
            {
@@ -1556,6 +1558,10 @@
        /// </summary>
        public const string Ev_Ipcam = "security.ipcam.ez";
        /// <summary>
        /// 影音中控
        /// </summary>
        public const string AvZkAiks = "av.zk.aiks";
        /// <summary>
        /// 萤石视频门锁spk列表
        /// </summary>
        /// <returns></returns>
@@ -1565,6 +1571,18 @@
            list.Add(VideoDoorLock);
            return list;
        }
        /// <summary>
        /// 影音中控spk列表
        /// </summary>
        /// <returns></returns>
        public static List<string> GetVideoControlsSPKList()
        {
            var list = new List<string>
            {
                AvZkAiks
            };
            return list;
        }

        /// <summary>
        /// 萤石摄像头spk列表