From 737c036a39176fd2085ce82b7c60391da8cb508c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 31 十二月 2019 19:17:47 +0800
Subject: [PATCH] 合并了代码
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 92 ++++++++++++++++++---------------------------
1 files changed, 37 insertions(+), 55 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 15a960b..28e15de 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -219,28 +219,25 @@
unLockMethod.Show();
}
else if (currentIndex == 1)
- {
- btnRight.IsSelected = !btnRight.IsSelected;
-
- if (btnRight.IsSelected)
+ {
+ if (!btnRight.IsSelected)
{
- FreezeUser(true);
+ FreezeUser(true);
}
else
{
- FreezeUser(false);
+ FreezeUser(false);
}
}
else if (currentIndex == 2)
- {
- btnRight.IsSelected = !btnRight.IsSelected;
- if (btnRight.IsSelected)
+ {
+ if (!btnRight.IsSelected)
{
- HasRemoteUnlockAccessMethod(true);
+ HasRemoteUnlockAccessMethod(true);
}
else
{
- HasRemoteUnlockAccessMethod(false);
+ HasRemoteUnlockAccessMethod(false);
}
}
};
@@ -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 () =>
{
@@ -312,8 +300,7 @@
{
// 璐︽埛涓病鏈夐棬閿佺敤鎴�
if (curDoorLockUser.DoorLockLocalUserId == null || 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);
@@ -359,11 +357,8 @@
else if (resultData.defaultControlResponseData.status == 33)
{
count2++;
- }
- //if (tempCount == tempGroupId.Count - 1)
- //{
- System.Threading.Thread.Sleep(1000);
- //}
+ }
+ System.Threading.Thread.Sleep(1000);
}
else
{
@@ -375,7 +370,7 @@
}
tempCount++;
}
-
+
// 鎵归噺鍐荤粨闂ㄩ攣涓殑璐︽埛鍚庯紝鍑嗗鍐荤粨浜戠璐︽埛
if (count2 == count1)
{
@@ -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 () =>
{
@@ -778,8 +761,7 @@
});
}
});
- dialog.Close();
- };
+ };
}
#region 鈼� 鎺ュ彛瀹炵幇__________________________
--
Gitblit v1.8.0