From 4f40e8385ff6725be8e8b642e50f9f7201a27dfa Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 11 十二月 2020 15:58:32 +0800
Subject: [PATCH] Merge branch 'NewFilePath' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into NewFilePath
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 79 +++++++++++++++++++++++++++++++--------
1 files changed, 63 insertions(+), 16 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 0e22ce6..7bddacf 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;
@@ -15,17 +18,36 @@
List<ResidenceMemberInfo> residenceMemberInfos;
+ Action action;
public MemberManagementPage()
{
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
}
- string s1 = "";
- string s2 = "";
public void LoadPage()
{
- //鍒涘缓鐧诲綍绾跨▼
+ bodyView.BackgroundColor = CSS_Color.BackgroundColor;
+ //鍒涘缓璇诲彇鎴愬憳璐﹀彿绾跨▼
var thread = LoadThread_GetResidenceMemberAccount();
waitPage = new Loading();
new PublicAssmebly().LoadPage_WaitPage(thread, bodyView, waitPage);
@@ -33,18 +55,19 @@
Action backAction = () =>
{
};
- Action<string, string> refreshAction = (s1, s2) =>
+
+ Action backAction_AddMember = () =>
{
- var mmp = new AddMemberScanPage();
+ LoadThread_GetResidenceMemberAccount().Start();
+ };
+ Action refreshAction = () =>
+ {
+ var mmp = new AddMemberScanPage(backAction_AddMember);
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
- Console.WriteLine(s1);
- Console.WriteLine(s2);
};
- bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView("Member", refreshAction, backAction);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_MemberTopView(refreshAction, backAction);
contentView = new VerticalScrolViewLayout()
{
@@ -88,6 +111,28 @@
};
sView.AddChidren(view1);
+ var userTypeView = new FrameLayout()
+ {
+ Width = Application.GetRealWidth(122),
+ Height = Application.GetRealHeight(58),
+ X = Application.GetRealWidth(270),
+ Y = Application.GetRealHeight(16),
+ BackgroundImagePath = "PersonalCenter/UserTypebg.png",
+ };
+ view1.AddChidren(userTypeView);
+
+ var btnUserTypeName = new Button()
+ {
+ X = Application.GetRealWidth(28),
+ Width = Application.GetRealWidth(80),
+ Height = Application.GetRealHeight(17 * 3),
+ TextAlignment = TextAlignment.CenterLeft,
+ TextColor = CSS_Color.MainBackgroundColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ TextID = StringId.Member
+ };
+ userTypeView.AddChidren(btnUserTypeName);
+
var memberHeadImageView = new ImageView()
{
X = Application.GetRealWidth(16),
@@ -109,7 +154,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = memberInfo.UserName
+ Text = memberInfo.nickName
};
view1.AddChidren(btnMemberName);
@@ -159,7 +204,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.Nickname
+ Text = memberInfo.nickName
};
view2.AddChidren(btnNickname);
@@ -221,7 +266,11 @@
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- var mmp = new MemberPermissionPage(memberInfo);
+ action = () => {
+ residenceMemberInfos.Remove(memberInfo);
+ LoadMemberRow();
+ };
+ var mmp = new MemberPermissionPage(memberInfo, action);
MainPage.BasePageView.AddChidren(mmp);
mmp.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -258,15 +307,13 @@
Height = Application.GetMinRealAverage(38),
UnSelectedImagePath = "Public/Switch_2.png",
SelectedImagePath = "Public/SwitchOn_2.png",
- IsSelected = memberInfo.IsAllowCreateScene
+ IsSelected = memberInfo.isAllowCreateScene
};
view4.AddChidren(btnCreateSceneRight);
LoadView_ChangeCreateSceneState(btnCreateSceneRight, btnCreateSceneTitle, memberInfo);
#endregion
-
}
}
-
}
}
--
Gitblit v1.8.0