请合并，门锁和晾衣架第一版代码

xm

2020-12-10 3aa397ab145382935492b11c1f18c9634e69910b

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

old mode 100755
new mode 100644
@@ -231,6 +231,18 @@
                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;

            }



            //显示文本

            this.txtView.Text = strType;

@@ -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)//窗帘

            {