From 2109463fab2eb1caed189e4f258e0e763c5cea7b Mon Sep 17 00:00:00 2001
From: WJC <wjc@hdlchina.com.cn>
Date: 星期四, 07 十一月 2019 11:58:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-wjc
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs | 80 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
index f4458f9..18e00b1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/EntryStatusPage.cs
@@ -26,7 +26,6 @@
Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
string currentType = string.Empty;
FrameLayout bottomFrameLayout;
-
#endregion
/// <summary>
@@ -169,7 +168,6 @@
TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
TextAlignment = TextAlignment.CenterLeft,
TextSize = 14,
- Text = curAccountObj.UserName,
};
personRemarkRemarkFrameLayout.AddChidren(btnMatchPersonContent);
@@ -203,6 +201,14 @@
btnPasswordRemark.Text = Language.StringByID(R.MyInternationalizationString.ProximityRemark);
btnPasswordRemarkContent.PlaceholderText = Language.StringByID(R.MyInternationalizationString.ProximityCard) + "-" + doorLock.doorLockProgrammingEventNotificationCommand.UserID;
}
+ if (curAccountObj.UserName != "" && curAccountObj.UserName != null)
+ {
+ btnMatchPersonContent.Text = curAccountObj.UserName;
+ }
+ else
+ {
+ btnMatchPersonContent.Text = curAccountObj.Account;
+ }
completeBtn.MouseDownEventHandler += async (sender, e) =>
{
@@ -232,47 +238,65 @@
}
try
{
+ Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
- if (result != null && result.StateCode == "Success")
+ if (result != null)
{
- if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
+ if (result.StateCode == "Success")
{
- doorLock.localDoorLockUserList.Remove(doorLock.doorLockProgrammingEventNotificationCommand.UserID);
-
- var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
- localDoorLockObj.UserID = doorLock.doorLockProgrammingEventNotificationCommand.UserID;
- localDoorLockObj.UnlockType = addLockInfo.OpenLockMode;
- localDoorLockObj.EntryTime = addLockInfo.EntryTime;
- localDoorLockObj.UserName = addLockInfo.UserIdRemarks;
- localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
- doorLock.localDoorLockUserList.Add(doorLock.doorLockProgrammingEventNotificationCommand.UserID, localDoorLockObj);
-
- completeBtn.Enable = true;
- this.RemoveFromParent();
-
- for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
+ if (doorLock.localDoorLockUserList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID))
{
- var form = UserView.HomePage.Instance.GetChildren(i);
+ //瀛樿处鎴蜂俊鎭�
+ // var resultList1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalAccountlist(doorLock, curAccountObj.SubAccountDistributedMark);
+ //瀛橀棬閿佷俊鎭�
+ var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountObj.SubAccountDistributedMark);
+ if (resultList.ContainsKey(doorLock.doorLockProgrammingEventNotificationCommand.UserID) == true)
+ {
+ var a = resultList[doorLock.doorLockProgrammingEventNotificationCommand.UserID];
+ if (a?.ConnectedAccount == curAccountObj.SubAccountDistributedMark)
+ {
+ completeBtn.Enable = true;
+ this.RemoveFromParent();
+ for (int i = UserView.HomePage.Instance.ChildrenCount - 1; i >= 0; i--)
+ {
+ var form = UserView.HomePage.Instance.GetChildren(i);
- if (form is UnLockMethod)
- {
- ((UnLockMethod)form).RefreshList();
- break;
- }
- else
- {
- form.RemoveFromParent();
+ if (form is UnLockMethod)
+ {
+ ((UnLockMethod)form).RefreshList();
+ break;
+ }
+ else
+ {
+ form.RemoveFromParent();
+ }
+ }
+ }
+ else
+ {
+ completeBtn.Enable = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
+ }
}
}
+ }
+ else
+ {
+ completeBtn.Enable = true;
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
}
}
else
{
completeBtn.Enable = true;
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnPasswordRemarkContent);
}
}
catch { }
+ finally
+ {
+ CommonPage.Loading.Hide();
+ }
};
}
--
Gitblit v1.8.0