组合调光

wei

2021-09-27 1eb43291d6f565fd8106ee401240d1c7a41da776

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

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

                        LogicView.FunTypeView view = new LogicView.FunTypeView();
@@ -189,6 +191,7 @@
                    break;
                //毫米波传感器
                case SPK.SenesorMegahealth:
                case SPK.SenesorMegahealth2:
                    {
                        LogicView.FunTypeView view = new LogicView.FunTypeView();
                        view.btnText.TextID = StringId.mubiaozhuangtai;//目标状态
@@ -364,7 +367,7 @@
                    {
                        ///hcho
                        LogicView.FunTypeView hchoView = new LogicView.FunTypeView();
                        hchoView.btnText.TextID = StringId.tvoc;
                        hchoView.btnText.TextID = StringId.Formaldehyde;
                        fLayout.AddChidren(hchoView.FLayoutView());
                        ///hcho点击事件
                        hchoView.btnClick.MouseUpEventHandler += (sender, e) =>
@@ -478,6 +481,7 @@
                        }
                        break;
                    case SPK.SenesorMegahealth:
                    case SPK.SenesorMegahealth2:
                        {
                            keyVlaue = "action_state";
                        }
@@ -515,7 +519,7 @@
                        break;
                    case StringId.wuren:
                        {
                            if (device.spk == SPK.SenesorMegahealth)
                            if (device.spk == SPK.SenesorMegahealth || device.spk == SPK.SenesorMegahealth2)
                            {
                                value = "uninhabited";
                            }