From 48ba446936b51fffafa7c3600c0dadc6ac0e8c20 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 10 七月 2020 10:52:13 +0800
Subject: [PATCH] 2020-07-10-01

---
 ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs |  805 +++++++++++++++++++++++++++-----------------------------
 1 files changed, 389 insertions(+), 416 deletions(-)

diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
index a2400e0..89f9c6e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UndistributeDoorlockUserPage.cs
@@ -4,7 +4,7 @@
 using ZigBee.Device;
 namespace Shared.Phone.UserCenter.DoorLock
 {
-    public class UndistributeDoorlockUserPage : DoorLockCommonLayout, ZigBee.Common.IStatus
+    public class UndistributeDoorlockUserPage : DoorLockCommonLayout
     {
         /// <summary>
         /// 鏋勯�犲嚱鏁�
@@ -17,78 +17,53 @@
             BackgroundColor = Shared.Common.ZigbeeColor.Current.GXCTopViewBackgroundColor;
         }
 
-        #region 鈼� 鍙橀噺鐢虫槑__________________________
+        #region 鍙橀噺鐢虫槑 
+        /// <summary>
+        /// 褰撳墠闂ㄩ攣
+        /// </summary>
         ZigBee.Device.DoorLock doorLock;
+        /// <summary>
+        /// 搴曢儴鐧借壊甯冨眬
+        /// </summary>
         FrameLayout bottomFrameLayout;
+        /// <summary>
+        /// 褰撳墠绫诲瀷
+        /// </summary>
         string currentType = string.Empty;
+        /// <summary>
+        /// 鏈湴璐︽埛鍒楄〃
+        /// </summary>
         List<Shared.Phone.UserCenter.MemberInfoRes> localAccountList;
-        VerticalScrolViewLayout bodyView;
+        /// <summary>
+        /// 婊戝姩甯冨眬View
+        /// </summary>
+        VerticalRefreshLayout bodyView;
+        /// <summary>
+        /// 淇濆瓨涔嬪墠鎼滅储鍒版湰鍦伴棬閿佺敤鎴峰垪琛�
+        /// </summary>
+        Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj> oldLocalDoorLockUserList = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
         #endregion
 
+        /// <summary>
+        /// 鑾峰彇鎵�鏈夎处鎴风殑闂ㄩ攣鐢ㄦ埛鍒楄〃
+        /// </summary>
         void ReadDoorLockUserInfo()
         {
             System.Threading.Tasks.Task.Run(async () =>
             {
-                Application.RunOnMainThread(() => { CommonPage.Loading.Start("Loading..."); });
                 try
                 {
-                    var getDoorLockInfo = await doorLock.GetDoorlockUserInfoAsync();
-                    if (getDoorLockInfo != null && getDoorLockInfo.doorLockUserDetailData != null)
+                    var list = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetDoorLockAllAcountUserlist(doorLock);
+                    if (oldLocalDoorLockUserList.Count != 0)
                     {
-                        var dataList = getDoorLockInfo.doorLockUserDetailData.UserObjList;
-                        foreach (var doorData in dataList)
+                        //濡傛灉鏈娌℃湁鎼滅储鍒帮紝鎻愮ず缃戝叧娌℃湁鍥炲
+                        if (list.Count == 0)
                         {
-                            var localDoorLockObj1 = new ZigBee.Device.DoorLock.LocaDoorLockObj()
+                            Application.RunOnMainThread(() =>
                             {
-                                UserID = doorData.UserId,
-                                UnlockType = doorData.UserType
-                            };
-                            if ((doorLock.localDoorLockUserList.ContainsKey(localDoorLockObj1.UserID)) == false)
-                            {
-                                doorLock.localDoorLockUserList.Add(localDoorLockObj1.UserID, localDoorLockObj1);
-                            }
+                                new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.GwResponseOvertime), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                            });
                         }
-
-                        //  璇诲彇浜戠闂ㄩ攣璁惧涓殑淇℃伅
-                        var localDoorLockObj = new ZigBee.Device.DoorLock.GetDoorLockData() { };
-
-                        foreach (var curAccountObj in doorLock.localAllAccountList)
-                        {
-                            if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-                            {
-                                localDoorLockObj.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
-                                localDoorLockObj.IsOtherAccountCtrl = true;
-                            }
-                            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)))
-                                    {
-                                        doorLock.localDoorLockUserList.Remove(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.Add(int.Parse(curDoorLockUser.DoorLockLocalUserId), doorLockObj);
-                                }
-                            }
-                        }
-                    }
-                    else
-                    {
-
                     }
                 }
                 catch { }
