Merge branch 'release0123' into wxr0114

wxr

2022-06-27 4047f825119fd65a8ed41ade4b2324d8a7f94902

 HDL_ON/Entity/Function/Function.cs

@@ -1196,14 +1196,19 @@

        public string loopId;
    }

    /// <summary>
    /// Tag 功能SPK
    /// </summary>
    public static class SPK
    {
        /// <summary>
        /// 门锁
        /// </summary>
        public const string DoorLock = "security.door";

        /// <summary>
        /// 门锁spk列表
        /// </summary>
        /// <returns></returns>
        public static List<string> GetDoorLockSPKList()
        {
            var list = new List<string>();
@@ -1267,6 +1272,10 @@
        /// （卷帘）
        /// </summary>
        public const string CurtainRoller = "curtain.roller";
        /// <summary>
        /// 梦幻帘
        /// </summary>
        public const string CurtainDream = "curtain.dream";

        /// <summary>
        /// 窗帘spk列表
@@ -1279,6 +1288,7 @@
            spkList.Add(CurtainSwitch);
            spkList.Add(CurtainShades);
            spkList.Add(CurtainTrietex);
            spkList.Add(CurtainDream);
            return spkList;
        }
        #endregion