~wjc/HomeApp.git

			@@ -87,7 +87,8 @@
			Width = Application.GetRealWidth(400),
			Height = Application.GetRealHeight(69),
			Y = Application.GetRealHeight(92),
			TextID = MyInternationalizationString.customroom,
			// TextID = MyInternationalizationString.customroom,
			Text = Config.Instance.Home.GetCurrentFloorName,
			};
			topRowLayout.AddChidren(foolrname);
			var dropdown = new Button
			@@ -157,7 +158,7 @@
			};

			///楼层点击事件
			foolrname.MouseUpEventHandler += (sender, e) =>
			EventHandler<MouseEventArgs> foorlclick=(sender,e) =>
			{

			var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
			@@ -178,8 +179,7 @@
			};
			flMain.AddChidren(foolrbj);
			///默认调试
			List<string> foolrlist = new List<string> { "一楼", "二楼", "三楼" };
			foreach (var foolr in foolrlist)
			foreach (var foolr in Config.Instance.Home.FloorDics)
			{
			var foolrRowLayout = new FrameLayout
			{
			@@ -191,32 +191,57 @@
			{
			Width = Application.GetRealWidth(250),
			Height = Application.GetRealHeight(160),
			Text = foolr,
			Text = foolr.Value,
			TextAlignment = TextAlignment.Center,
			TextColor = ZigbeeColor.Current.LogicTextBlackColor,
			//SelectedTextColor=0xfffc744b,
			Tag = foolr.Key,
			};
			foolrRowLayout.AddChidren(btnfoolrname);


			EventHandler<MouseEventArgs> foolrclick = (sender13, e13) =>
			EventHandler<MouseEventArgs> foolrnameclick = (sender13, e13) =>
			{
			roomhorizontalScrol.RemoveAll();
			devicetypehorizontalScrol.RemoveAll();
			middle.RemoveAll();
			foolrname.Text = btnfoolrname.Text;
			flMain.RemoveFromParent();
			///备注：显示选中楼层的所有房间
			AllRoomView(Common.Room.Lists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			var list = Send.GetRoomList(btnfoolrname.Tag.ToString());
			AllRoomView(list, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);

			};
			foolrRowLayout.MouseUpEventHandler += foolrclick;
			btnfoolrname.MouseUpEventHandler += foolrclick;
			foolrRowLayout.MouseUpEventHandler += foolrnameclick;
			btnfoolrname.MouseUpEventHandler += foolrnameclick;


			}

			};
			///第一次进来
			AllRoomView(Common.Room.Lists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			foolrname.MouseUpEventHandler += foorlclick;
			dropdown.MouseUpEventHandler += foorlclick;

			var roomlists = new List<Common.Room>();
			roomlists.Clear();
			if (Config.Instance.Home.FloorDics.Count < 2)
			{
			foolrname.Visible = false;
			dropdown.Visible = false;
			if (Config.Instance.Home.FloorDics.Count == 0)
			{
			roomlists.AddRange(Common.Room.Lists);
			}
			else
			{
			roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);
			}
			}
			else
			{
			roomlists = Send.GetRoomList(Config.Instance.Home.CurrentFloorId);

			}

			AllRoomView(roomlists, deviceTypeList, roomhorizontalScrol, devicetypehorizontalScrol);
			}
			/// <summary>
			/// 加载所有房间的视图方法
			@@ -271,6 +296,10 @@
			var list = new List<DeviceUI>();
			foreach (var device in room.DeviceUIList)
			{
			if (device.CommonDevice == null)
			{
			continue;
			}
			if (!deviceTypeList.Contains(device.CommonDevice.Type))
			{
			continue;
			@@ -297,6 +326,10 @@
			var list = new List<DeviceUI>();
			foreach (var device in room.DeviceUIList)
			{
			if (device.CommonDevice == null)
			{
			continue;
			}
			if (!deviceTypeList.Contains(device.CommonDevice.Type))
			{
			continue;
			@@ -1327,42 +1360,6 @@
			break;
			case DeviceType.DoorLock:
			{
			#region ------
			var doorlockifonlist = Send.ReadDoorLockIfon("ccccccfffe300347");
			//var list = Send.ReadDoorLockIfon(common.DeviceAddr);
			var pra = new UserCenter.MemberListInfoPra();
			string result = await UserCenter.UserCenterLogic.GetResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountByDistributedMark", false, pra);
			var listInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<List<UserCenter.MemberInfoRes>>(result);
			Send.UserList.Clear();
			for (int i = 0; i < listInfo.Count; i++)
			{
			var membership = new Send.MembershipIfon();
			var membershipifon = listInfo[i];
			for (int j = 0; j < doorlockifonlist.Count; j++)
			{
			///查找成员以及成员门锁触发源(1按键/3卡/15指纹)
			if (doorlockifonlist[j].CloudAccountId == membershipifon.SubAccountDistributedMark)
			{
			membership.UserIdMode.Add(doorlockifonlist[j].UserIdMode);
			membership.MembershipName = membershipifon.UserName;
			membership.MembershipId = membershipifon.SubAccountDistributedMark;

			}

			}
			if (membership.UserIdMode.Count != 0)
			{
			///过滤掉重复数据；
			var str = Send.UserList.Find((c) => { return c.MembershipId == membership.MembershipId; });
			if (str == null)
			{
			Send.UserList.Add(membership);
			}
			}

			}
			#endregion

			var memberList = new MemberList();
			UserView.HomePage.Instance.AddChidren(memberList);
			UserView.HomePage.Instance.PageIndex += 1;