From a4924de3136289d10cabbf2f61a228387d44ded7 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期四, 07 十一月 2019 13:48:36 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index deaf1b7..40e0cc9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/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);
});
}
--
Gitblit v1.8.0