Merge branch 'dev-tzy' into DEV_GXC

gxc

2019-11-07 a4924de3136289d10cabbf2f61a228387d44ded7

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

@@ -67,11 +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);

                }

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



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

                 {

                     this.UpOrDownSubAccountLevel();

@@ -222,10 +226,7 @@
            btnName.TextSize = 15;



            //开关

            var btnSwitch = row.AddMostRightEmptyIcon(104, 63);

            row.ChangedChidrenBindMode(btnSwitch, ChidrenBindMode.NotBind);

            btnSwitch.UnSelectedImagePath = "Item/Switch.png";

            btnSwitch.SelectedImagePath = "Item/SwitchSelected.png";

            var btnSwitch = row.AddMostRightSwitchIcon();

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

            {

                btnSwitch.IsSelected = !btnSwitch.IsSelected;

@@ -309,11 +310,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);

            });

        }