~wjc/HomeApp.git

			@@ -11,19 +11,8 @@
			/// <summary>
			/// 按键管理
			/// </summary>
			public class BindTargetsPage : BindCommonLayout, ZigBee.Common.IStatus
			public class BindTargetsPage : BindCommonLayout
			{
			/// <summary>
			/// 按键模式接收
			/// </summary>
			/// <param name="common">Common.</param>
			public void Changed(CommonDevice common)
			{
			Shared.Application.RunOnMainThread(() =>
			{
			});
			}

			/// 构造函数
			/// </summary>
			/// <param name="doorLock"></param>
			@@ -105,13 +94,17 @@
			localDeviceList.Add(dev);
			}
			//获取本地场景列表
			scList = Shared.Common.Room.AllRoomSceneUIList;
			scList = HdlSceneLogic.Current.GetAllRoomSceneList();
			//获取网关场景表
			var gwSceneObj = await currentKey.GetSceneInfoAsync();
			if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
			if (gwScenesList.Count == 0)
			{
			gwScenesList = gwSceneObj.getSceneInfo.ScenesList;
			var gwSceneObj = await currentKey.GetSceneInfoAsync();
			if (gwSceneObj != null && gwSceneObj.getSceneInfo != null)
			{
			gwScenesList = gwSceneObj.getSceneInfo.ScenesList;
			}
			}

			//动态获取按键支持的大类
			typeModeList = await GetTypeMode();
			#region 读取面板当前模式
			@@ -187,6 +180,7 @@
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			return;
			});
			@@ -217,6 +211,7 @@
			{
			RefreshList();
			CommonPage.Loading.Hide();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			});
			}
			else
			@@ -224,6 +219,7 @@
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			@@ -250,7 +246,7 @@

			var btnAddFrameLayout = new FrameLayout()
			{
			X = Application.GetRealWidth(888),
			X = Application.GetRealWidth(772 - 58),
			Width = Application.GetRealWidth(192),
			};
			this.titleFrameLayout.AddChidren(btnAddFrameLayout);
			@@ -258,8 +254,8 @@
			var btnBindAdd = new Button
			{
			X = Application.GetRealWidth(62),
			Height = Application.GetRealHeight(72),
			Width = Application.GetRealWidth(72),
			Height = Application.GetMinReal(72),
			Width = Application.GetMinReal(72),
			UnSelectedImagePath = "BindPic/BindAdd.png",
			};
			btnAddFrameLayout.AddChidren(btnBindAdd);
			@@ -356,6 +352,7 @@
			InitListInfo();

			}

			/// <summary>
			/// 中部布局
			/// </summary>
			@@ -363,6 +360,7 @@
			{
			midVerticalRefreshLayout = new VerticalFrameRefreshControl(29)
			{
			Height = this.midFrameLayout.Height + 1,
			};
			this.midFrameLayout.AddChidren(midVerticalRefreshLayout);
			midVerticalRefreshLayout.BeginHeaderRefreshingAction += () =>
			@@ -370,7 +368,6 @@
			midVerticalRefreshLayout.BeginHeaderRefreshing();
			IsRead = true;
			InitListInfo();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			};

			BlankPicUI();
			@@ -453,6 +450,7 @@
			midVerticalRefreshLayout.AddChidrenRow(rowLayout);
			rowLayout.frameTable.UseClickStatu = false;
			var devicePic = rowLayout.frameTable.AddLeftIcon();
			devicePic.Y = Application.GetRealHeight(49);
			devicePic.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";

			#region 绑定数据处理
			@@ -472,7 +470,7 @@
			}
			if (isExistScene)
			{
			curSceneUI = Room.CurrentRoom.GetSceneUIBySceneId(bindDevice.BindScenesId);
			curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
			devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
			if (curSceneUI == null)
			{
			@@ -488,9 +486,14 @@
			else
			{
			btnBindNameText = curSceneUI.Name;
			if (curSceneUI.GetZone() != null)
			string myName = HdlSceneLogic.Current.GetZoneById(curSceneUI.Id);
			if (myName != null)
			{
			btnFloorRoomNameText = curSceneUI.GetZone();
			btnFloorRoomNameText = myName;
			}
			else
			{
			btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
			}
			}
			}
			@@ -503,7 +506,7 @@
			if (tempDev != null)
			{
			//获取设备所属房间
			var tempDevRoom = Common.Room.CurrentRoom.GetRoomByDevice(tempDev);
			var tempDevRoom = HdlRoomLogic.Current.GetRoomByDevice(tempDev);

			if (tempDevRoom != null)
			{
			@@ -514,20 +517,31 @@
			var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
			if (string.IsNullOrEmpty(tempDevFloorName))
			{
			btnFloorRoomNameText = tempDevRoomName;
			if (string.IsNullOrEmpty(tempDevRoomName))
			{
			btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
			}
			else
			{
			btnFloorRoomNameText = tempDevRoomName;
			}
			}
			else
			{
			btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
			if (string.IsNullOrEmpty(tempDevRoomName))
			{
			btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
			}
			else
			{
			btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
			}
			}
			}
			var deviceUi = Common.LocalDevice.Current.GetDeviceUI(tempDev);
			if (deviceUi != null)
			{
			devicePic.UnSelectedImagePath = deviceUi.IconPath;
			devicePic.Width = Application.GetRealWidth(110);
			devicePic.Text = "";
			}
			}

			devicePic.UnSelectedImagePath = tempDev.IconPath;
			devicePic.Text = "";

			if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
			{
			btnBindNameText = tempDev.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit);
			@@ -540,7 +554,6 @@
			else
			{
			btnBindNameText = bindDevice.BindMacAddr + "_" + bindDevice.BindEpoint;
			devicePic.Width = Application.GetMinRealAverage(200);
			devicePic.TextAlignment = TextAlignment.CenterLeft;
			devicePic.TextColor = UserCenterColor.Current.Gray;
			devicePic.Text = Language.StringByID(R.MyInternationalizationString.uOffLine);
			@@ -646,10 +659,10 @@
			else
			{
			var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
			if (temp.setWritableValueResponData?.Status != 0)
			if (temp != null && temp.setWritableValueResponData?.Status != 0)
			{
			var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
			if (temp1.setWritableValueResponData?.Status != 0)
			if (temp1 != null && temp1.setWritableValueResponData?.Status != 0)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			}
			@@ -705,8 +718,8 @@

			var sidelipFrameLayout = new FrameLayout()
			{
			Height = Application.GetRealHeight(628),
			Width = Application.GetRealWidth(415),
			Height = Application.GetMinReal(628),
			Width = Application.GetMinReal(415),
			Y = Application.GetRealHeight(115 + 45),
			X = Application.GetRealWidth(605),
			BackgroundImagePath = "DoorLock/SideslipPic.png",
			@@ -745,8 +758,10 @@
			}
			}

			int count = 0;
			foreach (var value in typeModeList)
			{
			count++;
			#region rowView
			var rowView = new FrameLayout()
			{
			@@ -1284,18 +1299,6 @@
			localDeviceList.Clear();
			scList.Clear();
			base.RemoveFromParent();
			}

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

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

			public void ChangedISceneStatus(Scene scene)
			{
			}
			}
			}