~wjc/HomeApp.git

			@@ -7,6 +7,9 @@
			using static ZigBee.Device.Panel;
			namespace Shared.Phone.UserCenter.Device.Bind
			{
			/// <summary>
			/// 特殊面板的绑定界面【只能绑定特定类型，每种类型只有一个目标】
			/// </summary>
			public class PaneTargetsBaseForm : BindCommonLayout
			{
			#region 构造函数
			@@ -14,7 +17,7 @@
			/// 构造函数
			/// </summary>
			/// <param name="device"></param>
			/// <param name="deviceBindType">1:新风;2:温度传感器;3:湿度传感器;4:PM2.5传感器;5:空调目标</param>
			/// <param name="deviceBindType">1:新风;2:温度传感器;3:湿度传感器;4:PM2.5传感器;5:空调目标,6:地暖目标【暂时没做，因为没有该设备，后期增加】</param>
			/// <param name="bindDev">绑定目标 </param>
			public PaneTargetsBaseForm(CommonDevice device, CommonDevice bindDev, DeviceBind.BindInfo.BindType deviceBindType)
			{
			@@ -68,6 +71,7 @@
			/// 3:湿度传感器
			/// 4:PM2.5传感器
			/// 5:空调目标
			/// 6:地暖目标【暂时没做，因为没有该设备，后期增加】
			/// </summary>
			DeviceBind.BindInfo.BindType curDeviceBindType = 0;
			/// <summary>
			@@ -131,6 +135,10 @@
			/// </summary>
			public Action<string> actionAcTarget = null;
			/// <summary>
			/// Fh绑定目标回调
			/// </summary>
			public Action<string> actionFhTarget = null;
			/// <summary>
			/// 是否能刷新
			/// </summary>
			private bool canFresh = false;
			@@ -172,6 +180,9 @@
			break;
			case DeviceBind.BindInfo.BindType.AC:
			titleText = Language.StringByID(R.MyInternationalizationString.AcTargets);
			break;
			case DeviceBind.BindInfo.BindType.Fh:
			titleText = Language.StringByID(R.MyInternationalizationString.uFloorHeatingTarget);
			break;
			}
			this.TopFrameLayout(this, titleText);
			@@ -260,7 +271,7 @@
			TextAlignment = TextAlignment.CenterLeft,
			};
			bottomTipPicFrameLayout.AddChidren(btnTipText);
			bottomTipPicFrameLayout.Width = btnTipPicFrameLayout.Width + Application.GetMinReal(2) + btnTipText.GetTextWidth();
			bottomTipPicFrameLayout.Width = btnTipPicFrameLayout.Width + Application.GetMinReal(12) + btnTipText.GetTextWidth();
			bottomTipPicFrameLayout.Gravity = Gravity.CenterHorizontal;

			EventHandler<MouseEventArgs> eHandlerEmptyTargets = (sender, e) =>
			@@ -389,7 +400,7 @@
			}
			}

			if (index == roomTempList.Count - 1 && index > 3)
			if (index == roomTempList.Count - 1 && index > 2)
			{
			var btnRoomFrameLayoutEmpty = new FrameLayout
			{
			@@ -715,7 +726,7 @@
			canFresh = false;
			midVerticalScrolViewLayout.EndHeaderRefreshing();
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5007" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);

			this.midFrameLayout.RemoveAll();

			@@ -901,7 +912,7 @@
			Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
			if (btnTipPic.IsSelected)
			{
			//删除情况1:绑定空目标必须取消按键中已经存在的目标
			//当绑定空目标，要删除已经存在按键的目标
			if (oldTargetList.Count != 0)
			{
			//删除按键中已经绑定的目标个数【删除成功个数】
			@@ -920,7 +931,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_1" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			CommonPage.Loading.Hide();

			ShowReLoadView();
			@@ -968,7 +979,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_3" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			@@ -1000,7 +1011,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_2" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			@@ -1082,7 +1093,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_4" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			CommonPage.Loading.Hide();

			ShowReLoadView();
			@@ -1109,7 +1120,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_6" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			@@ -1131,7 +1142,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_5" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			@@ -1147,7 +1158,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5003_7" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			btnFinifh.Enable = true;
			btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
			CommonPage.Loading.Hide();
			@@ -1225,7 +1236,7 @@
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5001" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(CommonPage.Instance);

			ShowReLoadView();
			ReLoadAction += () =>
			@@ -1265,7 +1276,7 @@
			new Tip()
			{
			MaxWidth = 150,
			Text = Language.StringByID(R.MyInternationalizationString.BindFailed),
			Text = Language.StringByID(R.MyInternationalizationString.BindFailed) + "(" + "5001_1" + ")",
			Direction = AMPopTipDirection.None,
			CloseTime = 1
			}.Show(CommonPage.Instance);
			@@ -1281,7 +1292,7 @@
			new Tip()
			{
			MaxWidth = 150,
			Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError),
			Text = Language.StringByID(R.MyInternationalizationString.BindUnknownError) + "(" + "5001_2" + ")",
			Direction = AMPopTipDirection.None,
			CloseTime = 1
			}.Show(CommonPage.Instance);