请合并最新多功能面板代码

xm

2020-07-21 9a4b76398009cf76c508d61f7e48fb6f5cb7ac2d

 ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceFreshAirDetailCardForm.cs

old mode 100644
new mode 100755
@@ -11,7 +11,7 @@
    /// </summary>
    public class DeviceFreshAirDetailCardForm : DeviceDetailCardCommonForm
    {
        #region ■ 变量声明___________________________

        #region ■ 变量声明___________________________ 
        /// <summary>

        /// 界面上可以操作的控件

        /// </summary>

@@ -64,8 +64,8 @@
            frameWhiteBack.AddChidren(frameAcBack);

            //新风自动Layout【为了扩大点击范围】
            var autoFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);

            autoFrameLayout.X = Application.GetRealWidth(275 - 20);

            var autoFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);
            autoFrameLayout.X = Application.GetRealWidth(275 - 20);
            autoFrameLayout.Y = Application.GetRealHeight(821 - 20);
            frameWhiteBack.AddChidren(autoFrameLayout);
            autoFrameLayout.ButtonClickEvent += HandlerAuto;
@@ -79,9 +79,9 @@
            btnAuto.IsBold = false;
            btnAuto.TextAlignment = TextAlignment.Center;
            frameWhiteBack.AddChidren(btnAuto);




            this.listControl.Add(btnAuto);

            btnAuto.ButtonClickEvent += HandlerAuto;
            btnAuto.ButtonClickEvent += HandlerAuto;


            //自动下划线（第2个，listControl【1】）
            var btnAutoLine = new NormalViewControl(72, 12, true);

@@ -94,8 +94,8 @@
            btnAutoLine.ButtonClickEvent += HandlerAuto;

            //新风手动Layout【为了扩大点击范围】
            var manualFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);

            manualFrameLayout.X = Application.GetRealWidth(488 - 20);

            var manualFrameLayout = new NormalViewControl(213 + 40, 63 + 80, true);
            manualFrameLayout.X = Application.GetRealWidth(488 - 20);
            manualFrameLayout.Y = Application.GetRealHeight(821 - 20);
            frameWhiteBack.AddChidren(manualFrameLayout);
            manualFrameLayout.ButtonClickEvent += HandlerManual;
@@ -110,7 +110,7 @@
            btnManual.TextAlignment = TextAlignment.Center;
            frameWhiteBack.AddChidren(btnManual);

            this.listControl.Add(btnManual);

            btnManual.ButtonClickEvent += HandlerManual;
            btnManual.ButtonClickEvent += HandlerManual;


            //手动下划线（第4个，listControl【3】）
            var btnManualLine = new NormalViewControl(72, 12, true);

@@ -135,7 +135,7 @@
                if (freshAirDev.currentFanStatus == 0)
                {
                    return;
                }

                }
                if (freshAirDev.currentFanMode == 5)
                {
                    var msgContr = new ShowMsgControl(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.AutoModeForbiddenOperate));
@@ -206,7 +206,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void HandlerAuto(object sender, MouseEventArgs e)

        private void HandlerAuto(object sender, MouseEventArgs e)
        {
            if (freshAirDev.currentFanStatus == 0)
            {
@@ -228,7 +228,7 @@
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void HandlerManual(object sender, MouseEventArgs e)

        private void HandlerManual(object sender, MouseEventArgs e)
        {
            if (freshAirDev.currentFanStatus == 0)
            {
@@ -244,7 +244,7 @@
                this.SetFanComand(15);
            }
        }
        #endregion
        #endregion 

        #region ■ 是否获取网关反馈的结果_____________


@@ -277,16 +277,16 @@
                    }

                }

            }

            this.listControl[0].Enable = true;

            this.listControl[2].Enable = true;

            this.listControl[4].Enable = true;

            this.listControl[5].Enable = true;

            this.listControl[6].Enable = true;

            this.listControl[0].Enable = true;
            this.listControl[2].Enable = true;
            this.listControl[4].Enable = true;
            this.listControl[5].Enable = true;
            this.listControl[6].Enable = true;
            return false;

        }
        #endregion

        #region ■ 设置方法
        #region ■ 设置方法 
        /// <summary>
        ///命令
        ///0:Off
@@ -295,7 +295,7 @@
        ///4:On
        ///5:Auto
        /// 15:Manual
        /// </summary>

        /// </summary> 
        private void SetFanComand(int command)

        {

            //检测是否获取网关反馈的结果,如果网关没有回复,则会弹出消息

@@ -343,7 +343,7 @@
                this.listControl[5].Enable = true;
                //打开
                this.listControl[5].IsSelected = true;
                //设置状态文字
                //设置状态文字 
                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
            }

            if (freshAirDev.currentFanStatus == 0)

@@ -357,9 +357,9 @@
                this.listControl[3].Visible = false;
                this.listControl[4].IsSelected = false;
                this.listControl[5].IsSelected = false;
                this.listControl[6].IsSelected = false;
                this.listControl[5].Enable = true;

                //设置状态文字

                this.listControl[6].IsSelected = false;

                this.listControl[5].Enable = true;
                //设置状态文字 
                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));

                return;
            }