~wjc/HomeApp.git

			@@ -9,7 +9,7 @@
			namespace Shared.Phone.UserCenter.DeviceBind
			{
			/// <summary>
			/// 按键管理
			/// 普通面板的绑定界面【可绑定多个目标】
			/// </summary>
			public class BindTargetsPage : BindCommonLayout
			{
			@@ -85,7 +85,7 @@
			localDeviceList.Clear();
			scList.Clear();
			//获取本地设备列表
			foreach (var dev in Shared.Common.LocalDevice.Current.listAllDevice)
			foreach (var dev in HdlDeviceCommonLogic.Current.listAllDevice)
			{
			localDeviceList.Add(dev);
			}
			@@ -168,7 +168,7 @@
			{
			CommonPage.Loading.Hide();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			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);
			return;
			});
			}
			@@ -207,7 +207,7 @@
			{
			CommonPage.Loading.Hide();
			midVerticalRefreshLayout.EndHeaderRefreshing();
			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) + "(" + "108_ 6533" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			});
			return;
			}
			@@ -457,18 +457,11 @@
			}
			if (isExistScene)
			{
			curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
			curSceneUI = HdlSceneLogic.Current.GetSceneUIBySceneId(bindDevice.BindScenesId);
			devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
			if (curSceneUI == null)
			{
			if (string.IsNullOrEmpty(bindDevice.ESName))
			{
			btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
			}
			else
			{
			btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + bindDevice.ESName;
			}
			btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
			}
			else
			{
			@@ -524,9 +517,13 @@
			btnFloorRoomNameText = tempDevFloorName + "," + tempDevRoomName;
			}
			}
			}

			devicePic.UnSelectedImagePath = tempDev.IconPath;
			}
			else
			{
			btnFloorRoomNameText = Language.StringByID(R.MyInternationalizationString.Undistributed);
			}

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

			if (string.IsNullOrEmpty(tempDev.DeviceEpointName))
			@@ -553,8 +550,8 @@
			rowLayout.frameTable.AddBottomLine();
			var btnDel = rowLayout.AddDeleteControl();
			btnDel.ButtonClickEvent += (sender, e) =>
			{
			RemoveTargets(bindDevice, btnDel);
			{
			RemoveTargets(bindDevice, btnDel);
			};
			#endregion
			}
			@@ -625,7 +622,7 @@
			btnDel.ButtonClickEvent += async (sender, e) =>
			{
			string msg = Language.StringByID(R.MyInternationalizationString.ClearAllTargets).Replace("{0}", "\r\n");
			var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += () =>
			@@ -680,7 +677,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5006" + ")", Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			});
			}
			}
			@@ -754,7 +751,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			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) + "(" + "0003" + ")", Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
			CommonPage.Loading.Hide();
			});
			dialog.Close();
			@@ -999,7 +996,7 @@
			/// <param name="btnDel"></param>
			/// <returns></returns>
			private int RemoveTargets(BindListResponseObj bindDevice, Button btnDel)
			{
			{
			int result = -1;
			var delDevice = new DelDeviceBindData();
			delDevice.DeviceAddr = currentKey.DeviceAddr;
			@@ -1161,7 +1158,7 @@
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime) + "(" + "5003" + ")", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
			});
			}
			}