Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project...

wei

2021-11-04 6c5398cef0d718eec08a1f56b1a9f00e79a85d67

Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1

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

@@ -67,6 +67,9 @@
                //新风
                case SPK.AirFreshStandard:
                case SPK.HvacAirFresh:
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                    {

                        LogicView.FunTypeView view = new LogicView.FunTypeView();

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

@@ -153,7 +153,10 @@
                                //新风
                                case SPK.AirFreshStandard:
                                case SPK.HvacAirFresh:
                                {//开关灯
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                    {//开关灯
                                        foreach (var dic in dicList)
                                        {

@@ -909,7 +912,10 @@
                            {
                                case SPK.AirSwitch:
                                case SPK.LightSwitch:
                                    {//开关灯
                                //插座
                                case SPK.PanelSocket:
                                case SPK.ElectricSocket:
                                    {//开关

                                        foreach (var dic in dicList)
                                        {
@@ -1357,6 +1363,9 @@
        {
            switch (device.spk)
            {
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                //开关灯光
                case SPK.AirSwitch:
                case SPK.LightSwitch:

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

@@ -324,6 +324,8 @@
                        strPath = "FunctionIcon/Icon/electricalbreaker.png";
                    }
                    break;
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                case SPK.LightSwitch:
                case SPK.LightRGB:
                case SPK.LightRGBW:
@@ -401,7 +403,10 @@
            || device.spk == SPK.LightCCT
            || device.spk == SPK.LightRGB
            || device.spk == SPK.LightRGBW
            || device.spk == SPK.AirSwitch);
            || device.spk == SPK.AirSwitch
            || device.spk == SPK.PanelSocket
            || device.spk == SPK.ElectricSocket
            );
            if (lightjosn != null)
            {
                deviceStrTypeList.Add(Language.StringByID(StringId.Lights));
@@ -475,7 +480,9 @@
                functionTypeList.Add(SPK.LightRGB);
                functionTypeList.Add(SPK.LightRGBW);
                functionTypeList.Add(SPK.LightCCT); 
                functionTypeList.Add(SPK.AirSwitch); 
                functionTypeList.Add(SPK.AirSwitch);
                functionTypeList.Add(SPK.PanelSocket);
                functionTypeList.Add(SPK.ElectricSocket);
            }
            else if (deviceType == Language.StringByID(StringId.Curtain))
            {
@@ -567,6 +574,8 @@
                        deviceTypeList.Add(SPK.SensorTVOC);
                        deviceTypeList.Add(SPK.SensorHcho);
                        deviceTypeList.Add(SPK.AirSwitch);
                        deviceTypeList.Add(SPK.PanelSocket);
                        deviceTypeList.Add(SPK.ElectricSocket);

                    }
                    break;
@@ -584,6 +593,8 @@
                        deviceTypeList.Add(SPK.FloorHeatStandard); deviceTypeList.Add(SPK.HvacFloorHeat);
                        deviceTypeList.Add(SPK.AirFreshStandard); deviceTypeList.Add(SPK.HvacAirFresh);
                        deviceTypeList.Add(SPK.AirSwitch);
                        deviceTypeList.Add(SPK.PanelSocket);
                        deviceTypeList.Add(SPK.ElectricSocket);
                    }
                    break;
            }

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

@@ -50,6 +50,9 @@
                //开关灯光 
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                    {
                        #region 界面
                        ///开关