From ddbf195df596cf94bf77b7e38a659cb5d14b3f95 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 22 十一月 2019 17:48:08 +0800
Subject: [PATCH] 优化门锁类型查找方式(请合并最新代码)

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs |  482 +++++++++++++----------------------------------------
 1 files changed, 122 insertions(+), 360 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
index 76083c2..2ee625c 100644
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UnLockMethod.cs
@@ -89,6 +89,7 @@
         /// </summary>
         public void Show()
         {
+            doorLock.currentUserDisplayMethod = "";
             this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.LockMethod));
             this.btnTitleLine.Visible = false;
             EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -170,11 +171,31 @@
                 Y = Application.GetRealHeight(35),
                 X = Application.GetRealWidth(812 - 100),
                 TextAlignment = TextAlignment.CenterRight,
-                Text = Language.StringByID(R.MyInternationalizationString.AllMethod),
                 TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
                 TextSize = 12,
             };
             midTopFrameLayout.AddChidren(btnAllMethod);
+            // 绫诲瀷鍖哄垎 
+            if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod))
+            {
+                btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);
+            }
+            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
+            {
+                btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.PasswordUnlock);
+            }
+            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
+            {
+                btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.FingerprintUnlock);
+            }
+            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
+            {
+                btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock);
+            }
+            else
+            {
+                btnAllMethod.Text = Language.StringByID(R.MyInternationalizationString.AllMethod);
+            }
 
             var btnNext = new Button()
             {
@@ -251,7 +272,7 @@
         /// </summary>
         /// <param name="gateway"></param>
         /// <param name="key"></param>
-        public void RefreshList()
+        public void RefreshList(int unlockMethod = -1)
         {
             this.midFrameLayout.RemoveAll();
             MidFrameLayoutContent();
@@ -302,6 +323,30 @@
                 foreach (var curUserId in curAccountDoorLockUserList.Keys)
                 {
                     var curDoorLockUser = curAccountDoorLockUserList[curUserId];
+                    switch (unlockMethod)
+                    {
+                        case 0:
+                            if (curDoorLockUser.UnlockType != unlockMethod)
+                            {
+                                continue;
+                            }
+                            break;
+                        case 3:
+                            if (curDoorLockUser.UnlockType != unlockMethod)
+                            {
+                                continue;
+                            }
+                            break;
+                        case 15:
+                            if (curDoorLockUser.UnlockType != unlockMethod)
+                            {
+                                continue;
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+
                     #region UI
                     var rowFrameLayout = new RowLayout()
                     {
@@ -367,6 +412,7 @@
                     };
                     rowFrameLayout.AddRightView(btnDel);
                     #endregion
+
                     #region 鏁版嵁澶勭悊
                     int currentIndex = i;
                     if (currentIndex == curAccountDoorLockUserList.Keys.Count - 1)
@@ -472,56 +518,14 @@
                         {
                             if (e1)
                             {
-                                var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
-                                var resultData = await doorLock.DefaultControlAsync(passData);
-                                if (resultData != null && resultData.defaultControlResponseData != null)
+                                try
                                 {
-                                    if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
+                                    CommonPage.Loading.Start("");
+                                    var passData = doorLock.SetUserAccessData(curDoorLockUser.UserID, ZigBee.Device.DoorLock.AccessType.DelCurrentUser);
+                                    var resultData = await doorLock.DefaultControlAsync(passData);
+                                    if (resultData != null && resultData.defaultControlResponseData != null)
                                     {
-                                        var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
-                                        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-                                        {
-                                            deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
-                                            deleteDoorLockData.IsOtherAccountCtrl = true;
-                                        }
-                                        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("DoorLock/DelDoorLock", deleteDoorLockData);
-                                        if (result != null)
-                                        {
-                                            if (result.StateCode == "Success")
-                                            {
-                                                isSecondDel = false;
-                                                if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
-                                                {
-                                                    doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
-                                                    var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
-                                                    localDoorLockObj.UserID = curDoorLockUser.UserID;
-                                                    doorLock.localDoorLockUserList.Remove(curUserId);
-                                                    doorLock.ReSave();
-                                                    RefreshList();
-                                                }
-                                            }
-                                            else
-                                            {
-                                                //寮�鍏冲浘鏍�
-                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
-                                            }
-                                        }
-                                        else
-                                        {
-                                            isSecondDel = true;
-                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
-                                        }
-                                    }
-                                    else
-                                    {
-                                        if (isSecondDel)
+                                        if (resultData.defaultControlResponseData.status == 0 || resultData.defaultControlResponseData.status == 2)
                                         {
                                             var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
                                             if (UserCenterResourse.UserInfo.AuthorityNo != 1)
@@ -544,15 +548,17 @@
                                                     isSecondDel = false;
                                                     if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
                                                     {
-                                                        doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+                                                        doorLock.localDoorLockAccountList.Remove(curDoorLockUser.ConnectedAccount);
                                                         var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
                                                         localDoorLockObj.UserID = curDoorLockUser.UserID;
                                                         doorLock.localDoorLockUserList.Remove(curUserId);
+                                                        doorLock.ReSave();
                                                         RefreshList();
                                                     }
                                                 }
                                                 else
                                                 {
+                                                    //寮�鍏冲浘鏍�
                                                     new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
                                                 }
                                             }
@@ -564,20 +570,69 @@
                                         }
                                         else
                                         {
-                                            if (curDoorLockUser.UserID < 10)
+                                            if (isSecondDel)
                                             {
-                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+                                                var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
+                                                if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+                                                {
+                                                    deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+                                                    deleteDoorLockData.IsOtherAccountCtrl = true;
+                                                }
+                                                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("DoorLock/DelDoorLock", deleteDoorLockData);
+                                                if (result != null)
+                                                {
+                                                    if (result.StateCode == "Success")
+                                                    {
+                                                        isSecondDel = false;
+                                                        if (doorLock.localDoorLockUserList.ContainsKey(curDoorLockUser.UserID))
+                                                        {
+                                                            doorLock.localDoorLockUserList.Remove(curDoorLockUser.UserID);
+                                                            var localDoorLockObj = new ZigBee.Device.DoorLock.LocaDoorLockObj() { };
+                                                            localDoorLockObj.UserID = curDoorLockUser.UserID;
+                                                            doorLock.localDoorLockUserList.Remove(curUserId);
+                                                            RefreshList();
+                                                        }
+                                                    }
+                                                    else
+                                                    {
+                                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+                                                    }
+                                                }
+                                                else
+                                                {
+                                                    isSecondDel = true;
+                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+                                                }
                                             }
                                             else
                                             {
-                                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+                                                if (curDoorLockUser.UserID < 10)
+                                                {
+                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+                                                }
+                                                else
+                                                {
+                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
+                                                }
                                             }
                                         }
                                     }
+                                    else
+                                    {
+                                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+                                    }
                                 }
-                                else
+                                catch { }
+                                finally
                                 {
-                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
+                                    CommonPage.Loading.Hide();
                                 }
                             }
                         };
@@ -666,6 +721,7 @@
                         oldbutton = btnAllMethod;
                         oldbuttonText = btnMethodText;
                         doorLock.currentUserDisplayMethod = btnMethodText.Text;
+                        doorLock.ReSave();
                         btnAllMethod.IsSelected = true;
                         oldbuttonText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
 
@@ -676,15 +732,15 @@
                         }
                         if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
                         {
-                            DisplayByType(0);
+                            RefreshList(0);
                         }
                         if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
                         {
-                            DisplayByType(15);
+                            RefreshList(15);
                         }
                         if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
                         {
-                            DisplayByType(3);
+                            RefreshList(3);
                         }
                     }
                     dialog.Close();
@@ -717,6 +773,13 @@
                         break;
                 }
 
