Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

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

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

            {

                var menuContr = new TopRightMenuControl(this, 2);

                var menuContr = new TopRightMenuControl(2, 449);

                //扫描二维码

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

                menuContr.AddRowMenu(msg1,"","", () =>

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

                {

                    var form = new AddMemberByIdForm();

                    form.AddForm();

                });

                //输入账号

                string msg2 = Language.StringByID(R.MyInternationalizationString.uInputAccount);

                menuContr.AddRowMenu(msg2,"","", () =>

                menuContr.AddRowMenu(msg2, "Item/InputAccountIcon.png", "Item/InputAccountIconSelected.png", () =>

                {

                    var form = new AddMemberByIdForm();

                    form.AddForm();

@@ -69,9 +69,6 @@


            //初始化列表控件

            this.InitMemberListControl();



            //总之先清空共享文件夹准没错

            HdlShardLogic.Current.ClearShardDirectory();

        }



        #endregion

@@ -145,8 +142,13 @@
            listView.Y = frameBack.Bottom;

            bodyFrameLayout.AddChidren(listView);



            //初始化成员列表

            this.InitMemberList();

            HdlThreadLogic.Current.RunMainInThread(() =>

            {

                //总之先清空共享文件夹准没错

                HdlShardLogic.Current.ClearShardDirectory();

                //初始化成员列表

                this.InitMemberList();

            });

        }



        /// <summary>

@@ -190,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);