From 081ea8d273048fd03756718ac6fb48a3c09218e9 Mon Sep 17 00:00:00 2001
From: gxc <guoxuecheng@guoxuechengdeMacBook-Pro.local>
Date: 星期二, 29 十月 2019 13:10:00 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into DEV_GXC
---
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index da175eb..b35bb71 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 = "Account/HadAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
}
else
{
- btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
}
topFrameLayout.AddChidren(btnTopIcon);
btnTopIcon.InitControl();
@@ -71,10 +71,17 @@
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, () =>
{
- this.UpOrDownSubAccountLevel();
+ //浜屾瀹夊叏楠岃瘉,濡傛灉娌℃湁璁剧疆鏈�,鐩存帴璺宠繃楠岃瘉
+ HdlCheckLogic.Current.CheckSecondarySecurity(
+ () => { this.UpOrDownSubAccountLevel(); },
+ () => { this.UpOrDownSubAccountLevel(); });
});
};
}
@@ -256,7 +263,7 @@
var memberShardInfo = new MemberShardInfoData();
row.ButtonClickEvent += (sender, e) =>
{
- var form = new SharedContent.SearchConfigureSharedListRoomForm();
+ var form = new SharedContent.LookSharedListRoomForm();
form.AddForm(memberInfo, memberShardInfo);
};
}
@@ -296,11 +303,11 @@
//鍙樻洿鏉冮檺鍥炬爣
if (memberInfo.AccountType == 1)
{
- btnTopIcon.UnSelectedImagePath = "Account/HadAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Item/HadAuthority.png";
}
else
{
- btnTopIcon.UnSelectedImagePath = "Account/NotAuthority.png";
+ btnTopIcon.UnSelectedImagePath = "Item/NotAuthority.png";
}
//鍙樻洿鏉冮檺鏂囧瓧
btnAuthority.TextID = memberInfo.AccountType == 1 ? R.MyInternationalizationString.uMemberHadActionAuthority : R.MyInternationalizationString.uMember;
--
Gitblit v1.8.0