~wjc/HomeApp.git

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)
			@@ -137,7 +137,7 @@
			this.RefreshDfunctionType();

			//设备改变功能类型的话,主页需要重新刷新
			UserView.UserPage.Instance.RefreshForm = true;
			UserView.UserPage.Instance.RefreshAllForm = true;

			//调用回调函数
			this.FinishSelectEvent?.Invoke(nowSelectNo);
			@@ -194,25 +194,29 @@
			\|\| this.device.Type == DeviceType.DimmableLight)
			{
			//灯光类固定为灯光
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A418");
			strType = infoContent != null ? infoContent.A官方名字 : string.Empty;
			nowSelectNo = 2;
			}
			else if (this.device.Type == DeviceType.WindowCoveringDevice)
			{
			//窗帘固定为遮阳
			strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId100);
			var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A400");
			strType = infoContent != null ? infoContent.A官方名字 : string.Empty;
			nowSelectNo = -1;
			}
			else if (this.device.Type == DeviceType.Thermostat)
			{
			//空调固定为空调
			strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId3600);
			var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A406");
			strType = infoContent != null ? infoContent.A官方名字 : string.Empty;
			nowSelectNo = -1;
			}
			else if (this.device.Type == DeviceType.DoorLock)
			{
			//门锁固定为门锁
			strType = Language.StringByID(R.MyInternationalizationString.uDeviceBelongId2800);
			var infoContent = Common.LocalDevice.Current.GetDeviceModelIdNameInfo("A405");
			strType = infoContent != null ? infoContent.A官方名字 : string.Empty;
			nowSelectNo = -1;
			}
			else if (this.device.Type == DeviceType.FreshAir)
			@@ -225,6 +229,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;
			}

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