主页刷新优化

wei

2021-09-23 4f2dbd1f6a1ec2d9c3c39b4a37b0b7c9ddece4aa

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

@@ -56,6 +56,8 @@
                case SPK.AcStandard:
                //地热
                case SPK.FloorHeatStandard:
                //新风
                case SPK.AirFreshStandard:
                    {

                        LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -104,7 +106,6 @@
                        {
                            GetEditState(device, index, view.btnState, null, null, null);
                        }

                    }
                    break;
                //干接点
@@ -204,6 +205,8 @@
                    break;
                //环境检测传感器
                case SPK.SensorEnvironment:
                case SPK.SensorEnvironment2:
                case SPK.SensorEnvironment3:
                    {
                        #region 界面
                        ///温度
@@ -229,7 +232,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 点击事件
                        ///温度点击事件
@@ -266,6 +273,105 @@

                        };
                        #endregion
                    }
                    break;
                    //温度传感器
                case SPK.SensorTemperature:
                    {
                        ///温度
                        LogicView.FunTypeView wenuView = new LogicView.FunTypeView();
                        wenuView.btnText.TextID = StringId.wendu;
                        fLayout.AddChidren(wenuView.FLayoutView());

                        ///温度点击事件
                        wenuView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            new PublicInterface { }.ViewZuHe(this, StringId.wendugaoyu, StringId.wendudiyu, (intText, view) =>
                            {
                                InputBoxAction(device, intText, index, edit);
                            });
                        };
                    }
                    break;
                //湿度传感器
                case SPK.SensorHumidity:
                    {
                        ///湿度
                        LogicView.FunTypeView shiduView = new LogicView.FunTypeView();
                        shiduView.btnText.TextID = StringId.shidu;
                        fLayout.AddChidren(shiduView.FLayoutView());
                        ///湿度点击事件
                        shiduView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            new PublicInterface { }.ViewZuHe(this, StringId.shidugaoyu, StringId.shidudiyu, (intText, view) =>
                            {
                                InputBoxAction(device, intText, index, edit);
                            });

                        };
                    }
                    break;
                //co2
                case SPK.SensorCO2:
                    {


                        ///co2
                        LogicView.FunTypeView co2View = new LogicView.FunTypeView();
                        co2View.btnText.TextID = StringId.co2;
                        fLayout.AddChidren(co2View.FLayoutView());

                        ///co2点击事件
                        co2View.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "co2", StringId.co2, index, edit);
                        };
                    }
                    break;
                //pm2.5
                case SPK.SensorPm25:
                    {
                        ///pm2.5
                        LogicView.FunTypeView pm25View = new LogicView.FunTypeView();
                        pm25View.btnText.TextID = StringId.pm25;
                        fLayout.AddChidren(pm25View.FLayoutView());

                        ///pm2.5点击事件
                        pm25View.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "pm25", StringId.pm25, index, edit);
                        };
                    }
                    break;
                //tvoc
                case SPK.SensorTVOC:
                    {
                        ///tvoc
                        LogicView.FunTypeView tvocView = new LogicView.FunTypeView();
                        tvocView.btnText.TextID = StringId.tvoc;
                        fLayout.AddChidren(tvocView.FLayoutView());

                        ///tvoc点击事件
                        tvocView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "tvoc", StringId.tvoc, index, edit);

                        };
                    }
                    break;
                //甲醛
                case SPK.SensorHcho:
                    {
                        ///hcho
                        LogicView.FunTypeView hchoView = new LogicView.FunTypeView();
                        hchoView.btnText.TextID = StringId.Formaldehyde;
                        fLayout.AddChidren(hchoView.FLayoutView());
                        ///hcho点击事件
                        hchoView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            PmCo2TvocAction(this, device, "hcho", StringId.Formaldehyde, index, edit);

                        };
                    }
                    break;
            }
@@ -517,7 +623,7 @@
        /// <param name="index"></param>
        /// <param name="edit"></param>
        /// <param name="stateValue">编辑之前的状态值,默认为""</param>
        public void PmCo2TvocAction(FrameLayout frame, Entity.Function device,string key,int title, int index, bool edit, string stateValue = "")
        public void PmCo2TvocAction(FrameLayout frame, Entity.Function device, string key, int title, int index, bool edit, string stateValue = "")
        {
            if (edit)
            {
@@ -530,15 +636,30 @@
                    dicSateteList = inputs.condition;
                }
            }
            PublicInterface view = new PublicInterface();  
            var listStr = view.GetViewList(key); 
            PublicInterface view = new PublicInterface();
            var listStr = view.GetViewList(key);
            view.SingleSelectionShow(frame, listStr, Language.StringByID(title), view.GetString(key, stateValue)
               , (text) =>
               {
                  
                   var value = view.GetValue(key, text);
                   selectedState = device.spk + "_"+ key;
                   AddDictionary(key, value, "integer");
                   Save(device,index, edit);
                   selectedState = device.spk + "_" + key;
                   switch (device.spk)
                   {
                       case SPK.SensorTemperature:
                       case SPK.SensorHumidity:
                       case SPK.SensorCO2:
                       case SPK.SensorPm25:
                       case SPK.SensorTVOC:
                       case SPK.SensorHcho:
                           {
                               ///公司传感器key的健值是“value”；
                               key = "value";
                           }
                           break;
                   }
                   AddDictionary(key, value, "integer", "in");
                   Save(device, index, edit);
               });
        }
        /// <summary>
@@ -553,7 +674,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)