合并了代码

黄学彪

2019-12-30 3dcbd186c42c598c0c08d1cd37034cf2baa09e54

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

@@ -99,23 +99,12 @@
                //关闭刷新View；
                middle.EndHeaderRefreshing();
            };
            //Read();

            CommonPage.Loading.Start();
            new System.Threading.Thread(() =>
           {
               Application.RunOnMainThread(() =>
               {
                   Read();
                   CommonPage.Loading.Hide();
               });
           })
            { IsBackground = true }.Start();
            Read();
        }
        /// <summary>
        /// 读取当前门锁的云端数据；
        /// </summary>
        public async void Read()
        public void Read()
        {

            bool d = false;
@@ -130,12 +119,29 @@
                }

            }
            if (!d)
            {
                var allMemberslist = await Send.AllMembers(macport);
                Send.LockList.AddRange(allMemberslist);
            }
            UserList(macport);

            CommonPage.Loading.Start();
            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>
        /// 成员列表的方法
@@ -143,7 +149,6 @@
        /// <param name="macport"></param>
        public void UserList(string macport)
        {
            middle.RemoveAll();
            foreach (var user in Send.LockList)
            {
                if (user.DoorLockMacPort != macport)