Merge branch 'wjc' into Dev-1.9

wxr

2023-07-19 607e4db3b1a4ad059fc8d719117dab7eae9f20d2

 HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs

@@ -1449,7 +1449,7 @@
                string value = dic["value"];
                if (dictionaryA["key"] == key && dictionaryA["comparator"] == comparatorValue)
                {
                    if (this.checkSpk())
                    if (this.CheckSpk())
                    {
                        //有些设备需要增加这个判断
                        if (dictionaryA["value"] == value)
@@ -1473,7 +1473,7 @@
        /// 检查是否支持
        /// </summary>
        /// <returns></returns>
        private bool checkSpk()
        private bool CheckSpk()
        {
            if (this.function.spk == SPK.VideoDoorLock ||
               this.function.spk == SPK.doorgate
@@ -1483,7 +1483,7 @@
            }
            return false;

        }
        } 
        /// <summary>
        /// 判断dictionaryB是否完整包含另一个dictionaryA
        /// </summary>