@@ -96,8 +71,9 @@
                 {
                     Application.RunOnMainThread(() =>
                     {
-                        RefreshList();
+                        TypeRefresh();
                         CommonPage.Loading.Hide();
+                        bodyView.EndHeaderRefreshing();
                     });
                 }
             });
@@ -108,6 +84,7 @@
         /// </summary>
         public void Show()
         {
+            doorLock.currentUserDisplayMethod = "";
             this.TopFrameLayout(this, Language.StringByID(R.MyInternationalizationString.UndistributedUnlockMethod));
             this.btnTitleLine.Visible = false;
             EventHandler<MouseEventArgs> eHandlerBack = (sender, e) =>
@@ -117,18 +94,115 @@
             this.btnBack.MouseUpEventHandler += eHandlerBack;
             this.btnBackFrameLayout.MouseUpEventHandler += eHandlerBack;
             this.MidFrameLayout(this);
-
             MidFrameLayoutContent();
-            ReadDoorLockUserInfo();
+            if (doorLock.localDoorLockUserList.Count == 0)
+            {
+                CommonPage.Loading.Start("Loading...");
+                ReadDoorLockUserInfo();
+            }
+            else
+            {
+                RefreshList();
+            }
         }
 
-        public void RefreshList()
+        /// <summary>
+        /// 涓儴甯冨眬
+        /// </summary>
+        public void MidFrameLayoutContent()
         {
+            var midTopFrameLayout = new FrameLayout()
+            {
+                Height = Application.GetRealHeight(115),
+                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTopFrameLayout,
+            };
+            this.midFrameLayout.AddChidren(midTopFrameLayout);
+
+            var btnAllMethod = new Button()
+            {
+                Height = Application.GetRealHeight(49),
+                Width = Application.GetRealWidth(141 + 100),
+                Y = Application.GetRealHeight(35),
+                X = Application.GetRealWidth(812 - 100),
+                TextAlignment = TextAlignment.CenterRight,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
+                TextSize = 12,
+                IsBold = true,
+            };
+            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()
+            {
+                X = Application.GetRealWidth(953),
+                Y = Application.GetRealHeight(20),
+                Height = Application.GetRealHeight(69),
+                Width = Application.GetRealWidth(69),
+                UnSelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
+                SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
+            };
+            midTopFrameLayout.AddChidren(btnNext);
+            EventHandler<MouseEventArgs> handerSideLip = (sender, e) =>
+            {
+                SideslipFramelayout();
+            };
+            btnNext.MouseUpEventHandler += handerSideLip;
+            btnAllMethod.MouseUpEventHandler += handerSideLip;
+            var btnLine = new Button
+            {
+                Y = midTopFrameLayout.Bottom,
+                Height = 1,
+                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTitleLine,
+            };
+            this.midFrameLayout.AddChidren(btnLine);
+
+            bodyView = new VerticalRefreshLayout()
+            {
+                Y = btnLine.Bottom,
+                Height = Application.GetRealHeight(1921 - 184 - 115 - 1),
+            };
+            this.midFrameLayout.AddChidren(bodyView);
+            bodyView.BeginHeaderRefreshingAction += () =>
+            {
+                bodyView.BeginHeaderRefreshing();
+                ReadDoorLockUserInfo();
+            };
+        }
+
+        /// <summary>
+        /// 鍒锋柊鍒楄〃
+        /// </summary>
+        void RefreshList(int unlockMethod = -1)
+        {
+            this.midFrameLayout.RemoveAll();
+            MidFrameLayoutContent();
             bodyView.RemoveAll();
+            var curLocalDoorLockUserList = new Dictionary<int, DoorLockCommonInfo.LocaDoorLockObj>();
+
             foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
             {
                 var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
-                if (curDoorLockUser.ConnectedAccount != "")
+                if (!string.IsNullOrEmpty(curDoorLockUser.ConnectedAccount))
                 {
                     continue;
                 }
@@ -136,12 +210,43 @@
                 {
                     continue;
                 }
-                var RowView = new FrameLayout()
+                curLocalDoorLockUserList.Add(curUserId, curDoorLockUser);
+            }
+
+            int i = 0;
+            foreach (var curUserId in curLocalDoorLockUserList.Keys)
+            {
+                oldLocalDoorLockUserList = curLocalDoorLockUserList;
+                var curDoorLockUser = curLocalDoorLockUserList[curUserId];
+                switch (unlockMethod)
                 {
-                    Height = Application.GetRealHeight(161),
+                    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;
+                }
+                var rowFrameLayout = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(127 + 23),
                     BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
                 };
-                bodyView.AddChidren(RowView);
+                bodyView.AddChidren(rowFrameLayout);
 
                 var btnDistributeUnlockIconFrameLayout = new FrameLayout()
                 {
@@ -150,7 +255,7 @@
                     X = Application.GetRealWidth(58),
                     Y = Application.GetRealHeight(43),
                 };
-                RowView.AddChidren(btnDistributeUnlockIconFrameLayout);
+                rowFrameLayout.AddChidren(btnDistributeUnlockIconFrameLayout);
 
                 var btnDistributeUnlockIcon = new Button()
                 {
@@ -168,24 +273,30 @@
                     TextAlignment = TextAlignment.CenterLeft,
                     TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                     Gravity = Gravity.CenterVertical,
+                    TextSize = 15,
                 };
-                RowView.AddChidren(btnText);
+                rowFrameLayout.AddChidren(btnText);
 
                 var line2 = new Button()
                 {
-                    Y = RowView.Height - 1,
-                    X = Application.GetRealWidth(58),
-                    Width = Application.GetRealWidth(965),
+                    Y = rowFrameLayout.Height - 1,
+                    X = Application.GetRealWidth(176),
+                    Width = Application.GetRealWidth(847),
                     Height = 1,
                     BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
                 };
-                RowView.AddChidren(line2);
+                rowFrameLayout.AddChidren(line2);
 
                 #region 鏁版嵁澶勭悊
+                int currentIndex = i;
+                if (currentIndex == curLocalDoorLockUserList.Keys.Count - 1)
+                {
+                    line2.Visible = false;
+                }
                 switch (curDoorLockUser.UnlockType)
                 {
                     case 0:
-                        if (curDoorLockUser.UserName != "")
+                        if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                         {
                             btnText.Text = curDoorLockUser.UserName;
                         }
@@ -195,7 +306,7 @@
                         }
                         break;
                     case 3:
-                        if (curDoorLockUser.UserName != "")
+                        if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                         {
                             btnText.Text = curDoorLockUser.UserName;
                         }
@@ -205,7 +316,7 @@
                         }
                         break;
                     case 15:
