20210111-删除功能类别，统一使用spk去设备功能

wei

2021-01-11 b271bcceb1c4e718377ca86b6213816abcf7482a

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

old mode 100755
new mode 100644
@@ -1,6 +1,8 @@
using System;
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;

namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    public class InpOrOutLogicMethod
@@ -61,28 +63,28 @@
                            //用sid找到设备；
                            var device = LogicMethod.GetDevice(inputCondition.sid);
                            //用设备的functionType类型找到对应图标；
                            inputView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.functionType);
                            inputView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.spk);
                            //显示设备名称
                            inputView.btnText.Text = device.name;
                            //改变设备名称显示控件宽度
                            inputView.btnText.Width = Application.GetRealWidth(80);
                            //区别不同设备，显示不同设备状态
                            switch (device.functionType)
                            switch (device.spk)
                            {
                                //开关灯光 light.Switch
                                case FunctionType.Dimmer:
                                case FunctionType.RGB:
                                case FunctionType.RGBW:
                                case FunctionType.ColorTemperature:
                                case FunctionType.Relay:
                                case SPK.LightDimming:
                                case SPK.LightRGB:
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                case SPK.LightSwitch:
                                //窗帘
                                case FunctionType.Curtain:
                                case FunctionType.RollingShutter:
                                case FunctionType.MotorCurtain:
                                case SPK.CurtainSwitch:
                                case SPK.CurtainRoller:
                                case SPK.CurtainTrietex:
                                //空调
                                case FunctionType.AC:
                                case SPK.AcStandard:
                                //地热
                                case FunctionType.FloorHeating:
                                case SPK.FloorHeatStandard:
                                    {//开关灯
                                        foreach (var dic in dicList)
                                        {
@@ -206,7 +208,7 @@
                            //用sid找到设备；
                            var device = LogicMethod.GetDevice(outputTarget.sid);
                            //用设备的functionType类型找到对应图标；
                            targetView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.functionType);
                            targetView.btnIcon.UnSelectedImagePath = LogicMethod.GetIconPath(device.spk);
                            //显示设备名称
                            targetView.btnText.Text = device.name;
                            //改变设备名称显示控件宽度
@@ -214,9 +216,9 @@
                            //第一个变量显示状态值
                            string stateStr = "";
                            //区别不同设备，显示不同设备状态
                            switch (device.functionType)
                            switch (device.spk)
                            {
                                case FunctionType.Relay:
                                case SPK.LightSwitch:
                                    {//开关灯

                                        foreach (var dic in dicList)
@@ -235,10 +237,10 @@
                                        targetView.btnState.Text = stateStr;
                                    }
                                    break;
                                case FunctionType.RGB:
                                case FunctionType.RGBW:
                                case FunctionType.ColorTemperature:
                                case FunctionType.Dimmer:
                                case SPK.LightRGB:
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                case SPK.LightDimming:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string brightness = GetKeyValue("brightness", dicList);
@@ -261,9 +263,9 @@
                                        targetView.btnState.Text = stateStr;
                                    }
                                    break;
                                case FunctionType.Curtain:
                                case FunctionType.MotorCurtain:
                                case FunctionType.RollingShutter:
                                case SPK.CurtainSwitch:
                                case SPK.CurtainTrietex:
                                case SPK.CurtainRoller:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -290,7 +292,7 @@
                                        targetView.btnState.Text = stateStr;
                                    }
                                    break;
                                case FunctionType.AC: {
                                case SPK.AcStandard: {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
                                        string mode = GetKeyValue("mode", dicList);
@@ -386,7 +388,7 @@

                                    }
                                    break;
                                case FunctionType.FloorHeating:
                                case SPK.FloorHeatStandard:
                                    {
                                        string on_off = GetKeyValue("on_off", dicList);
                                        string set_temp = GetKeyValue("set_temp", dicList);
@@ -572,10 +574,10 @@
        /// <param name="button4">显示Btn</param>
        public static void EditState(Entity.Function device, List<Dictionary<string, string>> dicList, Button button1, Button button2, Button button3, Button button4)
        {
            switch (device.functionType)
            switch (device.spk)
            {
                //开关灯光
                case FunctionType.Relay:
                case SPK.LightSwitch:
                    {
                        foreach (var dic in dicList)
                        {
@@ -591,10 +593,10 @@
                        }
                    }
                    break;
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.RGBW:
                case FunctionType.ColorTemperature:
                case SPK.LightDimming:
                case SPK.LightRGB:
                case SPK.LightRGBW:
                case SPK.LightCCT:
                    {
                        foreach (var dic in dicList)
                        {
@@ -624,9 +626,9 @@
                        }
                    }
                    break;
                case FunctionType.Curtain:
                case FunctionType.MotorCurtain:
                case FunctionType.RollingShutter:
                case SPK.CurtainSwitch:
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        foreach (var dic in dicList)
                        {
@@ -652,7 +654,7 @@
                        }
                    }
                    break;
                case FunctionType.AC:
                case SPK.AcStandard:
                    {
                        foreach (var dic in dicList)
                        {
@@ -748,7 +750,7 @@

                    }
                    break;
                case FunctionType.FloorHeating:
                case SPK.FloorHeatStandard:
                    {

                        foreach (var dic in dicList)
@@ -894,9 +896,9 @@
                            name += device.name;
                            string stateStr = "";
                            //区别不同设备，显示不同设备状态
                            switch (device.functionType)
                            switch (device.spk)
                            {
                                case FunctionType.Relay:
                                case SPK.LightSwitch:
                                    {//开关灯

                                        foreach (var dic in dicList)
@@ -914,10 +916,10 @@
                                        }
                                    }
                                    break;
                                case FunctionType.RGB:
                                case FunctionType.RGBW:
                                case FunctionType.ColorTemperature:
                                case FunctionType.Dimmer:
                                case SPK.LightRGB:
                                case SPK.LightRGBW:
                                case SPK.LightCCT:
                                case SPK.LightDimming:
                                    {
                                        string on_off = InpOrOutLogicMethod.GetKeyValue("on_off", dicList);
                                        string brightness = InpOrOutLogicMethod.GetKeyValue("brightness", dicList);
@@ -939,9 +941,9 @@
                                        }
                                    }
                                    break;
                                case FunctionType.Curtain:
                                case FunctionType.MotorCurtain:
                                case FunctionType.RollingShutter:
                                case SPK.CurtainSwitch:
                                case SPK.CurtainTrietex:
                                case SPK.CurtainRoller:
                                    {
                                        foreach (var dic in dicList)
                                        {
@@ -967,8 +969,8 @@
                                        }
                                    }
                                    break;
                                case FunctionType.AC:
                                case FunctionType.FloorHeating:
                                case SPK.AcStandard:
                                case SPK.FloorHeatStandard:
                                    {
                                        foreach (var dic in dicList)
                                        {