Merge branch 'dev--wxr' into LcSdkV1

wxr

2022-11-23 5b77d9d57a6cddb474a66ca54401ad5ab0892db3

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

@@ -55,12 +55,15 @@
            #region  编辑设备状态
            switch (device.spk)
            {

                //开关灯光 
                case SPK.AirSwitch:
                case SPK.LightSwitch:
                //插座
                case SPK.PanelSocket:
                case SPK.ElectricSocket:
                //机械手
                case SPK.MechanicalArm:
                    {
                        #region 界面
                        ///开关
@@ -89,7 +92,6 @@
                case SPK.LightDimming:
                case SPK.LightRGB:
                case SPK.LightRGBW:
                case SPK.LightCCT:
                    {
                        #region 界面
                        ///开关
@@ -121,6 +123,54 @@
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, null, null);
                        }
                        #endregion
                    }
                    break;
                case SPK.LightCCT:
                    {
                        #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;
                        brightnessView.btnText.TextID = StringId.brightnesLogic;
                        fLayout.AddChidren(brightnessView.FLayoutView());
                        brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///色温
                        LogicView.FunTypeView colorTemperatureView = new LogicView.FunTypeView();
                        colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
                        colorTemperatureView.btnText.TextID = StringId.ColorTemperature;
                        fLayout.AddChidren(colorTemperatureView.FLayoutView());
                        colorTemperatureView.btnState.Text = "2700k";
                        ///设备延时iewv
                        DelayView(fLayout, colorTemperatureView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
                        lightSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, lightSwitchView.btnState, 2);
                        };
                        ///亮度点击事件
                        brightnessView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, brightnessView.btnState, brightnessView.btnText.Text);

                        };
                        ///色温点击事件
                        colorTemperatureView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            ColorTemperatureMethod(device, colorTemperatureView.btnState, colorTemperatureView.btnText.Text);

                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditDeviceState(device, index, lightSwitchView.btnState, brightnessView.btnState, colorTemperatureView.btnState, null);
                        }
                        #endregion
                    }
@@ -824,6 +874,38 @@

        }
        /// <summary>
        /// 色温(cct)=功能下一级界面
        /// </summary>
        /// <param name="device"></param>
        /// <param name="button"></param>
        private void ColorTemperatureMethod(Entity.Function device, Button button, string titleName)
        {
            #region 界面
            //之前的状态值
            string stateVlaue = button.Text;
            LogicView.ColorTemperature brightness = new LogicView.ColorTemperature();
            brightness.FLayoutView(this, titleName, stateVlaue, (colorTemperatureValue, unitStr) => 
            {
                //界面显示选中值
                button.Text = colorTemperatureValue + unitStr;
                selectedState = device.spk + colorTemperatureValue.ToString();
                //设备属性值，云雀上定义好的;
                string keyVlaue = "";
                switch (device.spk)
                {
                    case SPK.LightCCT:
                        {
                            keyVlaue = "cct";
                        }
                        break;
                }
                //数据封装
                AddDictionary(keyVlaue, colorTemperatureValue);
            });
            #endregion

        }
        /// <summary>
        /// 显示编辑之前的设备状态
        /// </summary>
        /// <param name="device">编辑设备</param>