-                        if (curDoorLockUser.UserName != "")
+                        if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
                         {
                             btnText.Text = curDoorLockUser.UserName;
                         }
@@ -222,64 +333,21 @@
                 };
                 btnDistributeUnlockIcon.MouseUpEventHandler += eHandler;
                 btnDistributeUnlockIconFrameLayout.MouseUpEventHandler += eHandler;
-                RowView.MouseUpEventHandler += eHandler;
+                rowFrameLayout.MouseUpEventHandler += eHandler;
                 btnText.MouseUpEventHandler += eHandler;
                 #endregion
+                i++;
             }
         }
 
-        public void MidFrameLayoutContent()
-        {
-            var midTopFrameLayout = new FrameLayout()
-            {
-                Height = Application.GetRealHeight(115),
-                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMTopFrameLayout,
-            };
-            this.midFrameLayout.AddChidren(midTopFrameLayout);
-
-            var btnAllMethod = new Button()
-            {
-                Height = Application.GetRealHeight(49),
-                Width = Application.GetRealWidth(141 + 100),
-                Y = Application.GetRealHeight(35),
-                X = Application.GetRealWidth(812 - 100),
-                TextAlignment = TextAlignment.Center,
-                Text = Language.StringByID(R.MyInternationalizationString.LockMethod),
-                TextColor = Shared.Common.ZigbeeColor.Current.XMTopTitleText,
-                TextSize = 12,
-            };
-            midTopFrameLayout.AddChidren(btnAllMethod);
-
-            var btnNext = new Button()
-            {
-                X = Application.GetRealWidth(953),
-                Y = Application.GetRealHeight(20),
-                Height = Application.GetRealHeight(69),
-                Width = Application.GetRealWidth(69),
-                UnSelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
-                SelectedImagePath = "DoorLock/UnLockSideslipIcon.png",
-            };
-            midTopFrameLayout.AddChidren(btnNext);
-            btnNext.MouseUpEventHandler += (sender, e) =>
-            {
-                SideslipFramelayout();
-            };
-
-            bodyView = new VerticalScrolViewLayout()
-            {
-                Y = midTopFrameLayout.Bottom,
-            };
-            this.midFrameLayout.AddChidren(bodyView);
-
-            RefreshList();
-        }
-
-        //鏈湴璐︽埛
-        public void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
+        /// <summary>
+        /// 鍒嗛厤鏈湴璐︽埛
+        /// </summary> 
+        void MatchUsersFrameLayout(ZigBee.Device.DoorLock.LocaDoorLockObj curDoorLockUser)
         {
             #region  UI
             FrameLayout flMain = new FrameLayout { BackgroundColor = 0x0f000000 };
-            this.midFrameLayout.AddChidren(flMain);
+            this.AddChidren(flMain);
             flMain.MouseUpEventHandler += (sender11, e11) =>
             {
                 flMain.RemoveFromParent();
@@ -288,24 +356,24 @@
             bottomFrameLayout = new FrameLayout()
             {
                 Height = Application.GetRealHeight(100),
-                Y = Application.GetRealHeight(930),
-                Radius = 17,
+                Y = Application.GetRealHeight(1253),
+                Radius = (uint)Application.GetRealHeight(100 / 2),
                 BackgroundColor = ZigbeeColor.Current.XMWhite,
             };
             flMain.AddChidren(bottomFrameLayout);
 
             var bottomFrameLayout1 = new FrameLayout()
             {
-                Height = Application.GetRealHeight(806 - 50),
-                Y = Application.GetRealHeight(930 + 48),
+                Height = Application.GetRealHeight(668 - 60),
+                Y = Application.GetRealHeight(1253 + 58),
                 BackgroundColor = ZigbeeColor.Current.XMWhite,
             };
             flMain.AddChidren(bottomFrameLayout1);
 
             var bottomFrameLayout2 = new FrameLayout()
             {
-                Height = Application.GetRealHeight(806),
-                Y = Application.GetRealHeight(930),
+                Height = Application.GetRealHeight(668),
+                Y = Application.GetRealHeight(1253),
             };
             flMain.AddChidren(bottomFrameLayout2);
 
@@ -329,33 +397,35 @@
 
             var btnMatchUser = new Button
             {
-                X = Application.GetRealWidth(446),
+                X = Application.GetRealWidth(159),
                 Y = Application.GetRealHeight(35),
                 Height = Application.GetRealHeight(63),
-                Width = Application.GetRealWidth(284),
-                Text = Language.StringByID(R.MyInternationalizationString.MatchPerson),
+                Width = Application.GetRealWidth(762),
+                Text = Language.StringByID(R.MyInternationalizationString.MatchUser),
                 TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
                 TextSize = 16,
+                TextAlignment = TextAlignment.Center,
             };
             matchUsersFrameLayout.AddChidren(btnMatchUser);
 
             var btnFinish = new Button
             {
-                X = Application.GetRealWidth(919),
+                X = Application.GetRealWidth(921),
                 Y = Application.GetRealHeight(40),
                 Height = Application.GetRealHeight(58),
-                Width = Application.GetRealWidth(101),
+                Width = Application.GetRealWidth(101 + 81),
                 Text = Language.StringByID(R.MyInternationalizationString.Complete),
-                TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                TextColor = Shared.Common.ZigbeeColor.Current.XMOrange,
                 TextSize = 14,
+                TextAlignment = TextAlignment.CenterLeft,
             };
             matchUsersFrameLayout.AddChidren(btnFinish);
 
             var btnTopLine = new FrameLayout()
             {
-                Height = Application.GetRealHeight(5),
+                Height = 1,
                 Y = Application.GetRealHeight(138),
-                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMGray3,
+                BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
             };
             bottomFrameLayout2.AddChidren(btnTopLine);
 
@@ -392,8 +462,8 @@
 
                 var btnChoose = new Button()
                 {
-                    Width = Application.GetRealWidth(60),
-                    Height = Application.GetRealHeight(60),
+                    Width = Application.GetMinRealAverage(60),
+                    Height = Application.GetMinRealAverage(60),
                     X = Application.GetRealWidth(861 + 81),
                     Y = Application.GetRealHeight(35),
                     SelectedImagePath = "DoorLock/SelectedIcon.png",
@@ -418,7 +488,7 @@
                     btnLine.Visible = false;
                 }
 
-                if (currentAccount.UserName != "" && currentAccount.UserName != null)
+                if (!string.IsNullOrEmpty(currentAccount.UserName))
                 {
                     btnUserName.Text = currentAccount.UserName;
                 }
@@ -429,6 +499,15 @@
 
                 EventHandler<MouseEventArgs> eHandler = (sender, e) =>
                 {
+                    if (doorLock.IsFreezeAccount[currentAccount.SubAccountDistributedMark] == true)
+                    {
+                        Application.RunOnMainThread(() =>
+                        {
+                            new Tip() { MaxWidth = 150, Text = btnUserName.Text + Language.StringByID(R.MyInternationalizationString.AccountIsFreezed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                        });
+                        return;
+                    }
+
                     if (!btnChoose.IsSelected)
                     {
                         if (oldbuttonChoose != null)
@@ -462,95 +541,142 @@
                 bottomFrameLayout.RemoveAll();
             };
 
-            btnFinish.MouseUpEventHandler += async (sender, e) =>
-            {
-                if (curAccountId == "")
-                {
-                    flMain.RemoveFromParent();
-                    bottomFrameLayout.RemoveAll();
-                }
-                else
-                {
-                    var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
-                    if (UserCenterResourse.UserInfo.AuthorityNo != 1)
-                    {
-                        addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
-                        addLockInfo.IsOtherAccountCtrl = true;
-                    }
-                    addLockInfo.CloudAccountId = curAccountId;
-                    if (doorLock.DeviceAddr != null)
-                    {
-                        addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
-                    }
-                    addLockInfo.OpenLockMode = curDoorLockUser.UnlockType;
-                    addLockInfo.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
-
-                    switch (curDoorLockUser.UnlockType)
-                    {
-                        case 0:
-                            if (curDoorLockUser.UserName != "")
-                            {
-                                addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
-                            }
-                            else
-                            {
-                                addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID;
-                            }
-                            break;
-                        case 3:
-                            if (curDoorLockUser.UserName != "")
-                            {
-                                addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
-                            }
-                            else
-                            {
-                                addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
-                            }
-                            break;
-                        case 15:
-                            if (curDoorLockUser.UserName != "")
-                            {
-                                addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
-                            }
-                            else
-                            {
-                                addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID;
-                            }
-                            break;
-                    }
-
-                    addLockInfo.EntryTime = curDoorLockUser.EntryTime;
-                    var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
-                    if (result != null && 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 = curDoorLockUser.UserName;
-                            localDoorLockObj.ConnectedAccount = curAccountId;
-                            doorLock.localDoorLockUserList.Add(curDoorLockUser.UserID, localDoorLockObj);
-                            RefreshList();
-                            flMain.RemoveFromParent();
-                            bottomFrameLayout.RemoveAll();
-                        }
-                    }
-                    else
-                    {
-                        new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Up, CloseTime = 1 }.Show(btnFinish);
-                        flMain.RemoveFromParent();
-                        bottomFrameLayout.RemoveAll();
-                    }
-                }
-            };
+            btnFinish.MouseUpEventHandler += (sender, e) =>
+           {
+               System.Threading.Tasks.Task.Run(async () =>
+               {
+                   try
+                   {
+                       Application.RunOnMainThread(() =>
+                       {
+                           CommonPage.Loading.Start("");
+                       });
+                       if (curAccountId == "")
+                       {
+                           Application.RunOnMainThread(() =>
+                           {
+                               flMain.RemoveFromParent();
+                               bottomFrameLayout.RemoveAll();
+                               CommonPage.Loading.Hide();
+                           });
+                       }
+                       else
+                       {
+                           var addLockInfo = new ZigBee.Device.DoorLock.AddDoorLockData();
+                           if (UserCenterResourse.UserInfo.AuthorityNo != 1)
+                           {
+                               addLockInfo.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
+                               addLockInfo.IsOtherAccountCtrl = true;
+                           }
+                           addLockInfo.CloudAccountId = curAccountId;
+                           if (doorLock.DeviceAddr != null)
+                           {
+                               addLockInfo.DoorLockId = doorLock.DeviceAddr + "_" + doorLock.DeviceEpoint;
+                           }
+                           addLockInfo.OpenLockMode = curDoorLockUser.UnlockType;
+                           addLockInfo.DoorLockLocalUserId = curDoorLockUser.UserID.ToString();
+                           switch (curDoorLockUser.UnlockType)
+                           {
+                               case 0:
+                                   if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
+                                   {
+                                       addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
+                                   }
+                                   else
+                                   {
+                                       addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID;
+                                   }
+                                   break;
+                               case 3:
+                                   if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
+                                   {
+                                       addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
+                                   }
+                                   else
+                                   {
+                                       addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
+                                   }
+                                   break;
+                               case 15:
+                                   if (!string.IsNullOrEmpty(curDoorLockUser.UserName))
+                                   {
+                                       addLockInfo.UserIdRemarks = curDoorLockUser.UserName;
+                                   }
+                                   else
+                                   {
+                                       addLockInfo.UserIdRemarks = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID;
+                                   }
+                                   break;
+                           }
+                           addLockInfo.EntryTime = curDoorLockUser.EntryTime;
+                           var result = await ZigBee.Device.DoorLock.SendDoorLockToServer("DoorLock/AddDoorLock", addLockInfo);
+                           if (result != null)
+                           {
+                               if (result.StateCode == "Success")
+                               {
+                                   //瀛橀棬閿佷俊鎭�
+                                   var resultList = await Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.GetCloudLocalDoorLocklist(doorLock, curAccountId);
+                                   var uList = new List<int> { };
+                                   if (resultList != null)
+                                   {
+                                       foreach (var a in resultList.Keys)
+                                       {
+                                           uList.Add(a);
+                                       }
+                                   }
+                                   var d = uList.Find((value) => { return value == curDoorLockUser.UserID; });
+                                   if (d != null)
+                                   {
+                                       Application.RunOnMainThread(() =>
+                                       {
+                                           new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.DistributeSuccess), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                                           TypeRefresh();
+                                           CommonPage.Loading.Hide();
+                                           flMain.RemoveFromParent();
+                                           bottomFrameLayout.RemoveAll();
+                                       });
+                                   }
+                                   else
+                                   {
+                                       Application.RunOnMainThread(() =>
+                                       {
+                                           CommonPage.Loading.Hide();
+                                           new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                                       });
+                                   }
+                               }
+                               else
+                               {
+                                   Application.RunOnMainThread(() =>
+                                   {
+                                       CommonPage.Loading.Hide();
+                                       new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.Down, CloseTime = 1 }.Show(Common.CommonPage.Instance);
+                                   });
+                                   return;
+                               }
+                           }
+                           else
+                           {
+                               Application.RunOnMainThread(() =>
+                               {
+                                   CommonPage.Loading.Hide();
+                                   new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFailed), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(btnFinish);
+                               });
+                               return;
+                           }
+                       }
+                   }
+                   catch { }
+               });
+           };
         }
 
