~wjc/HomeApp.git

			@@ -87,7 +87,15 @@

			//初始化桌布
			this.tableContr = new InformationEditorControl();
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);

			if (this.deviceObj.Type == DeviceType.FreshAir)
			{
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1028);
			}
			else
			{
			this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uDeviceEditor), 1128);
			}

			//初始化设备回路图标
			this.InitDeviceEpointIcon(listBackControl);
			@@ -149,6 +157,10 @@
			else if (device.DfunctionType == DeviceFunctionType.A灯光)
			{
			device.IconPath = "Device/Light.png";
			}
			else
			{
			device.IconPath = "Device/RelayEpoint.png";
			}
			device.ReSave();
			}
			@@ -338,10 +350,19 @@
			var title = Language.StringByID(R.MyInternationalizationString.uSelectFunctionType);

			var form = new BottomItemSelectForm();
			form.CancelCallEvent = true;//允许取消
			form.AddForm(title, listText, nowSelectNo);
			form.FinishSelectEvent += (selectNo) =>
			{
			btnFunction.Text = listText[selectNo];
			if (selectNo == -1)
			{
			//取消选择
			btnFunction.Text = string.Empty;
			}
			else
			{
			btnFunction.Text = listText[selectNo];
			}
			nowSelectNo = selectNo;
			//记录起当前选择的功能类型
			if (selectNo == 0)
			@@ -352,13 +373,31 @@
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A灯光;
			}
			else
			else if (selectNo == 2)
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A插座;
			}
			else
			{
			dicDeviceFuncType[nowSelectDevice.DeviceEpoint] = DeviceFunctionType.A未定义;
			}
			};
			};
			}
			}

			//如果是新风
			if (nowSelectDevice.Type == DeviceType.FreshAir)
			{
			//功能类型
			string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
			string strType = Language.StringByID(R.MyInternationalizationString.FreshAir);
			var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
			btnFunction.UseClickStatu = false;
			listview.AddChidren(btnFunction);
			btnFunction.InitControl();
			//底线
			btnFunction.AddBottomLine();
			}
			}

			@@ -413,6 +452,19 @@
			if (listIcon.Count == 1)
			{
			frame.Gravity = Gravity.CenterVertical;

			//如果是新风
			if (deviceObj.Type == DeviceType.FreshAir)
			{
			frame.RemoveFromParent();
			frameBorder.Y = Application.GetRealHeight(0);
			frameBorder.Height = Application.GetRealHeight(709);
			frameBack.BackgroundImagePath = "FreshAir/FreshAirRealDevicePic.png";
			frameBack.Width = this.GetPictrueRealSize(878);
			frameBack.Height = this.GetPictrueRealSize(354);
			frameBack.Y = Application.GetRealHeight(153);
			frameBack.Gravity = Gravity.Center;
			}
			}
			else
			{