From c44b10e4447e84dbdfa9105edf460ef364a8f2b3 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 30 十一月 2020 19:53:35 +0800
Subject: [PATCH] Merge branch 'master' into WJC
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 42 ++++++++++++++++++++++++++++++++----------
1 files changed, 32 insertions(+), 10 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 30a9154..0527019 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -33,17 +33,19 @@
Action backAction = () =>
{
};
+
+ Action backAction_AddMember = () =>
+ {
+ LoadThread_GetResidenceMemberAccount().Start();
+ };
Action<string, string> refreshAction = (s1, s2) =>
{
- var mmp = new AddMemberScanPage();
+ 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);
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView("Member", refreshAction, backAction);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_AddIcon_BackAction("Member", refreshAction, backAction);
contentView = new VerticalScrolViewLayout()
{
@@ -87,6 +89,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),
@@ -108,7 +132,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
IsBold = true,
- Text = memberInfo.UserName
+ Text = memberInfo.nickName
};
view1.AddChidren(btnMemberName);
@@ -158,7 +182,7 @@
TextAlignment = TextAlignment.CenterRight,
TextColor = CSS_Color.PromptingColor1,
TextSize = CSS_FontSize.TextFontSize,
- Text = memberInfo.Nickname
+ Text = memberInfo.nickName
};
view2.AddChidren(btnNickname);
@@ -261,15 +285,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