-        // 渚ц竟瀵艰埅鏍�
+        /// <summary>
+        /// 渚ц竟瀵艰埅鏍忔悳绱�
+        /// </summary> 
         void SideslipFramelayout()
         {
+            #region sidelipFrameLayout UI
             var dialog = new Dialog
             {
             };
@@ -579,13 +705,18 @@
                 Y = Application.GetRealHeight(28),
             };
             sidelipFrameLayout.AddChidren(sidelipVerticalScrolViewLayout);
+            #endregion
+
             Button oldbutton = null;
             Button oldbuttonText = null;
             for (var i = 0; i < 4; i++)
             {
+                #region rowFrameLayout UI
                 var rowFrameLayout = new RowLayout()
                 {
                     Height = Application.GetRealHeight(150),
+                    LineColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
+                    X = Application.GetRealWidth(81),
                 };
                 sidelipVerticalScrolViewLayout.AddChidren(rowFrameLayout);
 
@@ -593,8 +724,7 @@
                 {
                     Width = Application.GetRealWidth(81),
                     Height = Application.GetRealHeight(81),
-                    X = Application.GetRealWidth(81),
-                    Y = Application.GetRealHeight(55),
+                    Y = Application.GetRealHeight(35),
                 };
                 rowFrameLayout.AddChidren(btnAllMethod);
 
@@ -602,14 +732,16 @@
                 {
                     Width = Application.GetRealWidth(311),
                     Height = Application.GetRealHeight(58),
-                    X = Application.GetRealWidth(173),
-                    Y = Application.GetRealHeight(69),
+                    X = Application.GetRealWidth(92),
+                    Y = Application.GetRealHeight(49),
                     TextColor = Shared.Common.ZigbeeColor.Current.XMGray3,
                     TextSize = 14,
                     TextAlignment = TextAlignment.CenterLeft,
                 };
                 rowFrameLayout.AddChidren(btnMethodText);
+                #endregion
 
+                #region 鏁版嵁澶勭悊
                 EventHandler<MouseEventArgs> hander = (sender, e) =>
                 {
                     if (!btnAllMethod.IsSelected)
@@ -627,220 +759,61 @@
                         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);
-                        }
+                        oldbuttonText.IsBold = true;
+                        TypeRefresh();
                     }
                     dialog.Close();
                 };
                 rowFrameLayout.MouseUpEventHandler += hander;
                 btnAllMethod.MouseUpEventHandler += hander;
                 btnMethodText.MouseUpEventHandler += hander;
