请合并代码，完成晾衣架最终功能。

xm

2020-12-14 d6fb0646531172f23648441c224cdcccd721b894

 ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/RowLayoutControls/DeviceFunctionTypeRowControl.cs

old mode 100755
new mode 100644
@@ -30,7 +30,7 @@
        /// </summary>

        public bool SetCanSelect

        {

            set 
            set
            {

                m_SetCanSelect = value;

            }

@@ -74,7 +74,7 @@
                || this.device.Type == DeviceType.OnOffOutput)

            {

                //没被强制干涉的话

                if (m_SetCanSelect == true)

                if (m_SetCanSelect == true && Common.Config.Instance.Home.IsShowTemplate == false)

                {

                    this.UseClickStatu = true;

                    //右箭头

@@ -127,8 +127,8 @@
                HdlThreadLogic.Current.RunThread(() =>

                {

                    //设置功能类型到网关

                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);

                    
                    var result = Common.LocalDevice.Current.SendDeviceFunctionTypeToGateway(this.device, (DeviceFunctionType)nowSelectNo);

                    HdlThreadLogic.Current.RunMain(() =>

                    {

                        if (result == true)

@@ -230,6 +230,18 @@
                //PM2.5传感器固定为 空气质量

                strType = Language.StringByID(R.MyInternationalizationString.AirQuality);

                nowSelectNo = -1;

            }
            else if (this.device.Type == DeviceType.Airer)

            {

                //晾衣架

                strType = Language.StringByID(R.MyInternationalizationString.AirerFun);

                nowSelectNo = -1;

            }
            else if (this.device.Type == DeviceType.PMSensor)

            {

                //空气质量传感器 环境  
                strType = Language.StringByID(R.MyInternationalizationString.Envoronment);

                nowSelectNo = -1;

            }



            //显示文本

@@ -256,6 +268,7 @@
                || this.device.Type == DeviceType.Thermostat//空调

                || this.device.Type == DeviceType.FreshAir//新风

                || this.device.Type == DeviceType.PMSensor //PM2.5

                || this.device.Type == DeviceType.Airer//晾衣架

                || this.device.Type == DeviceType.ColorTemperatureLight //色温灯

                || this.device.Type == DeviceType.WindowCoveringDevice)//窗帘

            {