Davin
2023-07-25 b2a498cb445dc28d09c07e6c57eb298e3c7f7b16
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -1357,7 +1357,7 @@
                //有数据重新赋值
                dicSateteList.AddRange(dicList);
            }
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
            InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4,"");
        }
        /// <summary>
        /// 添加选中数据
@@ -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>