From e90209beae6a4e822cecb18e6889f8bda23f630e Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 14 十二月 2020 11:16:06 +0800
Subject: [PATCH] 合并了晾衣架(非新云端)
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs | 345 +++++++++++++++++++++------------------------------------
1 files changed, 129 insertions(+), 216 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index b51f2a7..158d0a8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -33,7 +33,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public UnLockMethod(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj)
+ public UnLockMethod(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
{
this.doorLock = doorLock;
this.curAccountObj = accountObj;
@@ -56,7 +56,7 @@
/// <summary>
/// 褰撳墠璐︽埛
/// </summary>
- MemberInfoRes curAccountObj;
+ Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
/// <summary>
/// 鏁版嵁涓虹┖锛孶I鏄剧ず鐨勭┖鍥剧墖
/// </summary>
@@ -88,24 +88,27 @@
{
try
{
- //鈽嗐優銉笺偗鈽�
- //var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
- //if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
- //{
- // //鏁版嵁濡傛灉鍦ㄩ棬閿佷笂闈㈡槸绌虹殑鏃跺�欙紝鏁版嵁涔熸槸娌℃湁鐨�
- // Application.RunOnMainThread(() =>
- // {
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- // });
- //}
+ var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+ if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ //鏁版嵁濡傛灉鍦ㄩ棬閿佷笂闈㈡槸绌虹殑鏃跺�欙紝鏁版嵁涔熸槸娌℃湁鐨�
+ Application.RunOnMainThread(() =>
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ });
+ }
}
catch { }
finally
{
Application.RunOnMainThread(() =>
{
- // 绫诲瀷鍖哄垎
- TypeRefresh();
+ // 绫诲瀷鍖哄垎
+ UndateUnlockMethodAction += (obj) =>
+ {
+ RefreshList(obj);
+ };
+ TypeRefresh(doorLock);
CommonPage.Loading.Hide();
bodyView.EndHeaderRefreshing();
});
@@ -145,26 +148,25 @@
UnSelectedImagePath = "DoorLock/AddIcon.png",
};
btnAddFrameLayout.AddChidren(btnAdd);
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
btnAdd.Width = 0;
}
btnAdd.MouseDownEventHandler += (sender, e) =>
{
- //鈽嗐優銉笺偗鈽�
- //if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
- //{
- // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- //}
- //else
- //{
- // var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
- // Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
- // Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
- // addUnLockMethod.Show();
- //}
+ if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ }
+ else
+ {
+ var addUnLockMethod = new Shared.Phone.UserCenter.DoorLock.AddUnLockMethod(doorLock, curAccountObj);
+ Shared.Phone.UserView.HomePage.Instance.AddChidren(addUnLockMethod);
+ Shared.Phone.UserView.HomePage.Instance.PageIndex += 1;
+ addUnLockMethod.Show();
+ }
};
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo == 3)
+ if (UserCenterResourse.UserInfo.AuthorityNo == 3)
{
btnAddFrameLayout.Width = 0;
}
@@ -174,16 +176,15 @@
}
MidFrameLayoutContent();
- //鈽嗐優銉笺偗鈽�
- //if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
- //{
- // CommonPage.Loading.Start("Loading...");
- // ReadDoorLockUserInfo();
- //}
- //else
- //{
- // RefreshList();
- //}
+ if (doorLock.IsFailedToGetDoorLockInfo[curAccountObj.SubAccountDistributedMark] == true)
+ {
+ CommonPage.Loading.Start("Loading...");
+ ReadDoorLockUserInfo();
+ }
+ else
+ {
+ RefreshList();
+ }
}
/// <summary>
@@ -228,6 +229,14 @@
{
btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock);
}
+ else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FaceIDUnlock))
+ {
+ btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.FaceIDUnlock);
+ }
+ else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.CalmFingerprintUnlock))
+ {
+ btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.CalmFingerprintUnlock);
+ }
else
{
btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);
@@ -246,7 +255,11 @@
EventHandler<MouseEventArgs> handerSideLip = (sender, e) =>
{
- SideslipFramelayout();
+ SideslipFramelayout(doorLock);
+ UndateUnlockMethodAction += (obj) =>
+ {
+ RefreshList(obj);
+ };
};
btnNext.MouseUpEventHandler += handerSideLip;
btnAllMethod.MouseUpEventHandler += handerSideLip;
@@ -318,7 +331,7 @@
TextSize = 12,
};
blankFrameLayout.AddChidren(btnPicTip1);
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
btnPicTip1.Width = 0;
}
@@ -338,15 +351,15 @@
foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
{
var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
- //鈽嗐優銉笺偗鈽�
- //if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
- //{
- // continue;
- //}
- //else
- //{
- // curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
- //}
+
+ if (string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount) || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark)
+ {
+ continue;
+ }
+ else
+ {
+ curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser);
+ }
}
if (curAccountDoorLockUserList.Count == 0)
@@ -391,6 +404,18 @@
continue;
}
break;
+ case 13:
+ if (curDoorLockUser.UnlockType != unlockMethod)
+ {
+ continue;
+ }
+ break;
+ case 14:
+ if (curDoorLockUser.UnlockType != unlockMethod)
+ {
+ continue;
+ }
+ break;
case 15:
if (curDoorLockUser.UnlockType != unlockMethod)
{
@@ -409,8 +434,15 @@
var btnicon = rowFrameLayout.frameTable.AddLeftIcon();
btnicon.UnSelectedImagePath = "DoorLock/DoorLockUserPic.png";
//涓婇潰闂ㄩ攣鐢ㄦ埛鍚嶇О涓�琛�
- var memberText = curAccountObj.ShowName;
-
+ var memberText = "";
+ if (string.IsNullOrEmpty(curAccountObj.UserName))
+ {
+ memberText = curAccountObj.Account;
+ }
+ else
+ {
+ memberText = curAccountObj.UserName;
+ }
//鎴愬憳涓�琛�
var btnaa = rowFrameLayout.frameTable.AddBottomView(memberText, 800);
var btnDoorlockUser = new EditText()
@@ -430,7 +462,7 @@
btndelete.ButtonClickEvent += (sender, e) =>
{
string msg = Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod);
- var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += async () =>
@@ -445,10 +477,9 @@
if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
{
var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鈽嗐優銉笺偗鈽�
- //deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
deleteDoorLockData.IsOtherAccountCtrl = true;
}
if (doorLock.DeviceAddr != null)
@@ -461,7 +492,7 @@
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
if (result != null)
{
- if (result.Code == HttpMessageEnum.A鎴愬姛)
+ if (result.StateCode == "Success")
{
isSecondDel = false;
if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
@@ -471,7 +502,11 @@
localDoorLockObj.UserID = curDoorLockUser.UserID;
doorLock.localDoorLockUserList.Remove(curUserId);
doorLock.ReSave();
- TypeRefresh();
+ UndateUnlockMethodAction += (obj) =>
+ {
+ RefreshList(obj);
+ };
+ TypeRefresh(doorLock);
}
}
else
@@ -491,10 +526,9 @@
if (isSecondDel)
{
var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鈽嗐優銉笺偗鈽�
- //deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
deleteDoorLockData.IsOtherAccountCtrl = true;
}
if (doorLock.DeviceAddr != null)
@@ -507,7 +541,7 @@
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData);
if (result != null)
{
- if (result.Code == HttpMessageEnum.A鎴愬姛)
+ if (result.StateCode == "Success")
{
isSecondDel = false;
if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
@@ -516,7 +550,11 @@
var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
localDoorLockObj.UserID = curDoorLockUser.UserID;
doorLock.localDoorLockUserList.Remove(curUserId);
- TypeRefresh();
+ UndateUnlockMethodAction += (obj) =>
+ {
+ RefreshList(obj);
+ };
+ TypeRefresh(doorLock);
}
}
else
@@ -586,6 +624,26 @@
btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
}
break;
+ case 13:
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
+ {
+ btnDoorlockUser.Text = curDoorLockUser.UserName;
+ }
+ else
+ {
+ btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.CalmFingerprintMark) + "ID" + +curDoorLockUser.UserID;
+ }
+ break;
+ case 14:
+ if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
+ {
+ btnDoorlockUser.Text = curDoorLockUser.UserName;
+ }
+ else
+ {
+ btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.FaceIDMark) + "ID" + +curDoorLockUser.UserID;
+ }
+ break;
case 15:
if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
{
@@ -602,10 +660,9 @@
Action<Shared.View> action = async (obj) =>
{
var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
- if (HdlUserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1)
{
- //鈽嗐優銉笺偗鈽�
- //refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
refreshDoorLockData.IsOtherAccountCtrl = true;
}
if (doorLock.DeviceAddr != null)
@@ -619,7 +676,7 @@
var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
if (result != null)
{
- if (result.Code == HttpMessageEnum.A鎴愬姛)
+ if (result.StateCode == "Success")
{
if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
{
@@ -630,10 +687,13 @@
localDoorLockObj.PrimaryId = curDoorLockUser.PrimaryId;
localDoorLockObj.EntryTime = curDoorLockUser.EntryTime;
localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks;
- //鈽嗐優銉笺偗鈽�
- //localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
+ localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark;
doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
- TypeRefresh();
+ UndateUnlockMethodAction += (obj1) =>
+ {
+ RefreshList(obj1);
+ };
+ TypeRefresh(doorLock);
}
}
else
@@ -650,153 +710,6 @@
#endregion
i++;
}
- }
- }
-
- /// <summary>
- /// 渚ц竟瀵艰埅鏍�
- /// </summary>
- void SideslipFramelayout()
- {
- #region sidelipFrameLayout UI
- var dialog = new Dialog
- {
- };
- dialog.Show();
-
- var flMain = new FrameLayout { BackgroundColor = 0x00000000 };
- dialog.AddChidren(flMain);
- flMain.MouseUpEventHandler += (sender11, e11) =>
- {
- dialog.Close();
- };
-
- var sidelipFrameLayout = new FrameLayout()
- {
- Height = Application.GetRealHeight(625),
- Width = Application.GetRealWidth(449),
- Y = Application.GetRealHeight(115 + 160),
- X = Application.GetRealWidth(596),
- BackgroundImagePath = "DoorLock/SideslipPic.png",
- };
- flMain.AddChidren(sidelipFrameLayout);
-
- var sidelipVerticalScrolViewLayout = new VerticalScrolViewLayout()
- {
- Height = Application.GetRealHeight(600),
- Y = Application.GetRealHeight(28),
- };
- sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
- #endregion
-
- Button oldbutton = null;
- Button oldbuttonText = null;
- for (var i = 0; i < 4; i++)
- {
- #region rowFrameLayout UI
- var rowFrameLayout = new RowLayout()
- {
- Height = Application.GetRealHeight(150),
- LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
- X = Application.GetRealWidth(81),
- };
- sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
-
- var btnAllMethod = new Button()
- {
- Width = Application.GetRealWidth(81),
- Height = Application.GetRealHeight(81),
- Y = Application.GetRealHeight(35),
- };
- rowFrameLayout.AddChidren(btnAllMethod);
-
- var btnMethodText = new Button()
- {
- Width = Application.GetRealWidth(311),
- Height = Application.GetRealHeight(58),
- X = Application.GetRealWidth(92),
- Y = Application.GetRealHeight(49),
- TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
- TextSize = 14,
- TextAlignment = TextAlignment.CenterLeft,
- };
- rowFrameLayout.AddChidren(btnMethodText);
- #endregion
-
- #region 鏁版嵁澶勭悊
- EventHandler<MouseEventArgs> hander = (sender, e) =>
- {
- if (!btnAllMethod.IsSelected)
- {
- if (oldbutton != null)
- {
- oldbutton.IsSelected = false;
- }
- if (oldbuttonText != null)
- {
- oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMGray3;
- }
- oldbutton = btnAllMethod;
- oldbuttonText = btnMethodText;
- doorLock.currentUserDisplayMethod = btnMethodText.Text;
- doorLock.ReSave();
- btnAllMethod.IsSelected = true;
- oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
- oldbuttonText.IsBold = true;
- TypeRefresh();
- }
- dialog.Close();
- };
- rowFrameLayout.MouseUpEventHandler += hander;
- btnAllMethod.MouseUpEventHandler += hander;
- btnMethodText.MouseUpEventHandler += hander;
-
- DisplayAllUnlockMethod(i, btnAllMethod, btnMethodText);
-
- if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
- {
- CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
- }
- if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0)
- {
- CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
- }
- if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock) && i == 1)
- {
- CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
- }
- if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock) && i == 2)
- {
- CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
- }
- if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock) && i == 3)
- {
- CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
- }
- #endregion
- }
- }
-
- /// <summary>
- /// 绫诲瀷鍖哄垎
- /// </summary>
- void TypeRefresh()
- {
- if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
- {
- RefreshList(0);
- }
- else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
- {
- RefreshList(15);
- }
- else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
- {
- RefreshList(3);
- }
- else
- {
- RefreshList();
}
}
--
Gitblit v1.8.0