+                DisplayAllUnlockMethod(i, btnAllMethod, btnMethodText);
 
-                switch (i)
+                if (string.IsNullOrEmpty(doorLock.currentUserDisplayMethod) && i == 0)
                 {
-                    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;
+                    CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
                 }
-
                 if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.AllMethod) && i == 0)
                 {
-                    btnAllMethod.IsSelected = true;
-                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                    oldbutton = btnAllMethod;
-                    oldbuttonText = btnMethodText;
+                    CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
                 }
                 if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock) && i == 1)
                 {
-                    btnAllMethod.IsSelected = true;
-                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                    oldbutton = btnAllMethod;
-                    oldbuttonText = btnMethodText;
+                    CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
                 }
                 if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock) && i == 2)
                 {
-                    btnAllMethod.IsSelected = true;
-                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                    oldbutton = btnAllMethod;
-                    oldbuttonText = btnMethodText;
+                    CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
                 }
                 if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock) && i == 3)
                 {
-                    btnAllMethod.IsSelected = true;
-                    btnMethodText.TextColor = Shared.Common.ZigbeeColor.Current.XMBlack;
-                    oldbutton = btnAllMethod;
-                    oldbuttonText = btnMethodText;
+                    CurrentSelectUnlockMethod(btnAllMethod, btnMethodText, oldbutton, oldbuttonText);
                 }
