From 64dbbfe1d6488635e160189a704afccffc7d34d0 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 07 十二月 2020 11:33:06 +0800
Subject: [PATCH] Merge branch 'WJC'
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index e2cf6b9..4ef9dc9 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -6,6 +6,9 @@
namespace HDL_ON.UI
{
+ /// <summary>
+ /// 鎴愬憳绠＄悊 鎴愬憳鍒楄〃椤甸潰
+ /// </summary>
public partial class MemberManagementPage : FrameLayout
{
MemberManagementPage bodyView;
@@ -20,6 +23,27 @@
{
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()
@@ -132,7 +156,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = memberInfo.UserName
+ Text = memberInfo.nickName
};
view1.AddChidren(btnMemberName);
@@ -182,7 +206,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.Nickname
+ Text = memberInfo.nickName
};
view2.AddChidren(btnNickname);
@@ -285,7 +309,7 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = memberInfo.IsAllowCreateScene
+ IsSelected = memberInfo.isAllowCreateScene
};
view4.AddChidren(btnCreateSceneRight);
--
Gitblit v1.8.0