From 31497bb69602433d94c8a28ea01c3ee3c7cc8576 Mon Sep 17 00:00:00 2001 From: 黄学彪 <hxb@hdlchina.com.cn> Date: 星期四, 24 十月 2019 14:32:30 +0800 Subject: [PATCH] 完全合并了Wjc,Xm 的 代码 --- ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs | 519 ++++++++++++--------------------------------------------- 1 files changed, 108 insertions(+), 411 deletions(-) diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs index c66ac64..95b5669 100755 --- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs +++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/DoorLockCommonInfo.cs @@ -1,12 +1,14 @@ 锘縰sing System; using System.Collections.Generic; using System.Runtime.CompilerServices; +using ZigBee.Device; namespace Shared.Phone.UserCenter.DoorLock { - public class DoorLockCommonInfo : ZigBee.Device.DoorLock + public class DoorLockCommonInfo : CommonDevice { #region 鏈湴鍙橀噺 + public static bool IsModify = false; public static bool InTempPasswordVisiable = false; public static int ValidDateYear = 0; public static int ValidDateMonth = 0; @@ -20,7 +22,78 @@ public static int InValidDateHour = 100; public static int InValidDateMinute = 100; public static int InValidDateSecond = 0; - #endregion + #endregion + + /// <summary> + /// 鑾峰彇闂ㄩ攣鍖呭惈璁惧淇℃伅鍜岃处鎴蜂俊鎭� + /// </summary> + public static async System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>> GetLocaDoorLocklist(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj) + { + return await System.Threading.Tasks.Task.Run((Func<System.Threading.Tasks.Task<Dictionary<int, LocaDoorLockObj>>>)(async () => + { + // 璇诲彇璁惧涓殑淇℃伅 + doorLock.localDoorLockUserList.Clear(); + var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync(); + if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null) + { + var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList; + foreach (var doorData in dataList) + { + var localDoorLockObj1 = new ZigBee.Device.DoorLock.LocaDoorLockObj() + { + UserID = doorData.UserId, + UnlockType = doorData.UserType + }; + if ((doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj1.UserID)) == false) + { + doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1); + } + } + } + + // 璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅 + var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { }; + localDoorLockObj.CloudAccountId = curAccountObj.SubAccountDistributedMark; + if (doorLock.DeviceAddr != null) + { + localDoorLockObj.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint; + } + + var getDoorLockInfoList = await ZigBee.Device.DoorLock.GetDoorLockInfoFromServer("DoorLock/GetDoorLockPager", localDoorLockObj); + + if (getDoorLockInfoList != null) + { + foreach (var curDoorLockUser in getDoorLockInfoList.PageData) + { + if (doorLock.localDoorLockUserList.ContainsKey(int.Parse(curDoorLockUser.DoorLockLocalUserId))) + { + var doorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { }; + doorLockObj.UserID = int.Parse(curDoorLockUser.DoorLockLocalUserId); + doorLockObj.UnlockType = curDoorLockUser.OpenLockMode; + doorLockObj.PrimaryId = curDoorLockUser.Id; + doorLockObj.EntryTime = curDoorLockUser.EntryTime; + doorLockObj.UserName = curDoorLockUser.UserIdRemarks; + doorLockObj.ConnectedAccount = curDoorLockUser.CloudAccountId; doorLock.localDoorLockUserList[int.Parse(curDoorLockUser.DoorLockLocalUserId)] = doorLockObj; + } + else + { + //闂ㄩ攣涓笉瀛樺湪鐢ㄦ埛ID锛屼簯绔瓨鍦紝闇�瑕佸湪杩欓噷鍒犻櫎浜戠瀛樺湪鐨勬暟鎹� + var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData(); + if (doorLock.DeviceAddr != null) + { + deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint; + } + deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.DoorLockLocalUserId; + deleteDoorLockData.PrimaryId = curDoorLockUser.Id; + deleteDoorLockData.DelDoorLockDelType = 2; + var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/DelDoorLock", deleteDoorLockData); + } + } + } + return doorLock.localDoorLockUserList; + })); + } + /// <summary> /// 鐢熸垚6浣嶄复鏃跺瘑鐮� /// </summary> @@ -61,417 +134,41 @@ } /// <summary> - /// 鎵�鏈夋柟寮忛�夋嫨 + /// 闂ㄩ攣缂栫▼浜嬩欢閫氱煡 /// </summary> - public void SideslipFramelayout(ZigBee.Device.DoorLock doorLock) + [System.Serializable] + public class LocaDoorLockObj { - //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); - //Button oldbutton = null; - //Button oldbuttonText = null; - //for (var i = 0; i < 4; i++) - //{ - // var rowFrameLayout = new RowLayout() - // { - // Height = Application.GetRealHeight(150), - // }; - // sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout); - - // var btnAllMethod = new Button() - // { - // Width = Application.GetRealWidth(81), - // Height = Application.GetRealHeight(81), - // X = Application.GetRealWidth(81), - // Y = Application.GetRealHeight(55), - // }; - // rowFrameLayout.AddChidren(btnAllMethod); - - // var btnMethodText = new Button() - // { - // Width = Application.GetRealWidth(311), - // Height = Application.GetRealHeight(58), - // X = Application.GetRealWidth(173), - // Y = Application.GetRealHeight(69), - // TextColor = Shared.Common.ZigbeeColor.Current.XMGray3, - // TextSize = 14, - // TextAlignment = TextAlignment.CenterLeft, - // }; - // rowFrameLayout.AddChidren(btnMethodText); - - // 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; - // btnAllMethod.IsSelected = true; - // oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - - // // 绫诲瀷鍖哄垎 - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod)) - // { - // RefreshList(); - // } - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock)) - // { - // DisplayByType(0); - // } - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock)) - // { - // DisplayByType(15); - // } - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock)) - // { - // DisplayByType(3); - // } - // } - // dialog.Close(); - // }; - // rowFrameLayout.MouseUpEventHandler += hander; - // btnAllMethod.MouseUpEventHandler += hander; - // btnMethodText.MouseUpEventHandler += hander; - - // switch (i) - // { - // case 0: - // btnAllMethod.UnSelectedImagePath = "DoorLock/AllMethod.png"; - // btnAllMethod.SelectedImagePath = "DoorLock/AllMethodOn.png"; - // btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.AllMethod); - // break; - // case 1: - // btnAllMethod.UnSelectedImagePath = "DoorLock/Password.png"; - // btnAllMethod.SelectedImagePath = "DoorLock/PasswordOn.png"; - // btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.PasswordUnlock); - // break; - // case 2: - // btnAllMethod.UnSelectedImagePath = "DoorLock/Fingerprint.png"; - // btnAllMethod.SelectedImagePath = "DoorLock/FingerprintOn.png"; - // btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.FingerprintUnlock); - // break; - // case 3: - // btnAllMethod.UnSelectedImagePath = "DoorLock/proximityCard.png"; - // btnAllMethod.SelectedImagePath = "DoorLock/proximityCardOn.png"; - // btnMethodText.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock); - // break; - // } - - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0) - // { - // btnAllMethod.IsSelected = true; - // btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - // oldbutton = btnAllMethod; - // oldbuttonText = btnMethodText; - // } - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock) && i == 1) - // { - // btnAllMethod.IsSelected = true; - // btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - // oldbutton = btnAllMethod; - // oldbuttonText = btnMethodText; - // } - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock) && i == 2) - // { - // btnAllMethod.IsSelected = true; - // btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - // oldbutton = btnAllMethod; - // oldbuttonText = btnMethodText; - // } - // if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock) && i == 3) - // { - // btnAllMethod.IsSelected = true; - // btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack; - // oldbutton = btnAllMethod; - // oldbuttonText = btnMethodText; - // } - //} - } - - /// <summary> - /// 閫氳繃绫诲瀷绛涢�夋樉绀� - /// </summary> - public void DisplayByType(ZigBee.Device.DoorLock doorLock, Shared.Phone.UserCenter.MemberInfoRes curAccountObj, int unlockMethod, VerticalScrolViewLayout bodyView, Button entryStatusPic, Button btnPicTip, Button btnPicTip1) - { - //bodyView.RemoveAll(); - //var curAccountDoorLockUserList = new Dictionary<int, ZigBee.Device.DoorLock.LocaDoorLockObj>(); - - //foreach (var curUserId in doorLock.localDoorLockUserList.Keys) - //{ - // var curDoorLockUser = doorLock.localDoorLockUserList[curUserId]; - - // if (curDoorLockUser.ConnectedAccount == "" || curDoorLockUser.ConnectedAccount != curAccountObj.SubAccountDistributedMark) - // { - // continue; - // } - // else - // { - // curAccountDoorLockUserList.Add(curDoorLockUser.UserID, curDoorLockUser); - // } - //} - - //if (curAccountDoorLockUserList.Count == 0) - //{ - // entryStatusPic.Visible = true; - // btnPicTip.Visible = true; - // btnPicTip1.Visible = true; - //} - //else - //{ - // entryStatusPic.Visible = false; - // btnPicTip.Visible = false; - // btnPicTip1.Visible = false; - //} - - //foreach (var curUserId in curAccountDoorLockUserList.Keys) - //{ - // var curDoorLockUser = curAccountDoorLockUserList[curUserId]; - // if (curDoorLockUser.UnlockType != unlockMethod) - // { - // continue; - // } - // #region UI - // var rowFrameLayout = new RowLayout() - // { - // Height = Application.GetRealHeight(173), - // X = Application.GetRealWidth(58), - // Width = Application.GetRealWidth(965), - // LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine, - // }; - // bodyView.AddChidren(rowFrameLayout); - - // var btnPicFrameLayout = new FrameLayout() - // { - // Width = Application.GetRealWidth(81), - // Height = Application.GetRealHeight(81), - // X = Application.GetRealWidth(40), - // Y = Application.GetRealHeight(49), - // }; - // rowFrameLayout.AddChidren(btnPicFrameLayout); - - // var btnPic = new Button() - // { - // Width = Application.GetRealWidth(84), - // Height = Application.GetRealHeight(84), - // UnSelectedImagePath = "DoorLock/DoorLockUserPic.png", - // }; - // btnPicFrameLayout.AddChidren(btnPic); - - // var btnDoorlockUser = new EditText() - // { - // Width = Application.GetRealWidth(1080 - 173), - // Height = Application.GetRealHeight(60), - // X = Application.GetRealWidth(173), - // Y = Application.GetRealHeight(35), - // TextSize = 14, - // PlaceholderTextColor = Shared.Common.ZigbeeColor.Current.XMGray3, - // TextColor = Shared.Common.ZigbeeColor.Current.XMBlack, - // TextAlignment = TextAlignment.CenterLeft, - // }; - // rowFrameLayout.AddChidren(btnDoorlockUser); - - // var btnMember = new Button() - // { - // Width = Application.GetRealWidth(1080 - 173), - // Height = Application.GetRealHeight(49), - // X = Application.GetRealWidth(173), - // Y = Application.GetRealHeight(95), - // TextColor = Shared.Common.ZigbeeColor.Current.XMGray3, - // TextSize = 14, - // TextAlignment = TextAlignment.CenterLeft, - // }; - // rowFrameLayout.AddChidren(btnMember); - - // var btnDel = new Button() - // { - // Width = Application.GetRealWidth(1080 - 173), - // Height = Application.GetRealHeight(49), - // X = Application.GetRealWidth(173), - // Y = Application.GetRealHeight(95), - // Text = Language.StringByID(R.MyInternationalizationString.Delete), - // TextColor = Shared.Common.ZigbeeColor.Current.XMWhite, - // TextSize = 12, - // TextAlignment = TextAlignment.Center, - // BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel, - // }; - // rowFrameLayout.AddRightView(btnDel); - // #endregion - // #region 鏁版嵁澶勭悊 - // switch (curDoorLockUser.UnlockType) - // { - // case 0: - // if (curDoorLockUser.UserName != "") - // { - // btnDoorlockUser.Text = curDoorLockUser.UserName; - // } - // else - // { - // btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID; - // } - // break; - // case 3: - // if (curDoorLockUser.UserName != "") - // { - // btnDoorlockUser.Text = curDoorLockUser.UserName; - // } - // else - // { - // btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID; - // } - // break; - // case 15: - // if (curDoorLockUser.UserName != "") - // { - // btnDoorlockUser.Text = curDoorLockUser.UserName; - // } - // else - // { - // btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID; - // } - // break; - // } - - // if (curAccountObj.UserName == "") - // { - // btnMember.Text = curAccountObj.Account; - // } - // else - // { - // btnMember.Text = curAccountObj.UserName; - // } - - // Action<Shared.View> action = async (obj) => - // { - // var refreshDoorLockData = new ZigBee.Device.DoorLock.RefreshDoorLockData(); - // refreshDoorLockData.CloudAccountId = curAccountObj.SubAccountDistributedMark; - // if (doorLock.DeviceAddr != null) - // { - // refreshDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint; - // } - // refreshDoorLockData.OpenLockMode = curDoorLockUser.UnlockType; - // refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString(); - // refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId; - // refreshDoorLockData.UserIdRemarks = btnDoorlockUser.Text; - // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/UpdateDoorLock", refreshDoorLockData); - // if (result.StateCode == "Success") - // { - // if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID)) - // { - // doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID); - // var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { }; - // localDoorLockObj.UserID = curDoorLockUser.UserID; - // localDoorLockObj.UnlockType = curDoorLockUser.UnlockType; - // localDoorLockObj.EntryTime = curDoorLockUser.EntryTime; - // localDoorLockObj.UserName = refreshDoorLockData.UserIdRemarks; - // localDoorLockObj.ConnectedAccount = curAccountObj.SubAccountDistributedMark; - // doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj); - // RefreshList(); - // } - // } - // else - // { - // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser); - // } - // }; - // btnDoorlockUser.EditorEnterAction += action; - - // btnDel.MouseUpEventHandler += (sender, e) => - // { - // var alert = new Alert(Language.StringByID(R.MyInternationalizationString.Tip), Language.StringByID(R.MyInternationalizationString.SureToDelUnlockMethod), - // Language.StringByID(R.MyInternationalizationString.Cancel), Language.StringByID(R.MyInternationalizationString.Confrim)); - // alert.Show(); - // alert.ResultEventHandler += async (sender1, e1) => - // { - // if (e1) - // { - // var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser); - // var resultData = await doorLock.DefaultControlAsync(passData); - // if (resultData != null && resultData.responseData != null) - // { - // if (resultData.responseData.status == 0) - // { - // var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData(); - // if (doorLock.DeviceAddr != null) - // { - // deleteDoorLockData.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint; - // } - // deleteDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString(); - // deleteDoorLockData.PrimaryId = curDoorLockUser.PrimaryId; - // deleteDoorLockData.DelDoorLockDelType = 2; - // var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("App/DelDoorLock", deleteDoorLockData); - // if (result.StateCode == "Success") - // { - // if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID)) - // { - // doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID); - // var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { }; - // localDoorLockObj.UserID = curDoorLockUser.UserID; - - // //new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveSuccess), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel); - // doorLock.localDoorLockUserList.Remove(curUserId); - // RefreshList(); - // } - // } - // else - // { - // if (curDoorLockUser.UserID < 10) - // { - - // } - // else - // { - // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.ModigfyFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser); - // } - // } - // } - // else - // { - // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel); - // } - - // } - // else - // { - // new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel); - // } - // } - // }; - // }; - // #endregion - //} + /// <summary> + /// 鐢ㄦ埛id + /// <para>绠$悊鍛�10涓紝0~9锛�</para> ///<para>鏅�氱敤鎴�220涓紝10~234</para> ///<para>涓�娆℃�х敤鎴�10涓紝235~245</para> ///<para>涓存椂瀵嗙爜瀵嗙爜10涓紝245~255锛�</para> ///<para>鍏朵腑鎸囩汗100锛屽瘑鐮�100锛屽崱56</para> + ///<para>闂ㄩ攣鏈湴褰曞叆鐨勫瘑鐮併�佹寚绾广�佹劅搴斿崱閮芥湁鍞竴瀵瑰簲鐨勭敤鎴稩d</para> + /// </summary> + public int UserID; + /// <summary> + /// 寮�閿佺被鍨� + /// <para>甯哥敤锛�</para> + /// <para>0:Keypad(閿洏/瀵嗙爜)锛�3:RFID(灏勯鍗�)锛�15:鎸囩汗</para> + /// <para>涓嶅父鐢細 + /// <para>1:RF(Zigbee鏃犵嚎)锛�2:Manual(鎵嬪姩)锛�255:Indeterminate(涓嶇‘瀹�)</para> + /// </summary> + public int UnlockType; + /// <summary> + /// 鍏宠仈璐︽埛鐨処D + /// </summary> + public string ConnectedAccount = string.Empty; + /// <summary> + /// 闂ㄩ攣鐢ㄦ埛鍚� + /// </summary> + public string UserName = string.Empty; + /// <summary> + /// 闂ㄩ攣褰曞叆鐨勬椂 + /// </summary> + public DateTime EntryTime = System.DateTime.MinValue; + /// <summary> + /// PrimaryId 闂ㄩ攣浜戠涓� 閿�(闈炴洿鏂板瓧娈�,浠ヤ笅鍧囦负鏇存柊瀛楁) -->閿悕 : PrimaryId榛樿鍊�: null + /// </summary> + public string PrimaryId = ""; } } } -- Gitblit v1.8.0