-            }
-        }
-
-        // 閫氳繃绫诲瀷绛涢�夋樉绀�
-        void DisplayByType(int unlockMethod)
-        {
-            bodyView.RemoveAll();
-            foreach (var curUserId in doorLock.localDoorLockUserList.Keys)
-            {
-                var curDoorLockUser = doorLock.localDoorLockUserList[curUserId];
-                if (curDoorLockUser.ConnectedAccount != "" || curDoorLockUser.UnlockType != unlockMethod)
-                {
-                    continue;
-                }
-                var RowView = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(161),
-                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMWhite,
-                };
-                bodyView.AddChidren(RowView);
-
-                var btnDistributeUnlockIconFrameLayout = new FrameLayout()
-                {
-                    Height = Application.GetRealHeight(84),
-                    Width = Application.GetRealWidth(84),
-                    X = Application.GetRealWidth(58),
-                    Y = Application.GetRealHeight(43),
-                };
-                RowView.AddChidren(btnDistributeUnlockIconFrameLayout);
-
-                var btnDistributeUnlockIcon = new Button()
-                {
-                    Height = Application.GetRealHeight(84),
-                    Width = Application.GetRealWidth(84),
-                    UnSelectedImagePath = "DoorLock/DistributeUnlockIcon.png",
-                };
-                btnDistributeUnlockIconFrameLayout.AddChidren(btnDistributeUnlockIcon);
-
-                var btnText = new Button()
-                {
-                    X = Application.GetRealWidth(176),
-                    Width = Application.GetRealWidth(300),
-                    Height = Application.GetRealHeight(300),
-                    TextAlignment = TextAlignment.CenterLeft,
-                    TextColor = Shared.Common.ZigbeeColor.Current.XMBlack,
-                    Gravity = Gravity.CenterVertical,
-                };
-                RowView.AddChidren(btnText);
-
-                var line2 = new Button()
-                {
-                    Y = RowView.Height - 1,
-                    X = Application.GetRealWidth(58),
-                    Width = Application.GetRealWidth(965),
-                    Height = 1,
-                    BackgroundColor = Shared.Common.ZigbeeColor.Current.XMRowLine,
-                };
-                RowView.AddChidren(line2);
-
-                #region 鏁版嵁澶勭悊
-                switch (curDoorLockUser.UnlockType)
-                {
-                    case 0:
-                        if (curDoorLockUser.UserName != "")
-                        {
-                            btnText.Text = curDoorLockUser.UserName;
-                        }
-                        else
-                        {
-                            btnText.Text = Language.StringByID(R.MyInternationalizationString.Password) + "ID" + curDoorLockUser.UserID;
-                        }
-                        break;
-                    case 3:
-                        if (curDoorLockUser.UserName != "")
-                        {
-                            btnText.Text = curDoorLockUser.UserName;
-                        }
-                        else
-                        {
-                            btnText.Text = Language.StringByID(R.MyInternationalizationString.IcCard) + "ID" + curDoorLockUser.UserID;
-                        }
-                        break;
-                    case 15:
-                        if (curDoorLockUser.UserName != "")
-                        {
-                            btnText.Text = curDoorLockUser.UserName;
-                        }
-                        else
-                        {
-                            btnText.Text = Language.StringByID(R.MyInternationalizationString.Fingerprint) + "ID" + +curDoorLockUser.UserID;
-                        }
-                        break;
-                }
-
-                EventHandler<MouseEventArgs> eHandler = (sender, e) =>
-                {
-                    MatchUsersFrameLayout(curDoorLockUser);
-                };
-                btnDistributeUnlockIcon.MouseUpEventHandler += eHandler;
-                btnDistributeUnlockIconFrameLayout.MouseUpEventHandler += eHandler;
-                RowView.MouseUpEventHandler += eHandler;
-                btnText.MouseUpEventHandler += eHandler;
                 #endregion
             }
         }
