Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-10-29 081ea8d273048fd03756718ac6fb48a3c09218e9

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

@@ -57,11 +57,11 @@
            btnTopIcon = new MostRightIconControl(69, 69);

            if (memberInfo.AccountType == 1)

            {

                btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";

                btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";

            }

            else

            {

                btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";

                btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";

            }

            topFrameLayout.AddChidren(btnTopIcon);

            btnTopIcon.InitControl();

@@ -71,10 +71,17 @@
                if (memberInfo.AccountType != 1)

                {

                    msg = Language.StringByID(R.MyInternationalizationString.uUpSubAccountLevel);

                    if (msg.Contains("{0}") == true)

                    {

                        msg = string.Format(msg, string.IsNullOrEmpty(memberInfo.UserName) == true ? memberInfo.Account : memberInfo.UserName);

                    }

                }

                this.ShowMassage(ShowMsgType.Confirm, msg, () =>

                 {

                     this.UpOrDownSubAccountLevel();

                     //二次安全验证,如果没有设置有,直接跳过验证

                     HdlCheckLogic.Current.CheckSecondarySecurity(

                         () => { this.UpOrDownSubAccountLevel(); },

                         () => { this.UpOrDownSubAccountLevel(); });

                 });

            };

        }

@@ -256,7 +263,7 @@
            var memberShardInfo = new MemberShardInfoData();

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

            {

                var form = new SharedContent.SearchConfigureSharedListRoomForm();

                var form = new SharedContent.LookSharedListRoomForm();

                form.AddForm(memberInfo, memberShardInfo);

            };

        }

@@ -296,11 +303,11 @@
                //变更权限图标

                if (memberInfo.AccountType == 1)

                {

                    btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";

                    btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";

                }

                else

                {

                    btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";

                    btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";

                }

                //变更权限文字

                btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;