Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Projec...

wei

2021-01-11 41f9c8837b0551c68f8fd798c06951fa716b7ab8

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

@@ -1,6 +1,8 @@
using System;
using System;
using Shared;
using System.Collections.Generic;
using HDL_ON.Entity;

namespace HDL_ON.UI.UI2.Intelligence.Automation
{
    public class TargetDeviceFunList : FrameLayout
@@ -43,13 +45,13 @@
            this.AddChidren(saveView.FLayoutView());
            #endregion
            #region  编辑设备状态
            switch (device.functionType)
            switch (device.spk)
            {
                //开关灯光 light.Switch
                case FunctionType.Dimmer:
                case FunctionType.RGB:
                case FunctionType.RGBW:
                case FunctionType.ColorTemperature:
                case SPK.LightDimming:
                case SPK.LightRGB:
                case SPK.LightRGBW:
                case SPK.LightCCT:
                    {
                        #region 界面
                        ///开关
@@ -82,7 +84,7 @@
                        #endregion
                    }
                    break;
                case FunctionType.Relay:
                case SPK.LightSwitch:
                    {
                        #region 界面
                        ///开关
@@ -105,9 +107,9 @@
                    }
                    break;
                //窗帘
                case FunctionType.Curtain:
                case FunctionType.MotorCurtain:
                case FunctionType.RollingShutter:
                case SPK.CurtainSwitch:
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        #region 界面
                        ///开关
@@ -129,7 +131,7 @@
                        #endregion
                    }
                    break;
                case FunctionType.AC:
                case SPK.AcStandard:
                    {
                        #region 界面
                        ///开关
@@ -173,7 +175,8 @@
                                temperatureView.btnState.Text = stateStr;
                                //设备属性值，云雀上定义好的;
                                string keyVlaue = "set_temp";
                                selectedState = device.functionType + "_" + keyVlaue;
                                selectedState = device.spk + "_"+ keyVlaue;

                                string set_temp_value = stateStr.Replace("℃", "");
                                //数据封装
                                AddDictionary(keyVlaue, set_temp_value);
@@ -188,7 +191,7 @@
                            string currText = acModehView.btnState.Text;
                            //设备属性值，云雀上定义好的;
                            string keyVlaue = "mode";
                            selectedState = device.functionType + "_" + keyVlaue;
                            selectedState = device.spk + "_"+keyVlaue;
                            PublicInterface modeView = new PublicInterface();
                            var modeListStr = modeView.GetViewList(keyVlaue);
                            modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
@@ -209,7 +212,7 @@
                            string currText = acSpeedView.btnState.Text;
                            //设备属性值，云雀上定义好的;
                            string keyVlaue = "fan";
                            selectedState = device.functionType + "_" + keyVlaue;
                            selectedState = device.spk + "_" + keyVlaue;
                            PublicInterface speedView = new PublicInterface();
                            var speedListStr = speedView.GetViewList(keyVlaue);
                            speedView.SingleSelectionShow(this, speedListStr, Language.StringByID(StringId.speedLogic), currText
@@ -231,7 +234,7 @@
                        #endregion
                    }
                    break;
                case FunctionType.FloorHeating:
                case SPK.FloorHeatStandard:
                    {
                        #region 界面
                        ///开关
@@ -271,7 +274,7 @@
                                temperatureView.btnState.Text = stateStr;
                                //设备属性值，云雀上定义好的;
                                string keyVlaue = "set_temp";
                                selectedState = device.functionType + "_" + keyVlaue;
                                selectedState = device.spk + "_"+ keyVlaue;
                                string set_temp_value = stateStr.Replace("℃", "");
                                //数据封装
                                AddDictionary(keyVlaue, set_temp_value);
@@ -288,7 +291,7 @@
                            string currText = floorHeatingModehView.btnState.Text;
                            //设备属性值，云雀上定义好的;
                            string keyVlaue = "mode";
                            selectedState = device.functionType + "_" + keyVlaue;
                            selectedState = device.spk + "_"+ keyVlaue;
                            PublicInterface modeView = new PublicInterface();
                            var modeListStr = modeView.GetViewList("floorheatingmode");
                            modeView.SingleSelectionShow(this, modeListStr, Language.StringByID(StringId.modeLogic), currText
@@ -321,12 +324,12 @@
                    Output outputDevice = new Output();
                    outputDevice.target_type = "1";
                    outputDevice.sid = device.sid;
                    switch (device.functionType)
                    switch (device.spk)
                    {
                        case FunctionType.Dimmer:
                        case FunctionType.RGB:
                        case FunctionType.RGBW:
                        case FunctionType.ColorTemperature:
                        case SPK.LightDimming:
                        case SPK.LightRGB:
                        case SPK.LightRGBW:
                        case SPK.LightCCT:
                            {
                                //调光做了一个特殊处理；
                                if (dicSateteList.Count > 1)
@@ -352,8 +355,8 @@
                                }
                                break;
                            }
                        case FunctionType.AC:
                        case FunctionType.FloorHeating:
                        case SPK.AcStandard:
                        case SPK.FloorHeatStandard:
                            {

                                //(空调/地热)做了一个特殊处理；
@@ -415,6 +418,85 @@
            #endregion

        }
       
        /// <summary>
        ///开关=界面
        /// </summary>
        /// <param name="fLayout"></param>
        /// <param name="device"></param>
        /// <param name="index"></param>
        /// <param name="edit"></param>
        /// <param name="intView">选中View的数量</param>
        private void SwitchView(FrameLayout fLayout, Entity.Function device, int index, bool edit, int intView)
        {
            #region 界面
            ///开关
            LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
            curtainSwitchView.btnText.TextID = StringId.switchLogic;
            fLayout.AddChidren(curtainSwitchView.FLayoutView());
            #endregion
            #region 点击事件
            ///开关点击事件
            curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                SwitchViewMethod(device, curtainSwitchView.btnState, intView);
            };
            if (edit)
            {
                //显示编辑之前的设备状态
                GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
            }
            #endregion

        }
        /// <summary>
        ///（开关+亮度/百分比)界面
        /// </summary>
        /// <param name="fLayout"></param>
        /// <param name="device"></param>
        /// <param name="index"></param>
        /// <param name="edit"></param>
        /// <param name="intView">选中View的数量</param>
        private void SwitchBrightnessView(FrameLayout fLayout, Entity.Function device, int index, bool edit, int intView)
        {
            #region 界面
            ///开关
            LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
            lightSwitchView.btnText.TextID = StringId.switchLogic;
            fLayout.AddChidren(lightSwitchView.FLayoutView());
            ///亮度
            LogicView.FunTypeView brightnessView = new LogicView.FunTypeView();
            brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
            if (device.spk == SPK.CurtainTrietex || device.spk == SPK.CurtainRoller)
            {

                brightnessView.btnText.TextID = StringId.percentum;
            }
            else
            {
                brightnessView.btnText.TextID = StringId.brightnesLogic;
            }
            fLayout.AddChidren(brightnessView.FLayoutView());
            #endregion
            #region 点击事件
            ///开关点击事件
            lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                SwitchViewMethod(device, lightSwitchView.btnState, intView);
            };
            ///亮度点击事件
            brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);
            };
            if (edit)
            {
                //显示编辑之前的设备状态
                GetEditState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
            }
            #endregion

        }
        /// <summary>
        /// 开关=功能下一级界面
        /// </summary>
