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/MemberListForm.cs | 29 +++++++++++------------------
1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index cbfe08e..38c4032 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
@@ -34,17 +34,17 @@
titleIcon.InitControl();
titleIcon.ButtonClickEvent += (sender, e) =>
{
- var menuContr = new TopRightMenuControl(2, 449);
+ var menuContr = new TopRightMenuControl(this, 2);
//鎵弿浜岀淮鐮�
string msg1 = Language.StringByID(R.MyInternationalizationString.uScanQRcode);
- menuContr.AddRowMenu(msg1, "Item/ScanQRcodeIcon.png", "Item/ScanQRcodeIconSelected.png", () =>
+ menuContr.AddRowMenu(msg1,"","", () =>
{
var form = new AddMemberByIdForm();
form.AddForm();
});
//杈撳叆璐﹀彿
string msg2 = Language.StringByID(R.MyInternationalizationString.uInputAccount);
- menuContr.AddRowMenu(msg2, "Item/InputAccountIcon.png", "Item/InputAccountIconSelected.png", () =>
+ menuContr.AddRowMenu(msg2,"","", () =>
{
var form = new AddMemberByIdForm();
form.AddForm();
@@ -69,6 +69,9 @@
//鍒濆鍖栧垪琛ㄦ帶浠�
this.InitMemberListControl();
+
+ //鎬讳箣鍏堟竻绌哄叡浜枃浠跺す鍑嗘病閿�
+ HdlShardLogic.Current.ClearShardDirectory();
}
#endregion
@@ -142,13 +145,8 @@
listView.Y = frameBack.Bottom;
bodyFrameLayout.AddChidren(listView);
- HdlThreadLogic.Current.RunMainInThread(() =>
- {
- //鎬讳箣鍏堟竻绌哄叡浜枃浠跺す鍑嗘病閿�
- HdlShardLogic.Current.ClearShardDirectory();
- //鍒濆鍖栨垚鍛樺垪琛�
- this.InitMemberList();
- });
+ //鍒濆鍖栨垚鍛樺垪琛�
+ this.InitMemberList();
}
/// <summary>
@@ -192,17 +190,12 @@
{
if (listCheck.Contains(infoRes.DistributedMark) == true
|| infoRes.Account == UserCenterResourse.UserInfo.Phone
- || infoRes.Account == UserCenterResourse.UserInfo.Email)
+ || infoRes.Account == UserCenterResourse.UserInfo.Email
+ || infoRes.AccountType != 0)
{
- //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず
+ //濡傛灉鏄畠鑷繁鐨勮瘽,鎴栬�呮潈闄愮瓑绾ф瘮浠栭珮鐨勶紝涓嶆樉绀�
continue;
}
- if (UserCenterResourse.UserInfo.AuthorityNo != 1 && infoRes.AccountType != 0)
- {
- //涓嶈兘澶熻幏鍙栨潈闄愮瓑绾ф瘮浠栭珮鐨�(涓讳汉鑷繁鍙互鏃犺杩欎釜鍒ゆ柇)
- continue;
- }
-
listCheck.Add(infoRes.DistributedMark);
//娣诲姞鎴愬憳淇℃伅鐨勭紦瀛�
UserCenterResourse.ListMemberInfo.Add(infoRes);
--
Gitblit v1.8.0