请合并代码

xm

2020-04-16 6fa9d69da922c8049f5acfcbb9ce9fd26811024c

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

@@ -43,18 +43,30 @@
            frame.Height = Application.GetRealHeight(1097);

            frame.BackgroundColor = UserCenterColor.Current.White;

            frame.Gravity = Gravity.Center;

            frame.Radius = 6;

            frame.Radius = (uint)Application.GetRealHeight(17);

            bodyFrameLayout.AddChidren(frame);



            //用户图标

            var btnUserIcon = new PicViewControl(207, 207);
            string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, memberInfo.DistributedMark + ".png");

            var btnUserIcon = new ImageView();

            btnUserIcon.Height = Application.GetMinRealAverage(207);

            btnUserIcon.Width = Application.GetMinRealAverage(207);

            btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
            btnUserIcon.Y = Application.GetRealHeight(104);
            btnUserIcon.Gravity = Gravity.CenterHorizontal;

            btnUserIcon.UnSelectedImagePath = "Center/Admin.png";
            if (System.IO.File.Exists(iconPath) == true)

            {

                btnUserIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);

            }

            else

            {

                btnUserIcon.ImagePath = "Center/Admin.png";

            }
            frame.AddChidren(btnUserIcon);



            //昵称

            var btnName = new NormalViewControl(frame.Width, Application.GetRealHeight(55), false);

            btnName.IsBold = true;
            btnName.TextAlignment = TextAlignment.Center;
            btnName.Y = Application.GetRealHeight(334);
            btnName.TextColor = UserCenterColor.Current.TextColor2;
@@ -70,7 +82,7 @@
            var btnAuthority = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);

            btnAuthority.TextAlignment = TextAlignment.Center;
            btnAuthority.Y = Application.GetRealHeight(400);
            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;

            btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;

            if (memberInfo.AccountType == 1)

            {

                btnAuthority.TextID = R.MyInternationalizationString.Administrator;

@@ -84,6 +96,7 @@


            

            var btnMsg = new NormalViewControl(frame.Width, Application.GetRealHeight(81), false);

            btnMsg.IsBold = true;

            if (memberInfo.AccountType == 1)

            {

                //授权成功!

@@ -112,7 +125,7 @@
                //该管理员已成为成员

                btnView.TextID = R.MyInternationalizationString.uSubAccountLevelIsDown;

            }

            btnView.TextColor = UserCenterColor.Current.TextGrayColor;

            btnView.TextColor = UserCenterColor.Current.TextGrayColor1;

            btnView.IsMoreLines = true;

            btnView.TextSize = 12;

            frame.AddChidren(btnView);