~wjc/HomeApp.git

old mode 100755 new mode 100644

			@@ -30,7 +30,7 @@
			/// </summary>
			public bool SetCanSelect
			{
			set
			set
			{
			m_SetCanSelect = value;
			}
			@@ -52,7 +52,7 @@
			/// 设备功能类型的自定义行控件(选择功能之后,无条件直接变更类型)
			/// </summary>
			/// <param name="i_device">设备的对象</param>
			/// <param name="i_ChidrenYaxis">子控件Y轴偏移量(真实值,有些界面需要这种特殊操作)</param>
			/// <param name="i_ChidrenYaxis">子控件Y轴偏移量(【列表控件的rowSpace/2】即可,不懂默认为0即可)</param>
			public DeviceFunctionTypeRowControl(CommonDevice i_device, int i_ChidrenYaxis = 0) : base("", "", i_ChidrenYaxis)
			{
			this.device = i_device;
			@@ -178,10 +178,16 @@
			strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);
			nowSelectNo = -1;
			}
			else if (this.device.Type == DeviceType.DoorLock)
			else if (this.device.Type == DeviceType.FreshAir)
			{
			//新风固定为新风
			strType = Language.StringByID(R.MyInternationalizationString.FreshAir);
			nowSelectNo = -1;
			}
			else if (this.device.Type == DeviceType.PMSensor)
			{
			//PM2.5传感器固定为空气质量
			strType = Language.StringByID(R.MyInternationalizationString.AirQuality);
			nowSelectNo = -1;
			}

			@@ -208,6 +214,7 @@
			\|\| this.device.Type == DeviceType.OnOffOutput//继电器
			\|\| this.device.Type == DeviceType.Thermostat//空调
			\|\| this.device.Type == DeviceType.FreshAir//新风
			\|\| this.device.Type == DeviceType.PMSensor //PM2.5
			\|\| this.device.Type == DeviceType.WindowCoveringDevice)//窗帘
			{
			return true;