From 66a9965c44ecc32a6696abca876ab9d1cd091584 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期五, 28 二月 2020 15:25:13 +0800
Subject: [PATCH] 2020.2.28
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 74 ++++++++++++++-----------------------
1 files changed, 28 insertions(+), 46 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
old mode 100755
new mode 100644
index 15a960b..f2a7d2c
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -65,7 +65,7 @@
}
/// <summary>
- /// UI鏄剧ず
+ /// UI鏄剧ず
/// </summary>
public void Show()
{
@@ -220,9 +220,7 @@
}
else if (currentIndex == 1)
{
- btnRight.IsSelected = !btnRight.IsSelected;
-
- if (btnRight.IsSelected)
+ if (!btnRight.IsSelected)
{
FreezeUser(true);
}
@@ -233,8 +231,7 @@
}
else if (currentIndex == 2)
{
- btnRight.IsSelected = !btnRight.IsSelected;
- if (btnRight.IsSelected)
+ if (!btnRight.IsSelected)
{
HasRemoteUnlockAccessMethod(true);
}
@@ -277,21 +274,12 @@
{
textFreeze = Language.StringByID(R.MyInternationalizationString.SureToUnFreeze);
}
- var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, 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 = textFreeze;
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
- doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- {
- MidRefresh();
- dialog.Close();
- };
- doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
+
+ string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, textFreeze, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += () =>
{
System.Threading.Tasks.Task.Run(async () =>
{
@@ -311,9 +299,8 @@
foreach (var curDoorLockUser in curAccountDoorLockUserList)
{
// 璐︽埛涓病鏈夐棬閿佺敤鎴�
- if (curDoorLockUser.DoorLockLocalUserId == null || curDoorLockUser.DoorLockLocalUserId == "")
+ if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
{
- //
}
else
{
@@ -338,6 +325,17 @@
}
//鍐荤粨/瑙ｅ喕鐢ㄦ埛
int count1 = tempGroupId.Count;
+ if (tempGroupId.Count == 1)
+ {
+ foreach (var a in tempGroupId)
+ {
+ if (a.Count == 0)
+ {
+ count1 = 0;
+ break;
+ }
+ }
+ }
int count2 = 0;
int tempCount = 0;
@@ -346,7 +344,7 @@
var tempUserIdList1 = tempGroupId[i];
if (tempUserIdList1.Count == 0)
{
- return;
+ break;
}
var passData = doorLock.FreezeAccountData(tempUserIdList1, accessType);
var resultData = await doorLock.DefaultControlAsync(passData);
@@ -360,10 +358,7 @@
{
count2++;
}
- //if (tempCount == tempGroupId.Count - 1)
- //{
System.Threading.Thread.Sleep(1000);
- //}
}
else
{
@@ -570,29 +565,17 @@
});
}
});
- dialog.Close();
};
}
//鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
void HasRemoteUnlockAccessMethod(bool hasAccess)
{
- var dialog = new Dialog { };
- var doorDialog = new Shared.Phone.UserCenter.DoorLock.DoorlockDialog(dialog, 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.SureGiveAccessToSubaccount);
- doorDialog.dialogMidFraFrameLayout.AddChidren(doorDialog.dialogMidText);
- doorDialog.dialogBtnConfirm.Text = Language.StringByID(R.MyInternationalizationString.DoorlockConfirm);
- doorDialog.dialogBtnCancel.MouseUpEventHandler += (sender1, e1) =>
- {
- MidRefresh();
- dialog.Close();
- };
- doorDialog.dialogBtnConfirm.MouseUpEventHandler += (sender1, e1) =>
+ string msg = Language.StringByID(R.MyInternationalizationString.SureGiveAccessToSubaccount);
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ alert.Show();
+ //浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
+ alert.ConfirmClickEvent += () =>
{
System.Threading.Tasks.Task.Run(async () =>
{
@@ -701,7 +684,7 @@
}
else
{
- //鏂板锛屼笖涓嶅喕缁�
+ //鏂板锛屼笖涓嶅喕缁�
var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
@@ -778,7 +761,6 @@
});
}
});
- dialog.Close();
};
}
--
Gitblit v1.8.0