From 0d9f64668fd7350d6a21fd157e32009a96d98134 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期三, 16 十二月 2020 13:09:08 +0800
Subject: [PATCH] 新云端代码Ver1.2
---
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs | 981 +++++++++++++++++++++++++++++----------------------------
1 files changed, 493 insertions(+), 488 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
index 361bc59..b0cec52 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/MemberFrozenPage.cs
@@ -11,7 +11,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="doorLock"></param>
- public MemberFrozenPage(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes accountObj)
+ public MemberFrozenPage(ZigBee.Device.DoorLock doorLock, MemberInfoRes accountObj)
{
this.doorLock = doorLock;
this.curAccountObj = accountObj;
@@ -26,7 +26,7 @@
/// <summary>
/// 褰撳墠鎴愬憳瀵硅薄v
/// </summary>
- Shared.Phone.UserCenter.MemberInfoRes curAccountObj;
+ MemberInfoRes curAccountObj;
/// <summary>
/// 鍒锋柊View
/// </summary>
@@ -42,27 +42,28 @@
{
try
{
- var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
- var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, curAccountObj.SubAccountDistributedMark);
- var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, curAccountObj.SubAccountDistributedMark);
- var result2 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, curAccountObj?.SubAccountDistributedMark);
- if (result2 == true)
- {
- doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = true;
- }
- else
- {
- doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = false;
- }
- var result3 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, curAccountObj.SubAccountDistributedMark);
- if (result3 == true)
- {
- doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = true;
- }
- else
- {
- doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = false;
- }
+ //鈽嗐優銉笺偗鈽�
+ //var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+ //var result = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, curAccountObj.SubAccountDistributedMark);
+ //var result1 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, curAccountObj.SubAccountDistributedMark);
+ //var result2 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockOperateAccess(doorLock, curAccountObj?.SubAccountDistributedMark);
+ //if (result2 == true)
+ //{
+ // doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = true;
+ //}
+ //else
+ //{
+ // doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = false;
+ //}
+ //var result3 = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockUnlockAccess(doorLock, curAccountObj.SubAccountDistributedMark);
+ //if (result3 == true)
+ //{
+ // doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = true;
+ //}
+ //else
+ //{
+ // doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = false;
+ //}
}
catch { }
finally
@@ -81,15 +82,7 @@
/// </summary>
public void Show()
{
- string accountTitle = "";
- if (curAccountObj.UserName != null)
- {
- accountTitle = curAccountObj.UserName;
- }
- else
- {
- accountTitle = curAccountObj.Account;
- }
+ string accountTitle = curAccountObj.ShowName;
this.TopFrameLayout(this, accountTitle);
EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -180,46 +173,48 @@
btnRight.Width = Application.GetRealWidth(104);
btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
- var result = doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark];
- if (result == true)
- {
- btnRight.IsSelected = true;
- }
- else
- {
- btnRight.IsSelected = false;
- }
+ //鈽嗐優銉笺偗鈽�
+ //var result = doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark];
+ //if (result == true)
+ //{
+ // btnRight.IsSelected = true;
+ //}
+ //else
+ //{
+ // btnRight.IsSelected = false;
+ //}
}
else if (i == 2)
{
- if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == false)
- {
- btnText.Text = Language.StringByID(R.MyInternationalizationString.TempUnlockPermission);
- btnRight.X = Application.GetRealWidth(50);
- btnRight.Y = Application.GetRealHeight(32);
- btnRight.Height = Application.GetRealHeight(63);
- btnRight.Width = Application.GetRealWidth(104);
- btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
- btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
- line2.Visible = false;
+ //鈽嗐優銉笺偗鈽�
+ //if (doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] == false)
+ //{
+ // btnText.Text = Language.StringByID(R.MyInternationalizationString.TempUnlockPermission);
+ // btnRight.X = Application.GetRealWidth(50);
+ // btnRight.Y = Application.GetRealHeight(32);
+ // btnRight.Height = Application.GetRealHeight(63);
+ // btnRight.Width = Application.GetRealWidth(104);
+ // btnRight.UnSelectedImagePath = "DoorLock/Switch.png";
+ // btnRight.SelectedImagePath = "DoorLock/SwitchOn.png";
+ // line2.Visible = false;
- var result1 = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
- if (result1 == true)
- {
- btnRight.IsSelected = true;
- }
- else
- {
- btnRight.IsSelected = false;
- }
- }
- else
- {
- btnText.Width = 0;
- btnRight.Width = 0;
- line2.Width = 0;
- RowView.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
- }
+ // var result1 = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
+ // if (result1 == true)
+ // {
+ // btnRight.IsSelected = true;
+ // }
+ // else
+ // {
+ // btnRight.IsSelected = false;
+ // }
+ //}
+ //else
+ //{
+ // btnText.Width = 0;
+ // btnRight.Width = 0;
+ // line2.Width = 0;
+ // RowView.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMMidFrameLayout;
+ //}
}
int currentIndex = i;
@@ -293,7 +288,7 @@
}
string msg = Language.StringByID(R.MyInternationalizationString.GoPersonalCenter);
- var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, textFreeze, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ var alert = new ShowMsgControl(ShowMsgType.Confirm, textFreeze, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += () =>
@@ -305,275 +300,280 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start(""); });
try
{
- var doorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- var curAccountDoorLockUserList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
- if (curAccountDoorLockUserList.Count != 0)
- {
- //淇敼浜戠瀛樺偍淇℃伅
- operateConunt = curAccountDoorLockUserList.Count;
- var tempGroupId = new List<List<int>>();
- var tempUserIdList = new List<int> { };
- foreach (var curDoorLockUser in curAccountDoorLockUserList)
- {
- // 璐︽埛涓病鏈夐棬閿佺敤鎴�
- if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
- {
- }
- else
- {
- if (tempUserIdList.Count == 9)
- {
- tempGroupId.Add(tempUserIdList);
- tempUserIdList = new List<int>();
- }
- tempUserIdList.Add(int.Parse(curDoorLockUser.DoorLockLocalUserId));
- }
- }
- tempGroupId.Add(tempUserIdList);
- //鎵归噺鍐荤粨闂ㄩ攣涓殑璐︽埛
- ZigBee.Device.DoorLock.AccessType accessType;
- if (isFreeze)
- {
- accessType = ZigBee.Device.DoorLock.AccessType.DisEnableMoreUsers;
- }
- else
- {
- accessType = ZigBee.Device.DoorLock.AccessType.EnableMoreUsers;
- }
- //鍐荤粨/瑙ｅ喕鐢ㄦ埛
- int count1 = tempGroupId.Count;
- if (tempGroupId.Count == 1)
- {
- foreach (var a in tempGroupId)
- {
- if (a.Count == 0)
- {
- count1 = 0;
- break;
- }
- }
- }
- int count2 = 0;
+ //鈽嗐優銉笺偗鈽�
+ //var doorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ //var curAccountDoorLockUserList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
+ //if (curAccountDoorLockUserList.Count != 0)
+ //{
+ // //淇敼浜戠瀛樺偍淇℃伅
+ // operateConunt = curAccountDoorLockUserList.Count;
+ // var tempGroupId = new List<List<int>>();
+ // var tempUserIdList = new List<int> { };
+ // foreach (var curDoorLockUser in curAccountDoorLockUserList)
+ // {
+ // // 璐︽埛涓病鏈夐棬閿佺敤鎴�
+ // if (string.IsNullOrEmpty(curDoorLockUser.DoorLockLocalUserId))
+ // {
+ // }
+ // else
+ // {
+ // if (tempUserIdList.Count == 9)
+ // {
+ // tempGroupId.Add(tempUserIdList);
+ // tempUserIdList = new List<int>();
+ // }
+ // tempUserIdList.Add(int.Parse(curDoorLockUser.DoorLockLocalUserId));
+ // }
+ // }
+ // tempGroupId.Add(tempUserIdList);
+ // //鎵归噺鍐荤粨闂ㄩ攣涓殑璐︽埛
+ // ZigBee.Device.DoorLock.AccessType accessType;
+ // if (isFreeze)
+ // {
+ // accessType = ZigBee.Device.DoorLock.AccessType.DisEnableMoreUsers;
+ // }
+ // else
+ // {
+ // accessType = ZigBee.Device.DoorLock.AccessType.EnableMoreUsers;
+ // }
+ // //鍐荤粨/瑙ｅ喕鐢ㄦ埛
+ // 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;
- for (int i = 0; i < tempGroupId.Count; i++)
- {
- var tempUserIdList1 = tempGroupId[i];
- if (tempUserIdList1.Count == 0)
- {
- break;
- }
- var passData = doorLock.FreezeAccountData(tempUserIdList1, accessType);
- var resultData = await doorLock.DefaultControlAsync(passData);
- if (resultData != null && resultData.defaultControlResponseData != null)
- {
- if (resultData.defaultControlResponseData.status == 32)
- {
- count2++;
- }
- else if (resultData.defaultControlResponseData.status == 33)
- {
- count2++;
- }
- System.Threading.Thread.Sleep(1000);
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
- });
- return;
- }
- tempCount++;
- }
+ // int tempCount = 0;
+ // for (int i = 0; i < tempGroupId.Count; i++)
+ // {
+ // var tempUserIdList1 = tempGroupId[i];
+ // if (tempUserIdList1.Count == 0)
+ // {
+ // break;
+ // }
+ // var passData = doorLock.FreezeAccountData(tempUserIdList1, accessType);
+ // var resultData = await doorLock.DefaultControlAsync(passData);
+ // if (resultData != null && resultData.defaultControlResponseData != null)
+ // {
+ // if (resultData.defaultControlResponseData.status == 32)
+ // {
+ // count2++;
+ // }
+ // else if (resultData.defaultControlResponseData.status == 33)
+ // {
+ // count2++;
+ // }
+ // System.Threading.Thread.Sleep(1000);
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+ // });
+ // return;
+ // }
+ // tempCount++;
+ // }
- // 鎵归噺鍐荤粨闂ㄩ攣涓殑璐︽埛鍚庯紝鍑嗗鍐荤粨浜戠璐︽埛
- if (count2 == count1)
- {
- foreach (var curDoorLockUser in curAccountDoorLockUserList)
- {
- if (isFreeze)
- {
- var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- refreshDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
+ // // 鎵归噺鍐荤粨闂ㄩ攣涓殑璐︽埛鍚庯紝鍑嗗鍐荤粨浜戠璐︽埛
+ // if (count2 == count1)
+ // {
+ // foreach (var curDoorLockUser in curAccountDoorLockUserList)
+ // {
+ // if (isFreeze)
+ // {
+ // var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ // {
+ // //鈽嗐優銉笺偗鈽�
+ // //refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ // refreshDoorLockData.IsOtherAccountCtrl = true;
+ // }
+ // if (doorLock.DeviceAddr != null)
+ // {
+ // refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ // }
- refreshDoorLockData.OpenLockMode = curDoorLockUser.OpenLockMode;
- refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
- refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
- refreshDoorLockData.IsFreezeUser = true;
- refreshDoorLockData.IsTempUnlockAuthority = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
- //鍐荤粨浜戠
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- successConunt++;
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- if (isFreeze)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- return;
- });
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- else
- {
- var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- refreshDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
+ // refreshDoorLockData.OpenLockMode = curDoorLockUser.OpenLockMode;
+ // refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
+ // refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ // refreshDoorLockData.IsFreezeUser = true;
+ // refreshDoorLockData.IsTempUnlockAuthority = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
+ // //鍐荤粨浜戠
+ // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ // if (result != null)
+ // {
+ // if (result.Code == HttpMessageEnum.A姝ｅ父)
+ // {
+ // successConunt++;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (isFreeze)
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // }
+ // return;
+ // });
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // else
+ // {
+ // var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ // {
+ // //鈽嗐優銉笺偗鈽�
+ // //refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ // refreshDoorLockData.IsOtherAccountCtrl = true;
+ // }
+ // if (doorLock.DeviceAddr != null)
+ // {
+ // refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ // }
- refreshDoorLockData.OpenLockMode = curDoorLockUser.OpenLockMode;
- refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
- refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
- refreshDoorLockData.IsFreezeUser = false;
- refreshDoorLockData.IsTempUnlockAuthority = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
- //瑙ｅ喕浜戠
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- successConunt++;
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- if (isFreeze)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed) + ".", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed) + ".", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
- }
- });
- }
- }
- else
- {
- //娣诲姞浜戠瀛樺偍淇℃伅
- //鍐荤粨/瑙ｅ喕浜戠
- var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- addLockInfo.IsOtherAccountCtrl = true;
- }
- addLockInfo.CloudAccountId = curAccountObj.SubAccountDistributedMark;
- if (doorLock.DeviceAddr != null)
- {
- addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- addLockInfo.EntryTime = System.DateTime.Now;
- if (isFreeze)
- {
- addLockInfo.IsFreezeUser = true;
- }
- else
- {
- addLockInfo.IsFreezeUser = false;
- }
- addLockInfo.IsTempUnlockAuthority = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- operateConunt = 0;
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- if (isFreeze)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- return;
- });
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // refreshDoorLockData.OpenLockMode = curDoorLockUser.OpenLockMode;
+ // refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId;
+ // refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ // refreshDoorLockData.IsFreezeUser = false;
+ // refreshDoorLockData.IsTempUnlockAuthority = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
+ // //瑙ｅ喕浜戠
+ // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ // if (result != null)
+ // {
+ // if (result.Code == HttpMessageEnum.A姝ｅ父)
+ // {
+ // successConunt++;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (isFreeze)
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed) + ".", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed) + ".", Direction = AMPopTipDirection.None, CloseTime = 2 }.Show(Common.CommonPage.Instance);
+ // }
+ // });
+ // }
+ //}
+ //else
+ //{
+ // //娣诲姞浜戠瀛樺偍淇℃伅
+ // //鍐荤粨/瑙ｅ喕浜戠
+ // var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
+ // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ // {
+ // //鈽嗐優銉笺偗鈽�
+ // //addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ // addLockInfo.IsOtherAccountCtrl = true;
+ // }
+ // addLockInfo.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+ // if (doorLock.DeviceAddr != null)
+ // {
+ // addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ // }
+ // addLockInfo.EntryTime = System.DateTime.Now;
+ // if (isFreeze)
+ // {
+ // addLockInfo.IsFreezeUser = true;
+ // }
+ // else
+ // {
+ // addLockInfo.IsFreezeUser = false;
+ // }
+ // addLockInfo.IsTempUnlockAuthority = doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark];
+ // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
+ // if (result != null)
+ // {
+ // if (result.Code == HttpMessageEnum.A姝ｅ父)
+ // {
+ // operateConunt = 0;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (isFreeze)
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.FreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.UnFreezeFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // }
+ // return;
+ // });
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
+ // });
+ // }
+ //}
}
catch { }
finally
{
if (operateConunt == successConunt)
{
- if (isFreeze)
- {
- doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = true;
- }
- else
- {
- doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = false;
- }
- doorLock.ReSave();
+ //鈽嗐優銉笺偗鈽�
+ //if (isFreeze)
+ //{
+ // doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = true;
+ //}
+ //else
+ //{
+ // doorLock.IsFreezeAccount[curAccountObj.SubAccountDistributedMark] = false;
+ //}
+ //doorLock.ReSave();
}
Application.RunOnMainThread(() =>
{
@@ -596,7 +596,7 @@
{
msg = Language.StringByID(R.MyInternationalizationString.SureCancelAccessToSubaccount);
}
- var alert = new Shared.Phone.UserCenter.ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
+ var alert = new ShowMsgControl(ShowMsgType.Confirm, msg, Language.StringByID(R.MyInternationalizationString.DoorlockConfirm));
alert.Show();
//浣跨敤纭鍨嬪脊妗嗘椂,鐨勫洖璋冨嚱鏁�
alert.ConfirmClickEvent += () =>
@@ -608,159 +608,163 @@
Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
try
{
- var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
- var uList = new List<string> { };
- if (resultList != null)
- {
- foreach (var a in resultList)
- {
- uList.Add(a.CloudAccountId);
- }
- }
- var d = uList.Find((value) => { return value == curAccountObj.SubAccountDistributedMark; });
- if (d != null)
- {
- //淇敼浜戠瀛樺偍淇℃伅
- var curAccountDoorLockUserList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
+ //鈽嗐優銉笺偗鈽�
+ //var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
+ //var uList = new List<string> { };
+ //if (resultList != null)
+ //{
+ // foreach (var a in resultList)
+ // {
+ // uList.Add(a.CloudAccountId);
+ // }
+ //}
- foreach (var curDoorLockUser in curAccountDoorLockUserList)
- {
- operateConunt = curAccountDoorLockUserList.Count;
- if (hasAccess)
- {
- var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- refreshDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
- refreshDoorLockData.IsFreezeUser = false;
- refreshDoorLockData.IsTempUnlockAuthority = true;
- // 鎺堟潈
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- successConunt++;
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- else
- {
- var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- refreshDoorLockData.IsOtherAccountCtrl = true;
- }
- if (doorLock.DeviceAddr != null)
- {
- refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
- refreshDoorLockData.IsFreezeUser = false;
- refreshDoorLockData.IsTempUnlockAuthority = false;
- //鍙栨秷鏉冮檺
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- successConunt++;
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CancelAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
- }
- }
- else
- {
- //鏂板锛屼笖涓嶅喕缁�
- var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
- if (UserCenterResourse.UserInfo.AuthorityNo != 1)
- {
- addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- addLockInfo.IsOtherAccountCtrl = true;
- }
- addLockInfo.CloudAccountId = curAccountObj.SubAccountDistributedMark;
- if (doorLock.DeviceAddr != null)
- {
- addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
- }
- addLockInfo.EntryTime = System.DateTime.Now;
- addLockInfo.IsFreezeUser = false;
- if (hasAccess)
- {
- addLockInfo.IsTempUnlockAuthority = true;
- }
- else
- {
- addLockInfo.IsTempUnlockAuthority = false;
- }
- var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
- if (result != null)
- {
- if (result.StateCode == "Success")
- {
- operateConunt = 0;
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- if (hasAccess)
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- else
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CancelAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- }
- return;
- });
- }
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
- });
- }
- }
+ //var d = uList.Find((value) => { return value == curAccountObj.SubAccountDistributedMark; });
+ //if (d != null)
+ //{
+ // //淇敼浜戠瀛樺偍淇℃伅
+ // var curAccountDoorLockUserList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetAccountDoorLockUserList(doorLock, curAccountObj.SubAccountDistributedMark);
+
+ // foreach (var curDoorLockUser in curAccountDoorLockUserList)
+ // {
+ // operateConunt = curAccountDoorLockUserList.Count;
+ // if (hasAccess)
+ // {
+ // var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ // {
+ // //鈽嗐優銉笺偗鈽�
+ // //refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ // refreshDoorLockData.IsOtherAccountCtrl = true;
+ // }
+ // if (doorLock.DeviceAddr != null)
+ // {
+ // refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ // }
+ // refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ // refreshDoorLockData.IsFreezeUser = false;
+ // refreshDoorLockData.IsTempUnlockAuthority = true;
+ // // 鎺堟潈
+ // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ // if (result != null)
+ // {
+ // if (result.Code == HttpMessageEnum.A姝ｅ父)
+ // {
+ // successConunt++;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // else
+ // {
+ // var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData();
+ // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ // {
+ // //refreshDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ // refreshDoorLockData.IsOtherAccountCtrl = true;
+ // }
+ // if (doorLock.DeviceAddr != null)
+ // {
+ // refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ // }
+ // refreshDoorLockData.PrimaryId = curDoorLockUser.Id;
+ // refreshDoorLockData.IsFreezeUser = false;
+ // refreshDoorLockData.IsTempUnlockAuthority = false;
+ // //鍙栨秷鏉冮檺
+ // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
+ // if (result != null)
+ // {
+ // if (result.Code == HttpMessageEnum.A姝ｅ父)
+ // {
+ // successConunt++;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CancelAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ // }
+ // }
+ //}
+ //else
+ //{
+ // //鏂板锛屼笖涓嶅喕缁�
+ // var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
+ // if (UserCenterResourse.ResidenceOption.AuthorityNo != 1)
+ // {
+ // //鈽嗐優銉笺偗鈽�
+ // //addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+ // addLockInfo.IsOtherAccountCtrl = true;
+ // }
+ // addLockInfo.CloudAccountId = curAccountObj.SubAccountDistributedMark;
+ // if (doorLock.DeviceAddr != null)
+ // {
+ // addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+ // }
+ // addLockInfo.EntryTime = System.DateTime.Now;
+ // addLockInfo.IsFreezeUser = false;
+ // if (hasAccess)
+ // {
+ // addLockInfo.IsTempUnlockAuthority = true;
+ // }
+ // else
+ // {
+ // addLockInfo.IsTempUnlockAuthority = false;
+ // }
+ // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
+ // if (result != null)
+ // {
+ // if (result.Code == HttpMessageEnum.A姝ｅ父)
+ // {
+ // operateConunt = 0;
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // if (hasAccess)
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GiveAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // }
+ // else
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CancelAccessToSubaccountFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // }
+ // return;
+ // });
+ // }
+ // }
+ // else
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+ // });
+ // }
+ //}
}
catch { }
@@ -768,14 +772,15 @@
{
if (operateConunt == successConunt)
{
- if (hasAccess)
- {
- doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = true;
- }
- else
- {
- doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = false;
- }
+ //鈽嗐優銉笺偗鈽�
+ //if (hasAccess)
+ //{
+ // doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = true;
+ //}
+ //else
+ //{
+ // doorLock.HasRemoteUnlockAccess[curAccountObj.SubAccountDistributedMark] = false;
+ //}
doorLock.ReSave();
}
Application.RunOnMainThread(() =>
--
Gitblit v1.8.0