1

wei

2021-08-27 c9dd765615b4bc6577ad39a9d6abcf33c735e685

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

@@ -104,7 +104,6 @@
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }

                    }
                    break;
                //干接点
@@ -204,6 +203,8 @@
                    break;
                //环境检测传感器
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                    {
                        #region 界面
                        ///温度
@@ -229,7 +230,11 @@
                        LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
                        tvocView.frameLayout.Y = co2View.frameLayout.Bottom;
                        tvocView.btnText.TextID = StringId.tvoc;
                        fLayout.AddChidren(tvocView.FLayoutView());
                        if (SPK.SensorEnvironment3 != device.spk)
                        {
                            fLayout.AddChidren(tvocView.FLayoutView());
                        }
                        
                        #endregion
                        #region 点击事件
                        ///温度点击事件
@@ -537,7 +542,7 @@
               {
                   var value = view.GetValue(key, text);
                   selectedState = device.spk + "_"+ key;
                   AddDictionary(key, value, "integer");
                   AddDictionary(key, value, "integer","in");
                   Save(device,index, edit);
               });
        }
@@ -553,7 +558,7 @@
        private void GetEditState(Entity.Function device, int index, Button button1, Button button2, Button button3, Button button4)
        {
            Input inputs = Logic.currlogic.input[index];
            var dicList = inputs.condition as List<Dictionary<string, string>>;
            var dicList = inputs.condition;
            //清除之前旧数据
            dicSateteList.Clear();
            if (dicList.Count != 0)