~wjc/HomeApp.git

			@@ -17,7 +17,7 @@
			/// <summary>
			/// 列表控件
			/// </summary>
			private VerticalListControl listview = null;
			private FrameListControl listview = null;
			/// <summary>
			/// 当前选择的设备
			/// </summary>
			@@ -42,6 +42,10 @@
			/// 设备具体类型的信息
			/// </summary>
			private DeviceEnumInfo deviceEnumInfo = null;
			/// <summary>
			/// 信息编辑控件
			/// </summary>
			private InformationEditorControl tableContr = null;

			#endregion

			@@ -76,22 +80,22 @@
			//清空bodyFrame
			this.ClearBodyFrame();

			var listBackControl = new VerticalFrameControl();
			listBackControl.Height = bodyFrameLayout.Height;
			bodyFrameLayout.AddChidren(listBackControl);

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

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

			//初始化桌布完成
			tableContr.FinishInitControl(bodyFrameLayout, this.listview);
			tableContr = null;
			this.InitDeviceEpointIcon(listBackControl);

			//保存
			var btnFinish = new BottomClickButton();
			btnFinish.TextID = R.MyInternationalizationString.uSave;
			bodyFrameLayout.AddChidren(btnFinish);
			btnFinish.ButtonClickEvent += async (sender, e) =>
			btnFinish.ButtonClickEvent += (sender, e) =>
			{
			//记录起当前正在操作的回路名字
			dicDeviceSaveName[nowSelectDevice.DeviceEpoint] = btnDeviceName.Text.Trim();
			@@ -110,7 +114,7 @@
			if (oldName != newName)
			{
			//设备名称修改
			var result = await Common.LocalDevice.Current.ReName(device, newName);
			var result = Common.LocalDevice.Current.ReName(device, newName);
			if (result == false)
			{
			//关闭
			@@ -144,7 +148,7 @@
			listview.AddChidren(btnDeviceName);
			btnDeviceName.InitControl();
			btnDeviceName.AddBottomLine();
			btnDeviceName.txtInput.FinishInputEvent += async () =>
			btnDeviceName.txtInput.FinishInputEvent += () =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceEpointName(nowSelectDevice);
			if (btnDeviceName.Text.Trim() == string.Empty)
			@@ -155,7 +159,7 @@
			if (oldName != btnDeviceName.Text.Trim())
			{
			//设备名称修改
			var result = await Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			var result = Common.LocalDevice.Current.ReName(nowSelectDevice, btnDeviceName.Text.Trim());
			if (result == false)
			{
			return;
			@@ -175,7 +179,7 @@
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			//变更房间
			Common.Room.CurrentRoom.ChangedRoom(nowSelectDevice, roomKeys);
			HdlRoomLogic.Current.ChangedRoom(nowSelectDevice, roomKeys);
			};

			//3路继电器或者1路调光器第七回路的配置信息
			@@ -210,6 +214,8 @@
			this.AddBindRow(listRelayInfo7);
			//添加背光灯行
			this.AddBackLightRow();
			//初始化桌布完成
			tableContr.FinishInitControl();
			}

			#endregion
			@@ -221,6 +227,11 @@
			/// </summary>
			private void InitTopRightMenu()
			{
			//检测此回路是否拥有定位功能
			if (Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice) == false)
			{
			return;
			}
			var btnIcon = new MostRightIconControl(69, 69);
			btnIcon.UnSelectedImagePath = "Item/More.png";
			topFrameLayout.AddChidren(btnIcon);
			@@ -241,11 +252,11 @@
			string deviceMenu = string.Empty;
			//检测此回路是否拥有定位功能
			bool canTest = Common.LocalDevice.Current.DeviceIsCanFixedPosition(nowSelectDevice);
			if (canTest == true)
			{
			menuCount = 2;
			}
			var frame = new TopRightMenuControl(menuCount);
			//if (canTest == true)
			//{
			// menuCount = 2;
			//}
			var frame = new TopRightMenuControl(menuCount, 1);
			if (canTest == true)
			{
			//定位
			@@ -258,10 +269,10 @@
			}

			//删除
			deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
			frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
			{
			});
			//deviceMenu = Language.StringByID(R.MyInternationalizationString.uDelete);
			//frame.AddRowMenu(deviceMenu, "Item/DeleteIcon2.png", "Item/DeleteIcon2Selected.png", () =>
			//{
			//});
			}

			#endregion
			@@ -312,9 +323,9 @@
			//标题:选择干接点功能
			var title = Language.StringByID(R.MyInternationalizationString.uSelectDryContactFunction);

			var form = new BottomDialogSelectForm();
			var form = new BottomItemSelectForm();
			form.AddForm(title, listText, nowSelectNo);
			form.FinishSelectEvent += async (selectNo) =>
			form.FinishSelectEvent += (selectNo) =>
			{
			if (selectNo == nowSelectNo)
			{
			@@ -328,7 +339,7 @@
			//选择的是传感器输入
			value = 65535;
			}
			var result = await HdlDevicePanelLogic.Current.EditorDryContactFunction((Panel)nowSelectDevice, value);
			var result = HdlDevicePanelLogic.Current.EditorDryContactThirdFunction((Panel)nowSelectDevice, value);
			if (result == true)
			{
			//重新初始化菜单行,隐藏或者开放绑定目标菜单
			@@ -424,7 +435,7 @@
			/// <summary>
			/// 初始化设备回路图标
			/// </summary>
			private void InitDeviceEpointIcon()
			private void InitDeviceEpointIcon(VerticalFrameControl listBackControl)
			{
			//获取按组分配的设备
			var listIcon = this.GetAllDeviceGroup();
			@@ -434,9 +445,8 @@
			frameBorder.Gravity = Gravity.CenterHorizontal;
			frameBorder.Width = Application.GetRealWidth(887);
			frameBorder.Height = Application.GetRealHeight(423);
			frameBorder.BorderWidth = (uint)Application.GetMinRealAverage(3);
			frameBorder.BorderColor = 0xffd0d0d0;
			bodyFrameLayout.AddChidren(frameBorder);
			frameBorder.Radius = (uint)Application.GetRealHeight(6);
			listBackControl.frameTable.AddChidren(frameBorder);

			var frameBack = new FrameLayout();
			frameBack.Height = frameBorder.Height;
			@@ -446,7 +456,7 @@
			//需要滑动控件
			var listControl = new VerticalScrolViewLayout();
			listControl.Height = frameBorder.Height;
			bodyFrameLayout.AddChidren(listControl);
			listBackControl.frameTable.AddChidren(listControl);

			listControl.AddChidren(frameBack);
			}
			@@ -460,8 +470,8 @@
			for (int i = 0; i < listIcon.Count; i++)
			{
			var frame = new FrameLayout();
			frame.Width = Application.GetMinRealAverage(887);
			frame.Height = Application.GetMinRealAverage(124);
			frame.Width = this.GetPictrueRealSize(887);
			frame.Height = this.GetPictrueRealSize(124);
			frameBack.AddChidren(frame);
			//初始化一行设备图标
			this.InitDeviceIconFrame(frame, listIcon[i], ref index);
			@@ -472,14 +482,14 @@
			}
			else
			{
			frame.Y = Application.GetMinRealAverage(58) + (frameBack.ChildrenCount - 1) * (frame.Height + Application.GetMinRealAverage(60));
			frame.Y = this.GetPictrueRealSize(58) + (frameBack.ChildrenCount - 1) * (frame.Height + this.GetPictrueRealSize(60));
			}
			}

			if (listIcon.Count > 2)
			{
			//计算真实高度
			int realHeight = Application.GetMinRealAverage(58 + 58) + (frameBack.ChildrenCount - 1) * Application.GetMinRealAverage(124 + 60);
			int realHeight = this.GetPictrueRealSize(58 + 58) + (frameBack.ChildrenCount - 1) * this.GetPictrueRealSize(124 + 60);
			if (realHeight > frameBack.Height)
			{
			//变更高度
			@@ -499,7 +509,7 @@
			{
			NormalViewControl btnTemp = null;
			//间距
			int space = Application.GetMinRealAverage(84);
			int space = this.GetPictrueRealSize(84);
			int defultXX = (frame.Width - frame.Height * listDevice.Count - (listDevice.Count - 1) * space) / 2;
			for (int i = 0; i < listDevice.Count; i++)
			{
			@@ -508,7 +518,7 @@
			btnIcon.Name = "btn" + listDevice[i].DeviceEpoint;
			btnIcon.X = defultXX + i * (frame.Height + space);
			btnIcon.Radius = (uint)frame.Height / 2;
			btnIcon.BorderWidth = (uint)Application.GetMinRealAverage(6);
			btnIcon.BorderWidth = 2;
			btnIcon.BorderColor = 0xff979797;
			btnIcon.TextAlignment = TextAlignment.Center;
			btnIcon.TextColor = UserCenterColor.Current.TextGrayColor3;