合并了全部的代码

黄学彪

2019-11-04 c7698e163e43cea9e7f8ee45f8e3f91c9265cca4

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

@@ -67,15 +67,15 @@
            btnTopIcon.InitControl();

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

            {

                //确定取消「{0}」管理员权限？

                string msg = Language.StringByID(R.MyInternationalizationString.uDownSubAccountLevel);

                if (memberInfo.AccountType != 1)

                {

                    //确定授权「{0}」成为管理员?

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

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

                    {

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

                    }

                }

                msg = msg.Replace("{0}", string.IsNullOrEmpty(memberInfo.UserName) == true ? memberInfo.Account : memberInfo.UserName);



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

                 {

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

@@ -313,11 +313,8 @@
                btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;



                //打开显示成功的画面

                if (memberInfo.AccountType == 1)

                {

                    var form = new SubAccountLevelUpSuccessForm();

                    form.AddForm(memberInfo);

                }

                var form = new SubAccountLevelUpSuccessForm();

                form.AddForm(memberInfo);

            });

        }