From d01084d99dd3cf12e89bb32135f84f13970500f9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 19 五月 2020 09:42:07 +0800
Subject: [PATCH] 2020-05-19-1
---
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index 6e549ec..d5b2cbd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
@@ -42,7 +42,7 @@
titleIcon.InitControl();
titleIcon.ButtonClickEvent += (sender, e) =>
{
- var menuContr = new TopRightMenuControl(2, 449);
+ var menuContr = new TopRightMenuControl(2, 2);
//鎵弿浜岀淮鐮�
string msg1 = Language.StringByID(R.MyInternationalizationString.uScanQRcode);
menuContr.AddRowMenu(msg1, "Item/ScanQRcodeIcon.png", "Item/ScanQRcodeIconSelected.png", () =>
@@ -55,7 +55,10 @@
}
//鎼滅储ID
this.SearchMemberInfo(qrCode);
- });
+ },
+ Language.StringByID(R.MyInternationalizationString.uCancel),
+ Language.StringByID(R.MyInternationalizationString.uFlashlamp),
+ msg1);
});
//杈撳叆璐﹀彿
string msg2 = Language.StringByID(R.MyInternationalizationString.uInputAccount);
@@ -102,9 +105,9 @@
//鐢ㄦ埛鍥炬爣
var btnUserIcon = new ImageView();
- btnUserIcon.Height = Application.GetMinRealAverage(207);
- btnUserIcon.Width = Application.GetMinRealAverage(207);
- btnUserIcon.Radius = (uint)Application.GetMinRealAverage(207) / 2;
+ btnUserIcon.Height = this.GetPictrueRealSize(207);
+ btnUserIcon.Width = this.GetPictrueRealSize(207);
+ btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
btnUserIcon.ImagePath = UserCenterResourse.UserInfo.UserIconFile;
btnUserIcon.Y = Application.GetRealHeight(46);
btnUserIcon.Gravity = Gravity.CenterHorizontal;
@@ -123,7 +126,7 @@
btnAuthority.TextAlignment = TextAlignment.Center;
btnAuthority.Y = btnName.Bottom + Application.GetRealHeight(10);
btnAuthority.TextSize = 12;
- btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor;
+ btnAuthority.TextColor = UserCenterColor.Current.TextGrayColor1;
btnAuthority.Text = UserCenterResourse.UserInfo.AuthorityText;
frameBack.AddChidren(btnAuthority);
}
@@ -278,13 +281,13 @@
listView.AddChidren(rowlayout);
//鎴愬憳澶村儚鍥炬爣
- string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, info.DistributedMark + ".png");
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, info.DistributedMark + ".png");
var btnIcon = new ImageView();
btnIcon.X = ControlCommonResourse.XXLeft;
btnIcon.Gravity = Gravity.CenterVertical;
- btnIcon.Height = Application.GetMinRealAverage(115);
- btnIcon.Width = Application.GetMinRealAverage(115);
- btnIcon.Radius = (uint)Application.GetMinRealAverage(115) / 2;
+ btnIcon.Height = this.GetPictrueRealSize(115);
+ btnIcon.Width = this.GetPictrueRealSize(115);
+ btnIcon.Radius = (uint)this.GetPictrueRealSize(115) / 2;
if (System.IO.File.Exists(iconPath) == true)
{
btnIcon.ImagePath = iconPath;
@@ -316,6 +319,23 @@
var form = new MemberManagementForm();
form.AddForm(info);
};
+ }
+
+ /// <summary>
+ /// 娣诲姞鎴愬憳琛�(澶栭儴璋冪敤)
+ /// </summary>
+ /// <param name="info"></param>
+ public void AddRowLayoutByOtherForm(MemberInfoRes info)
+ {
+ var myRow = listView.GetChildren(listView.ChildrenCount - 1);
+ if (myRow != null)
+ {
+ //鏈�鍚庝竴琛屽姞搴曠嚎
+ ((FrameRowControl)myRow).AddBottomLine();
+ }
+ this.AddRowLayout(info, false);
+ //璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
}
#endregion
@@ -355,11 +375,11 @@
if (infoResult.HeadImage != null)
{
//鍐欏叆澶村儚鍐呭
- string iconPath = System.IO.Path.Combine(UserCenterResourse.Option.UserPictruePath, keys + ".png");
+ string iconPath = System.IO.Path.Combine(UserCenterResourse.AccountOption.UserPictruePath, keys + ".png");
Shared.IO.FileUtils.WriteFileByBytes(iconPath, infoResult.HeadImage);
HdlThreadLogic.Current.RunMain(() =>
{
- dicIconControl[keys].ImagePath = iconPath;
+ dicIconControl[keys].ImageBytes = Shared.IO.FileUtils.ReadFile(iconPath);
});
}
}
@@ -371,7 +391,7 @@
#region 鈻� 鍒犻櫎鎸囧畾琛宊________________________
/// <summary>
- /// 鍒犻櫎鎸囧畾琛�
+ /// 鍒犻櫎鎸囧畾琛�(澶栭儴璋冪敤)
/// </summary>
/// <param name="accountId"></param>
public void DeleteRowByAccount(string accountId)
@@ -386,6 +406,9 @@
if (row.MainKeys == accountId)
{
row.RemoveFromParent();
+ //璋冩暣鍒楄〃鎺т欢鐨勯珮搴�
+ listView.AdjustRealHeight(Application.GetRealHeight(23));
+
break;
}
}
@@ -439,12 +462,6 @@
{
//娓呯┖鍏变韩鏂囦欢澶�
HdlShardLogic.Current.ClearShardDirectory();
-
- this.listView.RemoveAll();
- listView.Height = bodyFrameLayout.Height - Application.GetRealHeight(567);
-
- //娣诲姞鎴愬憳鍒楄〃
- this.AddMemberListRowByData();
return 1;
}
--
Gitblit v1.8.0