~wjc/HomeApp.git

			@@ -40,7 +40,7 @@
			/// </summary>
			private CommonDevice device = null;
			/// <summary>
			/// 当前选择的功能类型索引
			/// 当前选择的功能类型索引 -1:还没有设置过 0:不指定 1:开关 2:灯光 3:插座
			/// </summary>
			private int nowSelectNo = -1;

			@@ -108,17 +108,17 @@

			var form = new BottomItemSelectForm();
			form.CancelCallEvent = true;//允许取消
			form.AddForm(title, listText, nowSelectNo);
			form.AddForm(title, listText, nowSelectNo - 1);
			form.FinishSelectEvent += (selectNo) =>
			{
			if (selectNo == nowSelectNo)
			if (selectNo == nowSelectNo - 1)
			{
			//选择的是相同的
			return;
			}
			//-1:选择取消
			this.Text = selectNo == -1 ? string.Empty : listText[selectNo];
			nowSelectNo = selectNo;
			nowSelectNo = selectNo + 1;

			//记录起当前选择的功能类型
			this.RefreshDfunctionType();
			@@ -145,28 +145,34 @@
			var myFunType = this.device.DfunctionType;
			//功能类型的翻译名字
			string strType = string.Empty;
			if (myFunType == DeviceFunctionType.A灯光)

			if (this.device.DfunctionType == DeviceFunctionType.A不指定)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			nowSelectNo = 1;
			nowSelectNo = 0;
			}
			else if (this.device.DfunctionType == DeviceFunctionType.A开关)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSwitch);
			nowSelectNo = 0;
			nowSelectNo = 1;
			}
			else if (myFunType == DeviceFunctionType.A灯光)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			nowSelectNo = 2;
			}
			else if (this.device.DfunctionType == DeviceFunctionType.A插座)
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
			nowSelectNo = 2;
			nowSelectNo = 3;
			}

			if (this.device.Type == DeviceType.ColorDimmableLight
			\|\| this.device.Type == DeviceType.ColorTemperatureLight
			\|\| this.device.Type == DeviceType.DimmableLight)
			{
			//灯光类固定为灯光
			strType = Language.StringByID(R.MyInternationalizationString.uLight);
			nowSelectNo = 1;
			nowSelectNo = 2;
			}
			else if (this.device.Type == DeviceType.WindowCoveringDevice)
			{
			@@ -223,6 +229,7 @@
			\|\| this.device.Type == DeviceType.Thermostat//空调
			\|\| this.device.Type == DeviceType.FreshAir//新风
			\|\| this.device.Type == DeviceType.PMSensor //PM2.5
			\|\| this.device.Type == DeviceType.ColorTemperatureLight //色温灯
			\|\| this.device.Type == DeviceType.WindowCoveringDevice)//窗帘
			{
			return true;
			@@ -253,7 +260,7 @@
			/// </summary>
			private void RefreshDfunctionType()
			{
			if (this.nowSelectNo == 0)
			if (this.nowSelectNo == 1)
			{
			this.device.DfunctionType = DeviceFunctionType.A开关;
			if (this.device.IsCustomizeImage == false)
			@@ -262,7 +269,7 @@
			this.device.IconPath = "Device/Switch.png";
			}
			}
			else if (this.nowSelectNo == 1)
			else if (this.nowSelectNo == 2)
			{
			this.device.DfunctionType = DeviceFunctionType.A灯光;
			if (this.device.IsCustomizeImage == false)
			@@ -271,7 +278,7 @@
			this.device.IconPath = "Device/Light.png";
			}
			}
			else if (this.nowSelectNo == 2)
			else if (this.nowSelectNo == 3)
			{
			this.device.DfunctionType = DeviceFunctionType.A插座;
			if (this.device.IsCustomizeImage == false)
			@@ -282,7 +289,7 @@
			}
			else
			{
			this.device.DfunctionType = DeviceFunctionType.A未定义;
			this.device.DfunctionType = DeviceFunctionType.A不指定;
			if (this.device.IsCustomizeImage == false)
			{
			//重新设置图片