From c7698e163e43cea9e7f8ee45f8e3f91c9265cca4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 04 十一月 2019 19:11:41 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
index 0e308f5..b26c46e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/SubAccountLevelUpSuccessForm.cs
@@ -43,7 +43,7 @@
frame.Height = Application.GetRealHeight(1097);
frame.BackgroundColor = UserCenterColor.Current.White;
frame.Gravity = Gravity.Center;
- frame.Radius = (uint)Application.GetMinRealAverage(6);
+ frame.Radius = 6;
bodyFrameLayout.AddChidren(frame);
//鐢ㄦ埛鍥炬爣
@@ -71,28 +71,47 @@
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;
+ 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