Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

xm

2020-05-13 99da2604f81af29afc6b3c6f4f128b4e5a8a5649

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

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

        /// <summary>

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

        /// </summary>

@@ -244,7 +244,7 @@
                this.SetFanComand(15);
            }
        }
        #endregion 
        #endregion

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


@@ -286,7 +286,7 @@
        }
        #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)

@@ -359,7 +359,7 @@
                this.listControl[5].IsSelected = false;
                this.listControl[6].IsSelected = false;
                this.listControl[5].Enable = true;

                //设置状态文字 
                //设置状态文字

                this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));

                return;
            }