~wjc/HomeApp.git

			@@ -42,15 +42,6 @@
			public void ShowForm(string deviceMac)
			{
			this.listNewDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
			//排序
			this.listNewDevice.Sort((obj1, obj2) =>
			{
			if (obj1.DeviceEpoint > obj2.DeviceEpoint)
			{
			return 1;
			}
			return -1;
			});

			this.listDeviceType.Clear();
			foreach (var device in listNewDevice)
			@@ -83,7 +74,8 @@
			this.ClearBodyFrame();

			//初始化桌布
			this.InitFrameTable();
			var tableContr = new InformationEditorControl();
			this.listview = tableContr.InitControl(bodyFrameLayout, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 369, 1368);

			//图片
			var btnPic = new DeviceInfoIconControl(listNewDevice[0]);
			@@ -103,14 +95,14 @@
			btnNote.txtInput.FinishInputEvent += () =>
			{
			string oldName = Common.LocalDevice.Current.GetDeviceMacName(listNewDevice[0]);
			if (btnNote.Text.Trim() == string.Empty)
			if (btnNote.Text == string.Empty)
			{
			btnNote.Text = oldName;
			}
			if (oldName != btnNote.Text.Trim())
			if (oldName != btnNote.Text)
			{
			//修改名字
			this.DeviceReName(btnNote.Text.Trim(), false);
			this.DeviceReName(btnNote.Text, false);
			}
			};

			@@ -124,17 +116,45 @@
			//划线
			btnType.AddBottomLine();

			//所属区域
			var rowBeloneArea = new BelongAreaControl(listview.rowSpace / 2);
			listview.AddChidren(rowBeloneArea);
			rowBeloneArea.InitControl(Language.StringByID(R.MyInternationalizationString.uBelongArea), this.listNewDevice);
			//底线
			rowBeloneArea.AddBottomLine();

			var listCheck = new List<string>();
			rowBeloneArea.SelectRoomEvent += (roomKeys) =>
			{
			foreach (var device in this.listNewDevice)
			{
			var room = Room.CurrentRoom.GetRoomByDevice(device);
			string mainKeys = LocalDevice.Current.GetDeviceMainKeys(device);
			if (room == null)
			{
			//这里有点特殊,如果回路没有设置有区域的时候,才设置
			listCheck.Add(mainKeys);
			Room.CurrentRoom.ChangedRoom(device, roomKeys);
			}
			else if (listCheck.Contains(mainKeys) == true)
			{
			//如果这个回路之前都还没有区域,在本界面还没有关闭之前,可以无条件随便变更
			Room.CurrentRoom.ChangedRoom(device, roomKeys);
			}
			}
			//保存设备房间索引
			Common.LocalDevice.Current.SaveRealDeviceRoomId(this.listNewDevice, roomKeys);
			};

			//添加全部菜单
			this.AddAllMenuRow();

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

			//保存
			var btnFinish = new BottomClickButton();
			//借用Y轴坐标(让这个区域不能点击菜单)
			var frameBack = new FrameLayout();
			frameBack.Y = btnFinish.Yaxis;
			frameBack.Height = bodyFrameLayout.Height - btnFinish.Yaxis;
			bodyFrameLayout.AddChidren(frameBack);

			btnFinish.TextID = R.MyInternationalizationString.uSave;
			bodyFrameLayout.AddChidren(btnFinish);
			btnFinish.ButtonClickEvent += (sender, e) =>
			@@ -155,53 +175,6 @@
			this.CloseForm();
			}
			};

			var realHeight = listview.GetChildren(0).Height * listview.ChildrenCount;
			if (bodyFrameLayout.Height - btnFinish.Yaxis + realHeight > listview.Height)
			{
			//促使被挡住的菜单能够向上滑动
			var frameTemp = new FrameLayout();
			frameTemp.Height = frameBack.Height + Application.GetRealHeight(115);
			listview.AddChidren(frameTemp);
			}
			}

			#endregion

			#region ■ 初始化桌布_________________________

			/// <summary>
			/// 初始化桌布
			/// </summary>
			private void InitFrameTable()
			{
			//弧度的圆的一半的高度(固定)
			int halfRoundHeigth = Application.GetRealHeight(116) / 2;
			//弧度的圆
			var btnRound = new NormalViewControl(bodyFrameLayout.Width, halfRoundHeigth * 2, false);
			btnRound.Y = Application.GetRealHeight(369);
			btnRound.BackgroundColor = UserCenterColor.Current.White;
			btnRound.Radius = (uint)halfRoundHeigth;
			bodyFrameLayout.AddChidren(btnRound);
			//明细列表的桌布，白色背景(覆盖弧度的圆的半边)
			var detailBackFrame = new FrameLayout();
			detailBackFrame.Y = btnRound.Bottom - btnRound.Height / 2;
			detailBackFrame.Height = Application.GetRealHeight(1368);//高度就是要它超过
			detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
			bodyFrameLayout.AddChidren(detailBackFrame);

			//信息编辑
			var btnTile = new NormalViewControl(800, 60, true);
			btnTile.X = ControlCommonResourse.XXLeft;
			btnTile.TextSize = 15;
			btnTile.TextColor = UserCenterColor.Current.TextColor2;
			btnTile.TextID = R.MyInternationalizationString.uInfoEditor;
			detailBackFrame.AddChidren(btnTile);

			this.listview = new VerticalListControl(12);
			listview.Y = btnTile.Bottom + Application.GetRealHeight(17);
			listview.Height = Application.GetRealHeight(1368) - halfRoundHeigth - btnTile.Bottom - Application.GetRealHeight(17);
			detailBackFrame.AddChidren(listview);
			}

			#endregion
			@@ -267,8 +240,13 @@
			btnRow.AddRightArrow();
			//底线
			btnRow.AddBottomLine();
			var doorLock = this.listNewDevice[0] as ZigBee.Device.DoorLock;
			btnRow.ButtonClickEvent += (sender, e) =>
			{
			var userManagement = new Shared.Phone.UserCenter.DoorLock.UserManagement(doorLock);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(userManagement);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			userManagement.Show();
			};
			}
			}
			@@ -291,17 +269,27 @@
			btnRow.UseClickStatu = false;
			listview.AddChidren(btnRow);
			btnRow.AddLeftCaption(caption, 600);
			//向右图标
			var btnswitch = btnRow.AddMostRightEmptyIcon(104, 63);
			btnRow.ChangedChidrenBindMode(btnswitch, ChidrenBindMode.NotBind);
			btnswitch.UnSelectedImagePath = "Item/Switch.png";
			btnswitch.SelectedImagePath = "Item/SwitchSelected.png";
			//开关图标
			var btnswitch = btnRow.AddMostRightSwitchIcon();
			//底线
			btnRow.AddBottomLine();
			if (string.IsNullOrEmpty(ZigBee.Device.DoorLock.RemoteUnlockPassword) == false)
			{
			btnswitch.IsSelected = true;
			}

			var doorLock= (ZigBee.Device.DoorLock)listNewDevice[0];
			btnswitch.ButtonClickEvent += (sender, e) =>
			{
			btnswitch.IsSelected = !btnswitch.IsSelected;
			if (btnswitch.IsSelected == true)
			{
			btnswitch.IsSelected = false;
			ZigBee.Device.DoorLock.RemoteUnlockPassword = string.Empty;
			return;
			}
			var frame = new DoorLock.DoorLockCommonLayout();
			frame.RemotePasswordDialog((ZigBee.Device.DoorLock)listNewDevice[0], btnswitch.btnIcon);
			frame = null;
			};
			}
			}
			@@ -510,7 +498,7 @@
			/// <param name="oTADevice">ota设备</param>
			private void SetDeviceVersionInfo(PicViewControl btnNewVersion, OTADevice oTADevice)
			{
			new System.Threading.Thread(async () =>
			HdlThreadLogic.Current.RunThread(async () =>
			{
			bool receiveImageInfo = false;
			//设置设备全部的镜像信息
			@@ -548,8 +536,7 @@
			}
			});
			}
			})
			{ IsBackground = true }.Start();
			});
			}

			#endregion