2020-01-15-1

WJC

2020-01-15 c6ff92e84b6cb2815cb98065ecb0ecf95d0689c3

 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(common.DeviceAddr);
                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)
@@ -201,7 +206,7 @@
            }


        }          
        }
        /// <summary>
        /// 当前成员信息的方法
        /// </summary>
@@ -291,6 +296,13 @@
            string SelectedDeviceStatuscondition = "";
            lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * user.UserIdMode.Count) - 20 - 50);
            lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * user.UserIdMode.Count) + 20 + 50);
            if (user.UserIdMode.Count > 9)
            {
                ///元素超出10个，暂时默认显示10;
                lockcolorfra1.Y = Application.GetRealHeight(1920 - 140 - (160 * 9) - 20 - 50);
                lockcolorfra1.Height = Application.GetRealHeight(140 + (160 * 9) + 20 + 50);
            }

            for (int i = 0; i < user.UserIdMode.Count; i++)
            {
                var userifon = user.UserIdMode[i];
@@ -320,6 +332,30 @@
                    TextSize = 14,
                };
                doorlockRow.AddChidren(doorlockBtn);
                if (string.IsNullOrEmpty(doorlockBtn.Text))
                {
                    string strname = "";
                    switch (userifon.OpenMode)
                    {
                        case 0:
                            {
                                strname = Language.StringByID(MyInternationalizationString.lockpassword);
                            }
                            break;
                        case 3:
                            {
                                strname = Language.StringByID(MyInternationalizationString.ic);
                            }
                            break;
                        case 15:
                            {
                                strname = Language.StringByID(MyInternationalizationString.fingerprint);
                            }
                            break;
                    }
                    doorlockBtn.Text = strname + "ID" + userifon.UserId;
                }


                var doorlockSelected = new Button
                {
@@ -379,7 +415,8 @@
                deviceConditionsInfo.Add("Range", "0");
                deviceConditionsInfo.Add("AttriButeId", openMode);
                deviceConditionsInfo.Add("AttriButeData2", userId);
                userdictionary.Add("Account", accountname);
                userdictionary.Add("Account", Config.Instance.Guid);
                userdictionary.Add("AccountName", accountname);//用来显示名称
                userdictionary.Add("Type", "1");
                userdictionary.Add("UserId", userId);
                if (edit)
@@ -438,9 +475,9 @@
                {
                    if (!edit)
                    {
                        var alert = new Alert(Language.StringByID(MyInternationalizationString.Prompt),
                                               Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                                               Language.StringByID(MyInternationalizationString.complete));
                        var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
                         Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
                         Language.StringByID(MyInternationalizationString.confrim));
                        alert.Show();
                        return;
                    }