From 1c4904d77f484c075080942d87785481b52b6fb2 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期一, 28 十月 2019 14:58:46 +0800
Subject: [PATCH] Revert "Merge branch 'dev-tzy' into DEV_GXC"
---
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index b35bb71..da175eb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -57,11 +57,11 @@
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();
@@ -71,17 +71,10 @@
if (memberInfo.AccountType != 1)
{
msg = Language.StringByID(R.MyInternationalizationString.uUpSubAccountLevel);
- if (msg.Contains("{0}") == true)
- {
- msg = string.Format(msg, 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 +256,7 @@
var memberShardInfo = new MemberShardInfoData();
row.ButtonClickEvent += (sender, e) =>
{
- var form = new SharedContent.LookSharedListRoomForm();
+ var form = new SharedContent.SearchConfigureSharedListRoomForm();
form.AddForm(memberInfo, memberShardInfo);
};
}
@@ -303,11 +296,11 @@
//鍙樻洿鏉冮檺鍥炬爣
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;
--
Gitblit v1.8.0