From 97e259d966cb5cb5d73c105d5dbaadcc1f920614 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 十月 2019 13:48:43 +0800
Subject: [PATCH] 合并了全部的代码
---
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs | 61 +++++++++++++-----------------
1 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index a50a04e..cbfe08e 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(this, 2);
+ var menuContr = new TopRightMenuControl(2, 449);
//鎵弿浜岀淮鐮�
string msg1 = Language.StringByID(R.MyInternationalizationString.uScanQRcode);
- menuContr.AddRowMenu(msg1,"","", () =>
+ menuContr.AddRowMenu(msg1, "Item/ScanQRcodeIcon.png", "Item/ScanQRcodeIconSelected.png", () =>
{
var form = new AddMemberByIdForm();
form.AddForm();
});
//杈撳叆璐﹀彿
string msg2 = Language.StringByID(R.MyInternationalizationString.uInputAccount);
- menuContr.AddRowMenu(msg2,"","", () =>
+ menuContr.AddRowMenu(msg2, "Item/InputAccountIcon.png", "Item/InputAccountIconSelected.png", () =>
{
var form = new AddMemberByIdForm();
form.AddForm();
@@ -69,9 +69,6 @@
//鍒濆鍖栧垪琛ㄦ帶浠�
this.InitMemberListControl();
-
- //鎬讳箣鍏堟竻绌哄叡浜枃浠跺す鍑嗘病閿�
- HdlShardLogic.Current.ClearShardDirectory();
}
#endregion
@@ -132,15 +129,26 @@
btnMenberTile.TextSize = 15;
bodyFrameLayout.AddChidren(btnMenberTile);
+ var frameBack = new FrameLayout();
+ frameBack.Y = btnMenberTile.Bottom + Application.GetRealHeight(23);
+ frameBack.Height = Application.GetRealHeight(11);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ bodyFrameLayout.AddChidren(frameBack);
+
//娣诲姞鍙互鍚戜笅婊氬姩鐨勬帶浠�
listView = new VerticalListControl(12);
- listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(567);
+ listView.Height = bodyFrameLayout.Height - frameBack.Bottom;
listView.BackgroundColor = UserCenterColor.Current.White;
- listView.Y = Application.GetRealHeight(567);
+ listView.Y = frameBack.Bottom;
bodyFrameLayout.AddChidren(listView);
- //鍒濆鍖栨垚鍛樺垪琛�
- this.InitMemberList();
+ HdlThreadLogic.Current.RunMainInThread(() =>
+ {
+ //鎬讳箣鍏堟竻绌哄叡浜枃浠跺す鍑嗘病閿�
+ HdlShardLogic.Current.ClearShardDirectory();
+ //鍒濆鍖栨垚鍛樺垪琛�
+ this.InitMemberList();
+ });
}
/// <summary>
@@ -184,12 +192,17 @@
{
if (listCheck.Contains(infoRes.DistributedMark) == true
|| infoRes.Account == UserCenterResourse.UserInfo.Phone
- || infoRes.Account == UserCenterResourse.UserInfo.Email
- || infoRes.AccountType != 0)
+ || infoRes.Account == UserCenterResourse.UserInfo.Email)
{
- //濡傛灉鏄畠鑷繁鐨勮瘽,鎴栬�呮潈闄愮瓑绾ф瘮浠栭珮鐨勶紝涓嶆樉绀�
+ //濡傛灉鏄畠鑷繁鐨勮瘽锛屼笉鏄剧ず
continue;
}
+ if (UserCenterResourse.UserInfo.AuthorityNo != 1 && infoRes.AccountType != 0)
+ {
+ //涓嶈兘澶熻幏鍙栨潈闄愮瓑绾ф瘮浠栭珮鐨�(涓讳汉鑷繁鍙互鏃犺杩欎釜鍒ゆ柇)
+ continue;
+ }
+
listCheck.Add(infoRes.DistributedMark);
//娣诲姞鎴愬憳淇℃伅鐨勭紦瀛�
UserCenterResourse.ListMemberInfo.Add(infoRes);
@@ -223,18 +236,8 @@
//娣诲姞鎴愬憳琛�
this.AddRowLayout(listNewInfo[i], i != count);
}
- if (listNewInfo.Count == 0)
- {
- return;
- }
//璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
- var realHeight = listNewInfo.Count * listView.GetChildren(listView.ChildrenCount - 1).Height;
- realHeight += Application.GetRealHeight(23) - listView.rowSpace + Application.GetRealHeight(23);
- if (realHeight < listView.Height)
- {
- //缂╁皬鎺т欢楂樺害
- listView.Height = realHeight;
- }
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#endregion
@@ -248,16 +251,6 @@
/// <param name="addLine">addLine</param>
private void AddRowLayout(MemberInfoRes info, bool addLine)
{
- if (listView.ChildrenCount == 0)
- {
- //濉炰竴涓┖鐧界殑杩涘幓鍗犵┖闂�
- var rowTemp = new FrameRowControl();
- rowTemp.UseClickStatu = false;
- rowTemp.Height = Application.GetRealHeight(23) - listView.rowSpace;
- rowTemp.MainKeys = string.Empty;
- listView.AddChidren(rowTemp);
- }
-
var rowlayout = new FrameRowControl(listView.rowSpace / 2);
rowlayout.Height = Application.GetRealHeight(138);
rowlayout.MainKeys = info.Account;
--
Gitblit v1.8.0