2019-12-30-1

WJC

2019-12-30 f1c3921b08bb22ac6f5db22d620e01d7e8e5c49f

 ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs

@@ -18,7 +18,6 @@
        VerticalRefreshLayout middle;
        CommonDevice common;
        Dictionary<string, string> editdeviceConditionsInfo;

        public void Show(CommonDevice commondevice, Dictionary<string, string> editdeviceConditions = null)
        {
            common = commondevice;
@@ -44,6 +43,7 @@
                Height = Application.GetRealHeight(69),
                Y = Application.GetRealHeight(92),
                TextID = MyInternationalizationString.userlist,
                IsBold = true,
            };
            topRowLayout.AddChidren(titleName);

@@ -92,6 +92,7 @@
                    {
                        ///从列表移除当前门锁全部的旧数据；
                        Send.LockList.Remove(Send.LockList[i]);
                        i--;
                    }
                }
                Read();
@@ -103,7 +104,7 @@
        /// <summary>
        /// 读取当前门锁的云端数据；
        /// </summary>
        public async void Read()
        public void Read()
        {

            bool d = false;
@@ -118,14 +119,29 @@
                }

            }

            CommonPage.Loading.Start();
            if (!d)
            {
                var allMemberslist = await Send.AllMembers(common.DeviceAddr);
                Send.LockList.AddRange(allMemberslist);
            }
            UserList(macport);
            CommonPage.Loading.Hide();
            middle.RemoveAll();
            System.Threading.Tasks.Task.Run(async () =>
           {
               try
               {
                   if (!d)
                   {
                       var allMemberslist = await Send.AllMembers(macport);
                       Send.LockList.AddRange(allMemberslist);
                   }
               }
               catch { }
               finally
               {
                   Application.RunOnMainThread(() =>
                   {
                       CommonPage.Loading.Hide();
                       UserList(macport);
                   });
               }
           });
        }
        /// <summary>
        /// 成员列表的方法
@@ -133,7 +149,6 @@
        /// <param name="macport"></param>
        public void UserList(string macport)
        {

            foreach (var user in Send.LockList)
            {
                if (user.DoorLockMacPort != macport)