From a4f57bf9dda3d52e04f537a2ca24db95761eb888 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 11 十二月 2020 11:34:14 +0800
Subject: [PATCH] Revert "Merge branch 'CJL-NEW' into NewFilePath"
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 44 +++++++++++++++++++++-----------------------
1 files changed, 21 insertions(+), 23 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 4ef9dc9..7bddacf 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -23,27 +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
+//#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()
@@ -62,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()
{
--
Gitblit v1.8.0