+                if (doorLock.currentUserDisplayMethod == "" && i == 0)
+                {
+                    btnAllMethod.IsSelected = true;
+                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
+                    oldbutton = btnAllMethod;
+                    oldbuttonText = btnMethodText;
+                }
                 if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0)
                 {
                     btnAllMethod.IsSelected = true;
@@ -749,305 +812,6 @@
         }
 
         /// <summary>
-        /// 閫氳繃绫诲瀷绛涢�夋樉绀�
-        /// </summary>
-        public void DisplayByType(int unlockMethod)
-        {
-            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)
-            {
-                bodyView.Height = Application.GetRealHeight(0);
-                entryStatusPic.Visible = true;
-                btnPicTip.Visible = true;
-                btnPicTip1.Visible = true;
-                entryStatusPic.Height = Application.GetRealHeight(435);
-                entryStatusPic.Width = Application.GetRealHeight(757);
-                btnPicTip.Height = Application.GetRealHeight(98 / 2);
-                btnPicTip1.Height = Application.GetRealHeight(98 / 2);
-            }
-            else
-            {
-                entryStatusPic.Visible = false;
-                btnPicTip.Visible = false;
-                btnPicTip1.Visible = false;
-                entryStatusPic.Height = Application.GetRealHeight(0);
-                entryStatusPic.Width = Application.GetRealHeight(0);
-                btnPicTip.Height = Application.GetRealHeight(0);
-                btnPicTip1.Height = Application.GetRealHeight(0);
-                bodyView.Height = Application.GetRealHeight(1921 - 184 - 116);
-
-                var frameLayoutRow = new FrameLayout()
-                {
-                    Height = Application.GetMinRealAverage(0),
-                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
-                };
-                bodyView.AddChidren(frameLayoutRow);
-                int i = 0;
-                foreach (var curUserId in curAccountDoorLockUserList.Keys)
-                {
-                    var curDoorLockUser = curAccountDoorLockUserList[curUserId];
-                    if (curDoorLockUser.UnlockType != unlockMethod)
-                    {
-                        continue;
-                    }
-                    #region UI
-                    var rowFrameLayout = new RowLayout()
-                    {
-                        Height = Application.GetRealHeight(127 + 23),
-                        X = Application.GetRealWidth(58),
-                        Y = i * Application.GetRealHeight(150),
-                        Width = Application.GetRealWidth(965),
-                        LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
-                    };
-                    frameLayoutRow.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.DelBindDevice),
-                        TextColor = Shared.Common.ZigbeeColor.Current.XMWhite,
-                        TextSize = 12,
-                        TextAlignment = TextAlignment.Center,
-                        BackgroundColor = Shared.Common.ZigbeeColor.Current.XMDel,
-                    };
-                    rowFrameLayout.AddRightView(btnDel);
-                    #endregion
-                    #region 鏁版嵁澶勭悊
-                    int currentIndex = i;
-                    if (currentIndex == curAccountDoorLockUserList.Keys.Count - 1)
-                    {
-                        rowFrameLayout.LineColor = Shared.Common.ZigbeeColor.Current.XMWhite;
-                    }
-                    switch (curDoorLockUser.UnlockType)
-                    {
-                        case 0:
-                            if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
-                            {
-                                btnDoorlockUser.Text = curDoorLockUser.UserName;
-                            }
-                            else
-                            {
-                                btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID;
-                            }
-                            break;
-                        case 3:
-                            if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
-                            {
-                                btnDoorlockUser.Text = curDoorLockUser.UserName;
-                            }
-                            else
-                            {
-                                btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
-                            }
-                            break;
-                        case 15:
-                            if (curDoorLockUser.UserName != "" && curDoorLockUser.UserName != null)
-                            {
-                                btnDoorlockUser.Text = curDoorLockUser.UserName;
-                            }
-                            else
-                            {
-                                btnDoorlockUser.Text = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID;
-                            }
-                            break;
-                    }
-
-                    if (curAccountObj.UserName == "" || curAccountObj.UserName == null)
-                    {
-                        btnMember.Text = curAccountObj.Account;
-                    }
-                    else
-                    {
-                        btnMember.Text = curAccountObj.UserName;
-                    }
-
-                    Action<Shared.View> action = async (obj) =>
-                    {
-                        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.UnlockType;
-                        refreshDoorLockData.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
-                        refreshDoorLockData.PrimaryId = curDoorLockUser.PrimaryId;
-                        refreshDoorLockData.UserIdRemarks = btnDoorlockUser.Text;
-                        var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/UpdateDoorLock", refreshDoorLockData);
-                        if (result != null)
-                        {
-                            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);
-                            }
-                        }
-                        else
-                        {
-                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), 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.defaultControlResponseData != null)
-                                {
-                                    if (resultData.defaultControlResponseData.status == 0)
-                                    {
-                                        var deleteDoorLockData = new ZigBee.Device.DoorLock.DeleteDoorLockData();
-                                        if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-                                        {
-                                            deleteDoorLockData.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
-                                            deleteDoorLockData.IsOtherAccountCtrl = true;
-                                        }
-                                        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("DoorLock/DelDoorLock", deleteDoorLockData);
-                                        if (result != null)
-                                        {
-                                            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;
-                                                    doorLock.localDoorLockUserList.Remove(curUserId);
-                                                    RefreshList();
-                                                }
-                                            }
-                                            else
-                                            {
-                                                if (curDoorLockUser.UserID < 10)
-                                                {
-                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.OnlyBeDeletedOnTheDevice), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
-                                                }
-                                                else
-                                                {
-                                                    new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.RemoveFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnDoorlockUser);
-                                                }
-                                            }
-                                        }
-                                        else
-                                        {
-                                            new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.CloudServerResponseOvertime), 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.GwResponseOvertime), Direction = AMPopTipDirection.Up, CloseTime = 2 }.Show(btnDel);
-                                }
-                            }
-                        };
-                    };
-                    #endregion
-                    i++;
-                }
-                frameLayoutRow.Height = i * Application.GetRealHeight(127 + 23);
-            }
-        }
-
-        /// <summary>
         /// 閲嶅啓绉婚櫎鏂规硶
         /// </summary>
         public override void RemoveFromParent()
@@ -1055,8 +819,6 @@
             ZbGateway.StatusList.Remove(this);
             base.RemoveFromParent();
         }
-
-
 
         public void Changed(CommonDevice common)
         {

--
Gitblit v1.8.0