@@ -430,7 +512,7 @@
            };
            this.AddChidren(frame);
            LogicView.SwitchView switchView = new LogicView.SwitchView();
            switchView.FLayoutView(frame, len, button.Text, (strValue) =>
            switchView.FLayoutView(frame, len, button.Text, (Action<string>)((strValue) =>
            {
                int id = 0;
                switch (strValue)
@@ -453,12 +535,15 @@
                }
                //界面显示选中值
                button.TextID = id;
                selectedState = device.functionType + "_" + strValue;
                //设备属性值，云雀上定义好的;
                selectedState = device.spk + "_" + strValue;
                string keyVlaue = "on_off";
                //数据封装
                AddDictionary(keyVlaue, strValue);
            });
                Dictionary<string, string> dic = new Dictionary<string, string>();
                LogicMethod.dictionary(dic, "key", "on_off");
                LogicMethod.dictionary(dic, "value", strValue);
                AddDictionaryData(dicSateteList, keyVlaue, dic);

            }));
            #endregion
        }
        /// <summary>
@@ -472,34 +557,35 @@
            //之前的状态值
            string stateVlaue = button.Text;
            LogicView.BrightnessView brightness = new LogicView.BrightnessView();
            brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue) =>
            brightness.FLayoutView(this, titleName, stateVlaue, (Action<string>)((brightnesValue) =>
            {
                //界面显示选中值
                button.Text = brightnesValue + "%";
                selectedState = device.functionType + brightnesValue.ToString();
                //设备属性值，云雀上定义好的;
                button.Text = brightnesValue+"%";
                string keyVlaue = "";
                switch (device.functionType)
                selectedState = device.spk + brightnesValue.ToString();
                //数据封装
                Dictionary<string, string> dic = new Dictionary<string, string>();
                switch (device.spk)
                {
                    //开关灯光 light.Switch
                    case FunctionType.Dimmer:
                    case FunctionType.RGB:
                    case FunctionType.RGBW:
                    case FunctionType.ColorTemperature:
                    case SPK.LightDimming:
                    case SPK.LightRGB:
                    case SPK.LightRGBW:
                    case SPK.LightCCT:
                        {
                            keyVlaue = "brightness";
                        }
                        break;
                    case FunctionType.MotorCurtain:
                    case FunctionType.RollingShutter:
                    case SPK.CurtainTrietex:
                    case SPK.CurtainRoller:
                        {
                            keyVlaue = "percent";
                        }
                        break;
                }
                //数据封装
                AddDictionary(keyVlaue, brightnesValue);
            });
                LogicMethod.dictionary(dic, "value", brightnesValue.ToString());
                AddDictionaryData(dicSateteList, keyVlaue, dic);
            }));
            #endregion

        }