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 | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index b35bb71..40e0cc9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -57,31 +57,28 @@
btnTopIcon = new MostRightIconControl(69, 69);
if (memberInfo.AccountType == 1)
{
- btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";
}
else
{
- btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";
}
topFrameLayout.AddChidren(btnTopIcon);
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);
- if (msg.Contains("{0}") == true)
- {
- msg = string.Format(msg, string.IsNullOrEmpty(memberInfo.UserName) == true ? memberInfo.Account : memberInfo.UserName);
- }
}
+ msg = msg.Replace("{0}", string.IsNullOrEmpty(memberInfo.UserName) == true ? memberInfo.Account : memberInfo.UserName);
+
this.ShowMassage(ShowMsgType.Confirm, msg, () =>
{
- //浜屾瀹夊叏楠岃瘉,濡傛灉娌℃湁璁剧疆鏈�,鐩存帴璺宠繃楠岃瘉
- HdlCheckLogic.Current.CheckSecondarySecurity(
- () => { this.UpOrDownSubAccountLevel(); },
- () => { this.UpOrDownSubAccountLevel(); });
+ this.UpOrDownSubAccountLevel();
});
};
}
@@ -263,7 +260,7 @@
var memberShardInfo = new MemberShardInfoData();
row.ButtonClickEvent += (sender, e) =>
{
- var form = new SharedContent.LookSharedListRoomForm();
+ var form = new SharedContent.SearchConfigureSharedListRoomForm();
form.AddForm(memberInfo, memberShardInfo);
};
}
@@ -303,21 +300,18 @@
//鍙樻洿鏉冮檺鍥炬爣
if (memberInfo.AccountType == 1)
{
- btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";
}
else
{
- btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";
}
//鍙樻洿鏉冮檺鏂囧瓧
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