合并了全部的代码

黄学彪

2019-10-18 97e259d966cb5cb5d73c105d5dbaadcc1f920614

 ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs

@@ -34,7 +34,7 @@
            titleIcon.InitControl();

            titleIcon.ButtonClickEvent += (sender, e) =>

            {

                var menuContr = new TopRightMenuControl(this, 2, 449);

                var menuContr = new TopRightMenuControl(2, 449);

                //扫描二维码

                string msg1 = Language.StringByID(R.MyInternationalizationString.uScanQRcode);

                menuContr.AddRowMenu(msg1, "Item/ScanQRcodeIcon.png", "Item/ScanQRcodeIconSelected.png", () =>

@@ -192,12 +192,17 @@
            {

                if (listCheck.Contains(infoRes.DistributedMark) == true

                    || infoRes.Account == UserCenterResourse.UserInfo.Phone

                    || infoRes.Account == UserCenterResourse.UserInfo.Email

                    || infoRes.AccountType != 0)

                    || infoRes.Account == UserCenterResourse.UserInfo.Email)

                {

                    //如果是它自己的话,或者权限等级比他高的，不显示

                    //如果是它自己的话，不显示

                    continue;

                }

                if (UserCenterResourse.UserInfo.AuthorityNo != 1 && infoRes.AccountType != 0)

                {

                    //不能够获取权限等级比他高的(主人自己可以无视这个判断)

                    continue;

                }



                listCheck.Add(infoRes.DistributedMark);

                //添加成员信息的缓存

                UserCenterResourse.ListMemberInfo.Add(infoRes);