~wjc/HomeApp.git

			@@ -1,26 +1,14 @@
			using System;
			using System.Collections.Generic;
			using Shared.Common;
			using Shared.Phone.Device.Light;
			using Shared.Phone.UserCenter.Device;
			using ZigBee.Device;
			using static ZigBee.Device.BindObj;
			using static ZigBee.Device.Panel;
			namespace Shared.Phone.UserCenter.DeviceBind
			{
			public class AddDevicePage : BindCommonLayout, ZigBee.Common.IStatus
			public class AddDevicePage : BindCommonLayout
			{
			/// <summary>
			/// 按键模式接收
			/// </summary>
			/// <param name="common">Common.</param>
			public void Changed(CommonDevice common)
			{
			Shared.Application.RunOnMainThread(() =>
			{
			});
			}

			/// 构造函数
			/// </summary>
			/// <param name="doorLock"></param>
			@@ -114,20 +102,20 @@
			{
			RemoveFromParent();
			};
			this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 200 - 58);
			this.btnTitle.Width = Application.GetRealWidth(1080 - 161 - 300);
			this.btnBack.MouseUpEventHandler += eHandlerBack;
			this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
			this.MidFrameLayout(this);

			var btnAddFrameLayout = new FrameLayout
			{
			X = Application.GetRealWidth(830),
			X = Application.GetRealWidth(619),
			};
			this.titleFrameLayout.AddChidren(btnAddFrameLayout);

			btnFloorText = new Button
			{
			Width = Application.GetRealWidth(110),
			Width = Application.GetRealWidth(300 - 69 - 58),
			X = Application.GetRealWidth(15),
			Text = Language.StringByID(R.MyInternationalizationString.FirstFloor),
			TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
			@@ -137,32 +125,40 @@
			};
			btnAddFrameLayout.AddChidren(btnFloorText);

			var btnBindDownFrameLayout = new FrameLayout
			{
			Width = Application.GetMinReal(69 + 58),
			X = Application.GetRealWidth(300 - 69 - 58),
			};
			btnAddFrameLayout.AddChidren(btnBindDownFrameLayout);

			var btnBindDown = new Button
			{
			Height = Application.GetRealHeight(69),
			Width = Application.GetRealWidth(69),
			X = Application.GetRealWidth(200 - 77),
			Height = Application.GetMinReal(69),
			Width = Application.GetMinReal(69),
			UnSelectedImagePath = "BindPic/BindDown.png",
			Gravity = Gravity.CenterVertical,
			};
			btnAddFrameLayout.AddChidren(btnBindDown);
			btnBindDownFrameLayout.AddChidren(btnBindDown);

			if (Common.Config.Instance.Home.FloorDics.Count == 0)
			{
			btnBindDown.Visible = false;
			}

			btnBindDown.MouseDownEventHandler += (sender, e) =>
			EventHandler<MouseEventArgs> eHandlerBindDown = (sender, e) =>
			{
			SideslipFramelayout();
			};
			btnBindDown.MouseDownEventHandler += eHandlerBindDown;
			btnBindDownFrameLayout.MouseDownEventHandler += eHandlerBindDown;
			if (Common.Config.Instance.Home.FloorDics.Count == 0)
			{
			btnAddFrameLayout.Width = 0;
			}
			else
			{
			btnAddFrameLayout.Width = Application.GetRealWidth(200);
			btnAddFrameLayout.Width = Application.GetRealWidth(300);
			}
			MidFrameLayoutContent(btnFloorText);
			}
			@@ -238,8 +234,8 @@
			}
			}
			else
			{
			// 获取楼层对应对房间
			{
			// 获取楼层对应对房间
			var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
			foreach (var room in listAllRoom)
			{
			@@ -358,15 +354,17 @@
			continue;
			}
			roomTempList.Add(room);
			if (roomTempList.Count != 0)
			{
			curRoom = roomTempList[0];
			}
			}

			for (int i = 0; i < roomTempList.Count; i++)
			{
			var room = roomTempList[i];
			curRoom = roomTempList[0];

			var btnRoomFrameLayout = new FrameLayout
			{
			Height = Application.GetRealHeight(159),
			Width = Application.GetRealWidth(255),
			Height = Application.GetMinReal(159),
			Width = Application.GetMinReal(255),
			Y = Application.GetRealHeight(23),
			X = Application.GetRealWidth(5),
			BackgroundImagePath = "Item/RoomIconBackground.png",
			@@ -395,6 +393,18 @@
			curentOldRoom = btnRoom;
			curentOldRoomFrameLayout = btnRoomFrameLayout;
			}
			if (index == roomTempList.Count - 1 && index > 3)
			{
			var btnRoomFrameLayoutEmpty = new FrameLayout
			{
			Height = Application.GetMinReal(159),
			Width = Application.GetMinReal(50),
			Y = Application.GetRealHeight(23),
			X = Application.GetRealWidth(5),
			BorderWidth = 1,
			};
			btnHorizontalScrolViewLayout.AddChidren(btnRoomFrameLayoutEmpty);
			}
			EventHandler<MouseEventArgs> eHandlerRoom = (sender, e) =>
			{
			if (!btnRoom.IsSelected)
			@@ -420,7 +430,6 @@
			curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
			}
			curRoom = room;
			currentKey.RoomId = room.Id;
			RefreshDeviceList(curRoom);
			if (curTypeDeviceList.Count == 0)
			{
			@@ -457,7 +466,7 @@
			/// <returns></returns>
			List<CommonDevice> GetALlDispalyRoomDeviceList()
			{
			currentKeyAllRoomDeviceList.Clear();
			currentKeyAllRoomDeviceList.Clear();
			var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
			switch (curDeviceBindType)
			{
			@@ -496,7 +505,7 @@
			if (r.IsLove == true)
			{
			continue;
			}
			}
			foreach (var deviceKeys in r.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			@@ -541,7 +550,7 @@
			}

			/// <summary>
			/// 按键绑定场景表显示
			/// 按键绑定目标表显示
			/// </summary>
			/// <param name="gateway">Gateway.</param>
			/// <param name="key">Key.</param>
			@@ -552,9 +561,9 @@
			switch (curDeviceBindType)
			{
			case "AddSwitch":
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 6));
			@@ -565,10 +574,10 @@
			}
			}
			break;
			case "AddDimmer":
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			case "AddDimmer":
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 8));
			@@ -579,10 +588,10 @@
			}
			}
			break;
			case "AddCurtain":
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			case "AddCurtain":
			foreach (var deviceKeys in curRoom.ListDevice)
			{
			var device = LocalDevice.Current.GetDevice(deviceKeys);
			if (device != null)
			{
			var dev = device.InClusterList.Find(obj => (obj != null) && (obj.InCluster == 258));
			@@ -629,21 +638,24 @@
			TextColor = Shared.Common.ZigbeeColor.Current.TextBlack,
			TextAlignment = TextAlignment.CenterLeft,
			Tag = device.DeviceEpointName,
			Text = Common.LocalDevice.Current.GetDeviceEpointName(device),
			TextSize = 15,
			};
			rowLayout.AddChidren(btnBindName);

			var btnChoose = new Button()
			{
			Width = Application.GetRealWidth(60),
			Height = Application.GetRealHeight(60),
			Width = Application.GetMinReal(60),
			Height = Application.GetMinReal(60),
			X = Application.GetRealWidth(861 + 81),
			Y = Application.GetRealHeight(35),
			SelectedImagePath = "DoorLock/SelectedIcon.png",
			TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
			Visible = false,
			Tag = device.DeviceEpointName,
			Gravity = Gravity.CenterVertical,
			};

			rowLayout.AddChidren(btnChoose);

			var line2 = new Button()
			@@ -701,14 +713,6 @@
			btnBindName.MouseUpEventHandler += hander;
			btnChoose.MouseUpEventHandler += hander;

			if (string.IsNullOrEmpty(device.DeviceEpointName))
			{
			btnBindName.Text = device.DeviceAddr + "_" + device.DeviceEpoint;
			}
			else
			{
			btnBindName.Text = device.DeviceEpointName;
			}
			foreach (var bindedDev in targetList)
			{
			var id = device.DeviceAddr + device.DeviceEpoint;
			@@ -750,8 +754,7 @@

			var sidelipFrameLayout = new FrameLayout()
			{
			Height = Application.GetRealHeight(783),
			Width = Application.GetRealWidth(449),
			Width = Application.GetMinReal(449),
			Y = Application.GetRealHeight(161),
			X = Application.GetRealWidth(596),
			BackgroundImagePath = "DoorLock/SideslipPic.png",
			@@ -775,17 +778,19 @@
			var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
			{
			Height = Application.GetRealHeight(600),
			Y = btnSelectFloor.Bottom,
			Y = btnSelectFloor.Bottom + Application.GetRealHeight(45),
			};
			sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);

			Button oldbutton = null;
			Button oldbuttonText = null;
			int count = 0;
			foreach (var floorId in dicFloor.Keys)
			{
			count++;
			var rowFrameLayout = new RowLayout()
			{
			Height = Application.GetRealHeight(150),
			Height = Application.GetRealHeight(152),
			LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
			X = Application.GetRealWidth(81),
			};
			@@ -793,9 +798,9 @@

			var btnAllMethod = new Button()
			{
			Width = Application.GetRealWidth(81),
			Height = Application.GetRealHeight(81),
			Y = Application.GetRealHeight(55),
			Width = Application.GetMinReal(81),
			Height = Application.GetMinReal(81),
			Gravity = Gravity.CenterVertical,
			UnSelectedImagePath = "Floor/Floor.png",
			SelectedImagePath = "Floor/FloorSelected.png",
			};
			@@ -806,7 +811,7 @@
			Width = Application.GetRealWidth(311),
			Height = Application.GetRealHeight(58),
			X = Application.GetRealWidth(92),
			Y = Application.GetRealHeight(69),
			Gravity = Gravity.CenterVertical,
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextSize = 14,
			TextAlignment = TextAlignment.CenterLeft,
			@@ -847,9 +852,9 @@
			btnMethodText.IsSelected = true;
			oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			oldbuttonText.IsBold = true;
			}

			//获取楼层对应的房间
			}

			//获取楼层对应的房间
			var listAllRoom = HdlRoomLogic.Current.GetAllListRooms();
			foreach (var room in listAllRoom)
			{
			@@ -877,18 +882,19 @@
			rowFrameLayout.MouseUpEventHandler += hander;
			btnMethodText.MouseUpEventHandler += hander;
			}
			}

			public void DeviceInfoChange(CommonDevice common, string typeTag)
			{
			}

			public void ChangedILogicStatus(ZigBee.Device.Logic logic)
			{
			}

			public void ChangedISceneStatus(Scene scene)
			{
			if (count == 0)
			{
			sidelipFrameLayout.Height = 0;
			}
			else if (count <= 4 && count > 0)
			{
			sidelipFrameLayout.Height = Application.GetRealHeight(180) + count * Application.GetRealHeight(150);
			}
			else
			{
			sidelipFrameLayout.Height = Application.GetMinReal(780);
			}
			}
			}
			}