From fa6bcb2e9907772480f99205f36ec2a1ce735a22 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 09 一月 2020 14:11:07 +0800
Subject: [PATCH] 合并代码
---
ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
index 0e308f5..5de6cb0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
+++ b/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 = (uint)Application.GetMinRealAverage(6);
+ frame.Radius = (uint)Application.GetRealHeight(17);
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
- var btnUserIcon = new PicViewControl(207, 207);
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.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;
@@ -71,28 +83,48 @@
btnAuthority.TextAlignment = TextAlignment.Center;
btnAuthority.Y = Application.GetRealHeight(400);
btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
- btnAuthority.TextID = R.MyInternationalizationString.uMember;
+ if (memberInfo.AccountType == 1)
+ {
+ btnAuthority.TextID = R.MyInternationalizationString.Administrator;
+ }
+ else
+ {
+ btnAuthority.TextID = R.MyInternationalizationString.uMember;
+ }
btnAuthority.TextSize = 12;
frame.AddChidren(btnAuthority);
- //鎴愬憳鎺堟潈鎴愬姛
+
var btnMsg = new NormalViewControl(frame.Width, Application.GetRealHeight(81), false);
- btnMsg.TextID = R.MyInternationalizationString.uMemberAuthorizationSuccess;
+ btnMsg.IsBold = true;
+ if (memberInfo.AccountType == 1)
+ {
+ //鎺堟潈鎴愬姛!
+ btnMsg.TextID = R.MyInternationalizationString.uMemberAuthorizationSuccess;
+ }
+ else
+ {
+ //鍙栨秷鎴愬姛
+ btnMsg.TextID = R.MyInternationalizationString.uCancelSuccess;
+ }
btnMsg.Y = Application.GetRealHeight(541);
btnMsg.TextAlignment = TextAlignment.Center;
btnMsg.TextSize = 20;
frame.AddChidren(btnMsg);
- //璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�,鎮ㄧ殑鎺у埗鏉冨凡绉讳氦
- string strMsg = Language.StringByID(R.MyInternationalizationString.uSubAccountLevelIsUpAndLetAuthorization);
- if (strMsg.Contains("{0}") == true)
- {
- strMsg = string.Format(strMsg, "\r\n", "\r\n");
- }
- var btnView = new NormalViewControl(frame.Width, Application.GetRealHeight(147), false);
- btnView.Y = Application.GetRealHeight(622);
+ var btnView = new NormalViewControl(frame.Width, Application.GetRealHeight(50), false);
+ btnView.Y = btnMsg.Bottom;
btnView.TextAlignment = TextAlignment.Center;
- btnView.Text = strMsg;
+ if (memberInfo.AccountType == 1)
+ {
+ //璇ユ垚鍛樺凡鎴愪负绠＄悊鍛�
+ btnView.TextID = R.MyInternationalizationString.uSubAccountLevelIsUp;
+ }
+ else
+ {
+ //璇ョ鐞嗗憳宸叉垚涓烘垚鍛�
+ btnView.TextID = R.MyInternationalizationString.uSubAccountLevelIsDown;
+ }
btnView.TextColor = UserCenterColor.Current.TextGrayColor;
btnView.IsMoreLines = true;
btnView.TextSize = 12;
--
Gitblit v1.8.0