From bac00b1bc932d3a85f90986466757b24d9407d61 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 22 十二月 2020 14:02:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 25 ++++---------------------
1 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
old mode 100644
new mode 100755
index 7bddacf..e8d86ff
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -23,25 +23,6 @@
{
bodyView = this;
residenceMemberInfos = new List<ResidenceMemberInfo>();
-//#if DEBUG
-// //tr娴嬭瘯浣忓畢----娴嬭瘯鍒嗕韩
-// var light = new Light()
-// {
-// sid = "030101123456780202010005ABCP",
-// deviceId = "1333657366709645314",
-// name = "鐏�1",
-// };
-// light.SaveFunctionData();
-// var light2 = new Light()
-// {
-// sid = "030101123456780202010005ABCQ",
-// deviceId = "1333657366743199746",
-// name = "鐏�2"
-// };
-// light2.SaveFunctionData();
-// DB_ResidenceData.functionList.lights.Add(light);
-// DB_ResidenceData.functionList.lights.Add(light2);
-//#endif
}
public void LoadPage()
@@ -102,6 +83,7 @@
BorderColor = 0x00000000,
BorderWidth = 0,
ScrollEnabled = false,
+ VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
};
contentView.AddChidren(sView);
#region 澶村儚淇℃伅
@@ -154,8 +136,9 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = memberInfo.nickName
- };
+ //Text = memberInfo.UserName,
+ Text = HDLCommon.Current.GetUserName(memberInfo.memberName)
+ };
view1.AddChidren(btnMemberName);
var btnMemberEmail = new Button()
--
Gitblit v1.8.0