~wjc/HomeApp.git

old mode 100644 new mode 100755

			@@ -87,12 +87,20 @@

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

			//初始化设备回路图标
			this.InitDeviceEpointIcon(listBackControl);

			//保存

			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);

			//保存
			var btnFinish = new BottomClickButton();
			btnFinish.TextID = R.MyInternationalizationString.uSave;
			bodyFrameLayout.AddChidren(btnFinish);
			@@ -316,8 +324,8 @@
			{
			strType = Language.StringByID(R.MyInternationalizationString.uSocket1);
			nowSelectNo = 2;
			}

			}

			var btnFunction = new FrameCaptionViewControl(caption, strType, listview.rowSpace / 2);
			btnFunction.UseClickStatu = false;
			listview.AddChidren(btnFunction);
			@@ -379,18 +387,18 @@
			}

			//如果是新风
			if (nowSelectDevice.Type == DeviceType.FreshAir)
			{
			//功能类型
			string caption = Language.StringByID(R.MyInternationalizationString.uFunctionType);
			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();
			}
			btnFunction.AddBottomLine();
			}
			}

			#endregion
			@@ -428,7 +436,7 @@
			else
			{
			//不需要滑动控件
			frameBorder.AddChidren(frameBack);
			frameBorder.AddChidren(frameBack);
			}

			int index = 0;
			@@ -443,16 +451,19 @@

			if (listIcon.Count == 1)
			{
			frame.Gravity = Gravity.CenterVertical;

			//如果是新风
			if (deviceObj.Type == DeviceType.FreshAir)
			{
			frame.RemoveFromParent();
			frameBack.BackgroundImagePath = "FreshAir/FreshAirRealDevicePic.png";
			frameBack.Width = Application.GetMinRealAverage(878);
			frameBack.Height = Application.GetMinRealAverage(354);
			frameBack.Gravity = Gravity.Center;
			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
			@@ -466,15 +477,15 @@
			//计算真实高度
			int realHeight = this.GetPictrueRealSize(58 + 58);//上下间距
			realHeight += frameBack.ChildrenCount * this.GetPictrueRealSize(124);//圆圈高度
			realHeight += (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(60);//圆圈间距
			realHeight += (frameBack.ChildrenCount-1) * this.GetPictrueRealSize(60);//圆圈间距
			if (realHeight > frameBack.Height)
			{
			//变更高度
			frameBack.Height = realHeight;
			}
			}
			}

			}

			/// <summary>
			/// 初始化一行设备图标
			/// </summary>
			@@ -515,8 +526,6 @@
			//初始化菜单行
			this.DeviceEpointSelectEvent(btnTemp, null);
			}


			}

			/// <summary>