~wjc/HomeApp.git

			@@ -358,7 +358,7 @@
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			Gravity = Gravity.CenterHorizontal,
			Visible = false,
			TextSize =12,
			TextSize = 12,
			};
			blankFrameLayout.AddChidren(btnPicTip);
			}
			@@ -514,7 +514,7 @@
			};
			#endregion
			}
			midVerticalRefreshLayout.AdjustTableHeight(Application.GetRealHeight(23));
			midVerticalRefreshLayout.AdjustTableHeight(Application.GetRealHeight(23));
			}
			#endregion
			}
			@@ -580,97 +580,66 @@
			//一键清除按键事件
			btnDel.ButtonClickEvent += async (sender, e) =>
			{
			var dialog2 = new Dialog { };
			var doorDialog2 = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog2, Language.StringByID(R.MyInternationalizationString.Tip));
			doorDialog2.Show();
			doorDialog2.dialogMidFraFrameLayout.Width = Application.GetRealWidth(674);
			doorDialog2.dialogMidFraFrameLayout.Height = Application.GetRealHeight(115);
			doorDialog2.dialogMidFraFrameLayout.X = Application.GetRealWidth(60);
			doorDialog2.dialogMidFraFrameLayout.Y = Application.GetRealHeight(167);
			doorDialog2.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
			var midText1 = new Button()
			{
			Width = Application.GetRealWidth(674),
			Height = Application.GetRealHeight(115 / 2),
			TextSize = 14,
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextAlignment = TextAlignment.Center,
			TextID = R.MyInternationalizationString.ClearAllTargeta1,
			};
			doorDialog2.dialogMidFraFrameLayout.AddChidren(midText1);
			var midText2 = new Button()
			{
			Width = Application.GetRealWidth(674),
			Height = Application.GetRealHeight(115 / 2),
			Y = Application.GetRealHeight(115 / 2),
			TextSize = 14,
			TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
			TextAlignment = TextAlignment.Center,
			TextID = R.MyInternationalizationString.ClearAllTargeta2,
			};
			doorDialog2.dialogMidFraFrameLayout.AddChidren(midText2);

			doorDialog2.dialogBtnCancel.MouseUpEventHandler += (sender2, e2) =>
			{
			dialog2.Close();
			};
			doorDialog2.dialogBtnConfirm.MouseUpEventHandler += async (sender2, e2) =>
			{
			bool isDelSuccess = false;
			try
			{
			CommonPage.Loading.Start("");
			var bindResult = await currentKey.ClearBindInfoAsync();
			if (bindResult != null && bindResult.clearBindInfoResponseData != null)
			{
			if (bindResult.clearBindInfoResponseData.Result != 0)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
			CommonPage.Loading.Hide();
			return;
			}
			else
			{
			var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
			if (temp.setWritableValueResponData?.Status != 0)
			{
			var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
			if (temp1.setWritableValueResponData?.Status != 0)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			}
			else
			{
			isDelSuccess = true;
			}
			}
			else
			{
			isDelSuccess = true;
			}
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			}
			}
			catch { }
			finally
			{
			if (isDelSuccess)
			{
			currentKey.panelMode = 65535;
			currentKey.bindList.Clear();
			RefreshList();
			//如果是场景，用户删除清空当前到房间列表
			currentKey.RoomId = "";
			currentKey.ReSave();
			}
			CommonPage.Loading.Hide();
			}
			dialog2.Close();
			};
			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));
			alert.Show();
			//使用确认型弹框时,的回调函数
			alert.ConfirmClickEvent += async () =>
			{
			bool isDelSuccess = false;
			try
			{
			CommonPage.Loading.Start("");
			var bindResult = await currentKey.ClearBindInfoAsync();
			if (bindResult != null && bindResult.clearBindInfoResponseData != null)
			{
			if (bindResult.clearBindInfoResponseData.Result != 0)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDel);
			CommonPage.Loading.Hide();
			return;
			}
			else
			{
			var temp = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
			if (temp.setWritableValueResponData?.Status != 0)
			{
			var temp1 = await currentKey.ConfigureHdlKeyValueAsync(Panel.KeyMode.Default);
			if (temp1.setWritableValueResponData?.Status != 0)
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ChangeBindMode), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			}
			else
			{
			isDelSuccess = true;
			}
			}
			else
			{
			isDelSuccess = true;
			}
			}
			}
			else
			{
			new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
			}
			}
			catch { }
			finally
			{
			if (isDelSuccess)
			{
			currentKey.panelMode = 65535;
			currentKey.bindList.Clear();
			RefreshList();
			//如果是场景，用户删除清空当前到房间列表
			currentKey.RoomId = "";
			currentKey.ReSave();
			}
			CommonPage.Loading.Hide();
			}
			};
			};
			}

			@@ -860,49 +829,34 @@
			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.DelLocalBindListThenAddAgain);
			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 addScenePage = new Shared.Phone.UserCenter.DeviceBind.AddScenePage(currentKey, gwScenesList);
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addScenePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addScenePage.Show();
			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, gwScenesList);
			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();
			dialog1.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			dialog1.Close();
			}
			};

			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addScenePage.action += action;
			dialog.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			}
			};
			}
			}
			else
			@@ -928,48 +882,34 @@
			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.DelLocalBindListThenAddAgain1);
			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, "AddSwitch");
			Shared.Phone.UserView.HomePage.Instance.AddChidren(addDevicePage);
			Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
			addDevicePage.Show();
			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;
			addDevicePage.Show();

			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			dialog1.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			dialog1.Close();
			}
			};
			Action<List<BindListResponseObj>> action = (obj) =>
			{
			currentKey.bindList = obj;
			RefreshList();
			};
			addDevicePage.actionAddDevicePage += action;
			dialog.Close();
			}
			else
			{
			currentKey.currentKeySelectModeText = oldKeySelectModeText;
			dialog.Close();
			}
			};
			}
			}
			else