~wjc/HomeApp.git

			@@ -434,7 +434,7 @@

			var rowLayout = new RowLayoutControl(midVerticalRefreshLayout.rowSpace / 2);
			rowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
			midVerticalRefreshLayout.AddChidrenRow(rowLayout);
			midVerticalRefreshLayout.AddChidren2(rowLayout);
			rowLayout.frameTable.UseClickStatu = false;
			var devicePic = rowLayout.frameTable.AddLeftIcon();
			devicePic.Y = Application.GetRealHeight(49);
			@@ -501,7 +501,7 @@
			//获取房间的名字
			var tempDevRoomName = tempDevRoom.Name;
			//获取楼层的名字
			var tempDevFloorName = Common.Config.Instance.Home.GetFloorNameById(tempDevFloorId);
			var tempDevFloorName = HdlResidenceLogic.Current.GetFloorNameById(tempDevFloorId);
			if (string.IsNullOrEmpty(tempDevFloorName))
			{
			if (string.IsNullOrEmpty(tempDevRoomName))
			@@ -552,7 +552,7 @@
			var btnFloorRoomName = rowLayout.frameTable.AddBottomView(btnFloorRoomNameText, 800);
			rowLayout.frameTable.AddBottomLine();
			var btnDel = rowLayout.AddDeleteControl();
			btnDel.ButtonClickEvent += async (sender, e) =>
			btnDel.ButtonClickEvent += (sender, e) =>
			{
			RemoveTargets(bindDevice, btnDel);
			};
			@@ -570,7 +570,7 @@
			{
			var modeRowLayout = new RowLayoutControl(midVerticalRefreshLayout.rowSpace / 2);
			modeRowLayout.BackgroundColor = ZigbeeColor.Current.XMWhite;
			midVerticalRefreshLayout.AddChidrenRow(modeRowLayout);
			midVerticalRefreshLayout.AddChidren2(modeRowLayout);
			modeRowLayout.frameTable.UseClickStatu = false;
			modeRowLayout.frameTable.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.keyMode), 400);
			var btnKeyModeTipText = "";
			@@ -628,19 +628,27 @@
			var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += async () =>
			alert.ConfirmClickEvent += () =>
			{
			bool isDelSuccess = false;
			System.Threading.Tasks.Task.Run(() =>
			{
			try
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Start("");
			});
			var bindResult = HdlDeviceBindLogic.Current.ClearBindInfoAsync(currentKey);
			if (bindResult != null && bindResult.clearBindInfoResponseData != null)
			{
			if (bindResult.clearBindInfoResponseData.Result != 0)
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
			CommonPage.Loading.Hide();
			});
			return;
			}
			else
			@@ -651,7 +659,11 @@
			var temp1 = HdlDeviceBindLogic.Current.ConfigureHdlKeyValueAsync(currentKey, Panel.KeyMode.Default);
			if (temp1 != null && temp1.setWritableValueResponData?.Status != 0)
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);

			});
			}
			else
			{
			@@ -665,12 +677,17 @@
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			});
			}
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			if (isDelSuccess)
			{
			@@ -681,7 +698,9 @@
			currentKey.ReSave();
			}
			CommonPage.Loading.Hide();
			});
			}
			});
			};
			};
			}
			@@ -875,20 +894,6 @@
			}
			if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddScene))
			{
			if (currentKey.bindList.Count != 0)
			{
			var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
			if (bindSc != null)
			{
			string msg = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain);
			var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += async () =>
			{
			var result = await RemoveTargets(bindSc, line2);
			if (result == 0)
			{
			var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -901,47 +906,9 @@
			};
			addScenePage.action += action;
			dialog.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			}
			};
			}
			}
			else
			{
			var addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addScenePage.Show();

			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addScenePage.action += action;
			dialog.Close();
			}
			}
			if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddSwitch))
			{
			if (currentKey.bindList.Count != 0)
			{
			var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
			if (bindSc != null)
			{
			string msg = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain1);
			var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += async () =>
			{
			var result = await RemoveTargets(bindSc, line2);
			if (result == 0)
			{
			var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddSwitch");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -954,59 +921,9 @@
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			}
			};
			}
			}
			else
			{
			var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddSwitch");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addDevicePage.Show();

			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			}
			}
			if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddDimmer))
			{
			if (currentKey.bindList.Count != 0)
			{
			var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
			if (bindSc != null)
			{
			var dialog1 = new Dialog { };
			var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog1, Language.StringByID(R.MyInternationalizationString.Tip));
			doorDialog.Show();
			doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
			doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
			doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
			doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
			doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain2);
			doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
			doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
			doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			dialog1.Close();
			};
			doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
			{
			var result = await RemoveTargets(bindSc, line2);
			if (result == 0)
			{
			var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddDimmer");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -1019,59 +936,9 @@
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			dialog1.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			dialog1.Close();
			}

			};
			}
			}
			else
			{
			var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddDimmer");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addDevicePage.Show();

			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			}
			}
			if (currentKey.currentKeySelectModeText == Language.StringByID(R.MyInternationalizationString.AddCurtain))
			{
			if (currentKey.bindList.Count != 0)
			{
			var bindSc = currentKey.bindList.Find(obj => (obj.BindType == 2));
			if (bindSc != null)
			{
			var dialog1 = new Dialog { };
			var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog1, Language.StringByID(R.MyInternationalizationString.Tip));
			doorDialog.Show();
			doorDialog.dialogMidFraFrameLayout.Height = Application.GetRealHeight(58);
			doorDialog.dialogMidFraFrameLayout.X = Application.GetRealWidth(0);
			doorDialog.dialogMidFraFrameLayout.Y = Application.GetRealHeight(202);
			doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
			doorDialog.dialogMidText.Text = Language.StringByID(R.MyInternationalizationString.DelLocalBindListThenAddAgain3);
			doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
			doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
			doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			dialog1.Close();
			};
			doorDialog.dialogBtnConfirm.MouseUpEventHandler += async (sender1, e1) =>
			{
			var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddCurtain");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			@@ -1084,25 +951,6 @@
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			dialog1.Close();
			};
			}
			}
			else
			{
			var addDevicePage = new Shared.Phone.UserCenter.DeviceBind.AddDevicePage(currentKey, "AddCurtain");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addDevicePage.Show();

			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			}
			}
			};
			btnMethodText.MouseUpEventHandler += eHandler;
			@@ -1150,8 +998,9 @@
			/// <param name="bindDevice"></param>
			/// <param name="btnDel"></param>
			/// <returns></returns>
			private async System.Threading.Tasks.Task<int> RemoveTargets(BindListResponseObj bindDevice, Button btnDel)
			private int RemoveTargets(BindListResponseObj bindDevice, Button btnDel)
			{
			int result = -1;
			var delDevice = new DelDeviceBindData();
			delDevice.DeviceAddr = currentKey.DeviceAddr;
			delDevice.Epoint = currentKey.DeviceEpoint;
			@@ -1164,6 +1013,16 @@
			removeDevice.BindMacAddr = bindDevice.BindMacAddr;
			removeDevice.BindEpoint = bindDevice.BindEpoint;
			delDevice.RemoveBindList.Add(removeDevice);
			//是亮度再次发删除6的命令
			if (currentClusterID == 8)
			{
			var removeDevice2 = new RemoveBindListObj();
			removeDevice2.BindCluster = 6;
			removeDevice2.BindType = 0;
			removeDevice2.BindMacAddr = bindDevice.BindMacAddr;
			removeDevice2.BindEpoint = bindDevice.BindEpoint;
			delDevice.RemoveBindList.Add(removeDevice2);
			}
			}
			else if (bindDevice.BindType == 2)
			{
			@@ -1174,9 +1033,14 @@
			delDevice.RemoveBindList.Add(removeDevice);
			}

			System.Threading.Tasks.Task.Run(() =>
			{
			try
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Start("");
			});
			var delResult = new DelDeviceBindResponseAllData();
			delResult = HdlDeviceBindLogic.Current.DelDeviceBindAsync(delDevice);
			if (delResult != null && delResult.delDeviceBindResponseData != null)
			@@ -1189,6 +1053,8 @@
			{
			case 0:
			currentKey.bindList.Remove(bindDevice);
			Application.RunOnMainThread(() =>
			{
			RefreshList();
			//如果是场景，用户删除清空当前到房间列表
			if (re.BindType == 2)
			@@ -1196,14 +1062,17 @@
			currentKey.panelMode = 65535;
			}
			currentKey.ReSave();
			return 0;
			});
			result = 0;
			break;
			case 1:
			currentKey.bindList.Clear();
			try
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Start("");

			});
			var getBindList = HdlDeviceBindLogic.Current.GetDeviceBindAsync(currentKey);
			var bindDeviceListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
			var bindSceneListTemp = new System.Collections.Generic.List<BindListResponseObj> { };
			@@ -1247,8 +1116,11 @@
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			RefreshList();
			CommonPage.Loading.Hide();
			});
			}
			break;
			case 2:
			@@ -1257,12 +1129,18 @@
			if (delResult.removeBindResultResponseData.Result == 0)
			{
			currentKey.bindList.Remove(bindDevice);
			Application.RunOnMainThread(() =>
			{
			RefreshList();
			return 0;
			});
			result = 0;
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			});
			}
			}
			break;
			@@ -1273,20 +1151,30 @@
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			});
			}
			}
			else
			{
			Application.RunOnMainThread(() =>
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(CommonPage.Instance);
			});
			}
			}
			catch { }
			finally
			{
			Application.RunOnMainThread(() =>
			{
			CommonPage.Loading.Hide();
			});
			}
			return -1;
			});
			return result;
			}

			/// <summary>