兼容俄语

wxr

2022-07-25 f7d3739023f4d04a4ed2c30c13d9abf8da210da7

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

@@ -12,6 +12,14 @@
            Tag = "Logic";
        }
        /// <summary>
        /// 设备延时时间
        /// </summary>
        private string strdelay = "0";
        /// <summary>
        /// 显示设备延时时间
        /// </summary>
        private Button btnDelay =null;
        /// <summary>
        /// 定义一个记录选中设备状态列表；
        /// </summary>
        private List<Dictionary<string, string>> dicSateteList = new List<Dictionary<string, string>>();
@@ -59,6 +67,9 @@
                        LogicView.FunTypeView lightSwitchView = new LogicView.FunTypeView();
                        lightSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(lightSwitchView.FLayoutView());

                        ///设备延时iewv
                        DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
@@ -91,6 +102,8 @@
                        brightnessView.btnText.TextID = StringId.brightnesLogic;
                        fLayout.AddChidren(brightnessView.FLayoutView());
                        brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///设备延时iewv
                        DelayView(fLayout, brightnessView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
@@ -122,17 +135,56 @@
                        LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
                        curtainSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(curtainSwitchView.FLayoutView());
                        ///设备延时iewv
                        DelayView(fLayout, curtainSwitchView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
                        curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, curtainSwitchView.btnState, 3);
                            SwitchViewMethod(device, curtainSwitchView.btnState, 2);
                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
                        }
                        #endregion
                    }
                    break;
                case SPK.CurtainDream:
                    {
                        #region 界面
                        ///百分比
                        LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
                        crtainPercentumView.btnText.TextID = StringId.percentum;
                        fLayout.AddChidren(crtainPercentumView.FLayoutView());
                        crtainPercentumView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///角度
                        LogicView.FunTypeView AngleView = new LogicView.FunTypeView();
                        AngleView.frameLayout.Y = crtainPercentumView.frameLayout.Bottom;
                        AngleView.btnText.TextID = StringId.Angle;
                        fLayout.AddChidren(AngleView.FLayoutView());
                        AngleView.btnState.Text = "10°";
                        ///设备延时iewv
                        DelayView(fLayout, AngleView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件

                        ///百分比点击事件
                        crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
                        };
                        ///角度点击事件
                        AngleView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, AngleView.btnState, AngleView.btnText.Text);
                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, crtainPercentumView.btnState, AngleView.btnState, null, null);
                        }
                        #endregion
                    }
@@ -163,6 +215,8 @@
                        acSpeedView.frameLayout.Y = acModehView.frameLayout.Bottom;
                        acSpeedView.btnText.TextID = StringId.speedLogic;
                        fLayout.AddChidren(acSpeedView.FLayoutView());
                        ///设备延时iewv
                        DelayView(fLayout, acModehView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
@@ -260,7 +314,8 @@
                        floorHeatingModehView.btnText.TextID = StringId.modeLogic;
                        fLayout.AddChidren(floorHeatingModehView.FLayoutView());


                        ///设备延时iewv
                        DelayView(fLayout, floorHeatingModehView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
@@ -333,6 +388,9 @@
                        AirFreshSpeedView.frameLayout.Y = AirFreshSwitchVie.frameLayout.Bottom;
                        AirFreshSpeedView.btnText.TextID = StringId.speedLogic;
                        fLayout.AddChidren(AirFreshSpeedView.FLayoutView());

                        ///设备延时iewv
                        DelayView(fLayout, AirFreshSpeedView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
@@ -413,6 +471,7 @@
                    Output outputDevice = new Output();
                    outputDevice.target_type = "1";
                    outputDevice.sid = device.sid;
                    outputDevice.delay= strdelay;
                    switch (device.spk)
                    {
                        case SPK.LightDimming:
@@ -477,7 +536,7 @@
                    if (edit)
                    {
                        //更新延时时间
                        outputDevice.delay = Logic.currlogic.output[index].delay;
                        outputDevice.delay = strdelay;//Logic.currlogic.output[index].delay;
                        //移除旧数据
                        Logic.currlogic.output.RemoveAt(index);
                        //新数据插入旧数据的位置;
@@ -508,6 +567,34 @@
            #endregion

        }
        /// <summary>
        /// 延时View
        /// </summary>
        /// <param name="fLayout">父控件</param>
        /// <param name="bottomY">在哪个控件下面</param>
        private void DelayView(FrameLayout fLayout, int bottomY)
        {
            LogicView.FunTypeView delayView = new LogicView.FunTypeView();
            delayView.frameLayout.Y = bottomY;
            delayView.btnText.TextID = StringId.Delay;
            delayView.btnState.Text = strdelay + "s";
            fLayout.AddChidren(delayView.FLayoutView());
            ///赋值对象
            this.btnDelay = delayView.btnState;
            ///延时点击事件
            delayView.btnClick.MouseUpEventHandler += (sender, e) =>
            {
                InpOrOutLogicMethod inpOrOutLogicMethod = new InpOrOutLogicMethod();
                inpOrOutLogicMethod.Delayed(this, strdelay, (value) =>
                {
                    selectedState = "delay_" + strdelay;
                    strdelay = value.ToString();
                    delayView.btnState.Text = strdelay + "s";
                });
            };

        }

        /// <summary>
        /// 开关=功能下一级界面
        /// </summary>
@@ -562,10 +649,10 @@
            //之前的状态值
            string stateVlaue = button.Text;
            LogicView.BrightnessView brightness = new LogicView.BrightnessView();
            brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue) =>
            brightness.FLayoutView(this, titleName, stateVlaue, (brightnesValue, unitStr) =>
            {
                //界面显示选中值
                button.Text = brightnesValue + "%";
                button.Text = brightnesValue + unitStr;
                selectedState = device.spk + brightnesValue.ToString();
                //设备属性值，云雀上定义好的;
                string keyVlaue = "";
@@ -582,8 +669,14 @@
                        break;
                    case SPK.CurtainRoller:
                    case SPK.CurtainTrietex:
                    case SPK.CurtainDream:
                        {
                            keyVlaue = "percent";
                            if (unitStr == "°")
                            {
                                //角度
                                keyVlaue = "angle";
                            }
                        }
                        break;
                }
@@ -613,6 +706,12 @@
                //有数据重新赋值
                dicSateteList = dicList;
            }
            if (this.btnDelay != null)
            {
                ///延时显示文本
                this.btnDelay.Text = outputs.delay + "s";
                this.strdelay = outputs.delay;
            }
            InpOrOutLogicMethod.EditState(device, dicList, button1, button2, button3, button4);
        }
        /// <summary>