From 15978205aa7e4aeca8af3d3d34a80a85f0265f63 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 14 十二月 2020 10:42:52 +0800
Subject: [PATCH] 2020-12-14 1.密码锁定错误码处理

---
 HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs |   33 ++++++++++++++++++++++++++++-----
 1 files changed, 28 insertions(+), 5 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..bbb9828 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,25 @@
         {
             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()
@@ -38,14 +60,14 @@
             {
                 LoadThread_GetResidenceMemberAccount().Start();
             };
-            Action<string, string> refreshAction = (s1, s2) =>
+            Action refreshAction = () =>
             {
                 var mmp = new AddMemberScanPage(backAction_AddMember);
                 MainPage.BasePageView.AddChidren(mmp);
                 mmp.LoadPage();
                 MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
             };
-            new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_AddIcon_BackAction("Member", refreshAction, backAction);
+            new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_MemberTopView(refreshAction, backAction);
 
             contentView = new VerticalScrolViewLayout()
             {
@@ -80,6 +102,7 @@
                     BorderColor = 0x00000000,
                     BorderWidth = 0,
                     ScrollEnabled = false,
+                    VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
                 };
                 contentView.AddChidren(sView);
                 #region 澶村儚淇℃伅
@@ -132,7 +155,7 @@
                     TextColor = CSS_Color.FirstLevelTitleColor,
                     TextSize = CSS_FontSize.TextFontSize,
                     IsBold = true,
-                    Text = memberInfo.UserName
+                    Text = memberInfo.nickName
                 };
                 view1.AddChidren(btnMemberName);
 
@@ -182,7 +205,7 @@
                     TextAlignment = TextAlignment.CenterRight,
                     TextColor = CSS_Color.PromptingColor1,
                     TextSize = CSS_FontSize.TextFontSize,
-                    Text = memberInfo.Nickname
+                    Text = memberInfo.nickName
                 };
                 view2.AddChidren(btnNickname);
 
@@ -285,7 +308,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