-        #region 鈼� 鎺ュ彛瀹炵幇__________________________
-        /// <summary>
-        /// 澶勭悊鍙樺寲浜嬩欢 --灏嗗純鐢� 鏀圭敤DeviceInfoChange()
-        /// </summary>
-        /// <returns>The changed.</returns>
-        /// <param name="common">Common.</param>
-        public void Changed(CommonDevice common)
-        {
 
-        }
         /// <summary>
-        /// 澶勭悊鍙樺寲浜嬩欢
+        /// 绫诲瀷鍖哄垎 
         /// </summary>
-        /// <param name="common"></param>
-        /// <param name="typeTag"></param>
-        public void DeviceInfoChange(CommonDevice common, string typeTag)
+        void TypeRefresh()
         {
+            if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.PasswordUnlock))
+            {
+                RefreshList(0);
+            }
+            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.FingerprintUnlock))
+            {
+                RefreshList(15);
+            }
+            else if (doorLock.currentUserDisplayMethod == Language.StringByID(R.MyInternationalizationString.ProximithCardUnlock))
+            {
+                RefreshList(3);
+            }
+            else
+            {
+                RefreshList();
+            }
         }
-        /// <summary>
-        /// Changeds the IL ogic status.
-        /// </summary>
-        /// <param name="logic">Logic.</param>
-        public void ChangedILogicStatus(ZigBee.Device.Logic logic)
-        {
-        }
-        /// <summary>
-        /// Changeds the IS cene status.
-        /// </summary>
-        /// <param name="scene">Scene.</param>
-        public void ChangedISceneStatus(Scene scene)
-        {
-        }
-        #endregion
     }
 }

--
Gitblit v1.8.0