全部合并了代码，安卓和 IOS 都测试通过了

黄学彪

2019-11-13 8b9ce384b26c414db32f98e94e088f5334869c2d

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

@@ -82,14 +82,34 @@
                BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
            };
            this.AddChidren(middle);
            if (Send.UserList.Count == 0)


            bool d = false;
            string macport = common.DeviceAddr + "_" + common.DeviceEpoint.ToString();
            for (int i = 0; i < Send.LockList.Count; i++)
            {
                if (Send.LockList[i].DoorLockMacPort == macport)
                {
                    ///已经存在该门锁信息
                    d = true;
                    break;
                }

            }

            if (!d)
            {
                var allMemberslist = await Send.AllMembers(common.DeviceAddr);
                Send.UserList.AddRange(allMemberslist);
                Send.LockList.AddRange(allMemberslist);
            }
            foreach (var user in Send.UserList)
            {

       
            foreach (var user in Send.LockList)
            {
                if (user.DoorLockMacPort != macport)
                {
                    continue;
                }
                var userFramelayout = new RowLayout
                {
                    Height = Application.GetRealHeight(160),
@@ -111,7 +131,7 @@

                var userBtn = new Button
                {
                    Text = user.MembershipName,
                    Text = user.UserName,
                    TextAlignment = TextAlignment.CenterLeft,
                    TextColor = ZigbeeColor.Current.LogicTextBlackColor,
                };
@@ -188,7 +208,7 @@
                        TextAlignment = TextAlignment.Center,
                        X = Btncancel.Right + Application.GetRealWidth(100),
                        TextSize = 16,
                        Text = user.MembershipName,
                        Text = user.UserName,
                    };
                    lockRow.AddChidren(Btntitle);
                    var Btncomplete = new Button
@@ -232,27 +252,28 @@
                            Width = Application.GetRealWidth(600),
                            TextAlignment = TextAlignment.CenterLeft,
                            TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor,
                            Text= userifon.ModeName,
                        };
                        doorlockRow.AddChidren(doorlockBtn);
                        //(1按键/3卡/15指纹)
                        switch (userifon.OpenMode.ToString())
                        {
                            case "0":
                                {
                                    doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
                                }
                                break;
                            case "3":
                                {
                                    doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
                                }
                                break;
                            case "15":
                                {
                                    doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
                                }
                                break;
                        }
                        //switch (userifon.OpenMode.ToString())
                        //{
                        //    case "0":
                        //        {
                        //            doorlockBtn.Text = Language.StringByID(MyInternationalizationString.lockpassword);
                        //        }
                        //        break;
                        //    case "3":
                        //        {
                        //            doorlockBtn.Text = Language.StringByID(MyInternationalizationString.ic);
                        //        }
                        //        break;
                        //    case "15":
                        //        {
                        //            doorlockBtn.Text = Language.StringByID(MyInternationalizationString.fingerprint);
                        //        }
                        //        break;
                        //}
                        var doorlockSelected = new Button
                        {
                            X = Application.GetRealWidth(860),