Merge remote-tracking branch 'origin/wjc' into release0123

wxr

2022-04-14 f48b20ee2ed48652ff4f0bfcdc2cfb8b9340685c

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

@@ -68,6 +68,7 @@
                        lightSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(lightSwitchView.FLayoutView());


                        ///设备延时iewv
                        DelayView(fLayout, lightSwitchView.frameLayout.Bottom);
                        #endregion
@@ -101,7 +102,7 @@
                        brightnessView.frameLayout.Y = lightSwitchView.frameLayout.Bottom;
                        brightnessView.btnText.TextID = StringId.brightnesLogic;
                        fLayout.AddChidren(brightnessView.FLayoutView());
                        brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        //brightnessView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///设备延时iewv
                        DelayView(fLayout, brightnessView.frameLayout.Bottom);
                        #endregion
@@ -127,15 +128,12 @@
                    break;
                //窗帘
                case SPK.CurtainSwitch:
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        #region 界面
                        ///开关
                        LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
                        curtainSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(curtainSwitchView.FLayoutView());
                        ///设备延时iewv
                        DelayView(fLayout, curtainSwitchView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
@@ -148,6 +146,42 @@
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, curtainSwitchView.btnState, null, null, null);
                        }
                        #endregion
                    }
                    break;
                case SPK.CurtainTrietex:
                case SPK.CurtainRoller:
                    {
                        #region 界面
                        ///开关
                        LogicView.FunTypeView curtainSwitchView = new LogicView.FunTypeView();
                        curtainSwitchView.btnText.TextID = StringId.switchLogic;
                        fLayout.AddChidren(curtainSwitchView.FLayoutView());
                        ///百分比
                        LogicView.FunTypeView crtainPercentumView = new LogicView.FunTypeView();
                        crtainPercentumView.frameLayout.Y = curtainSwitchView.frameLayout.Bottom;
                        crtainPercentumView.btnText.TextID = StringId.percentum;
                        fLayout.AddChidren(crtainPercentumView.FLayoutView());
                        crtainPercentumView.btnState.Text = "5%";//产品经理晓辉要求改的 2021-11-06
                        ///设备延时iewv
                        DelayView(fLayout, crtainPercentumView.frameLayout.Bottom);
                        #endregion
                        #region 点击事件
                        ///开关点击事件
                        curtainSwitchView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            SwitchViewMethod(device, curtainSwitchView.btnState, 3);
                        };
                        ///百分比点击事件
                        crtainPercentumView.btnClick.MouseUpEventHandler += (sender, e) =>
                        {
                            BrightnessMethod(device, crtainPercentumView.btnState, crtainPercentumView.btnText.Text);
                        };
                        if (edit)
                        {
                            //显示编辑之前的设备状态
                            GetEditState(device, index, curtainSwitchView.btnState, crtainPercentumView.btnState, null, null);
                        }
                        #endregion
                    }
@@ -604,8 +638,9 @@
        /// <summary>
        /// 亮度/百分比=功能下一级界面
        /// </summary>
        /// <param name="device"></param>
        /// <param name="button"></param>
        /// <param name="device">设备对象</param>
        /// <param name="button">显示状态对象</param>
        /// <param name="titleName">标题</param>
        private void BrightnessMethod(Entity.Function device, Button button, string titleName)
        {
            #region 界面