From f9181a9c8125136f597add7c30cb2ff508d54ba7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:34:32 +0800
Subject: [PATCH] 2024年07月25日17:33:40
---
HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs | 108 ++++++++++++++++++++++--------------------------------
1 files changed, 44 insertions(+), 64 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
index 9b86a9b..436cf68 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs
@@ -3,6 +3,8 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
+using System.Threading;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
@@ -27,6 +29,9 @@
public void LoadPage()
{
+#if DEBUG
+ //Entity.DB_ResidenceData.Instance.SupportFacePass = true;
+#endif
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
//鍒涘缓璇诲彇鎴愬憳璐﹀彿绾跨▼
var thread = LoadThread_GetResidenceMemberAccount();
@@ -48,7 +53,9 @@
mmp.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement)).LoadTopView_MemberTopView(refreshAction, backAction);
+ var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.MemberManagement));
+ topView.maginY = 10;
+ topView.LoadTopView_MemberTopView(refreshAction, backAction);
contentView = new VerticalScrolViewLayout()
{
@@ -76,8 +83,7 @@
var sView = new VerticalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343 + 50),
- //Height = Application.GetRealWidth(230),
+ Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(180),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealWidth(12),
@@ -86,6 +92,10 @@
ScrollEnabled = false,
VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
};
+ if (Entity.DB_ResidenceData.Instance.SupportFacePass)
+ {
+ sView.Height = Application.GetRealWidth(180 + 50);
+ }
contentView.AddChidren(sView);
#region 澶村儚淇℃伅
var view1 = new FrameLayout()
@@ -115,7 +125,7 @@
TextID = StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
- if(Language.CurrentLanguage == "English")
+ if (Language.CurrentLanguage == "English")
{
userTypeView.X = Application.GetRealWidth(260);
}
@@ -145,7 +155,11 @@
Text = HDLCommon.Current.GetUserName(memberInfo.memberName)
};
view1.AddChidren(btnMemberName);
+ if (memberInfo.isVirtualAccount)
+ {
+ btnMemberName.Text = memberInfo.nickName;
+ }
var btnMemberEmail = new Button()
{
X = Application.GetRealWidth(88),
@@ -166,6 +180,13 @@
Width = Application.GetRealWidth(311),
BackgroundColor = CSS_Color.DividingLineColor,
});
+
+ if(string.IsNullOrEmpty(memberInfo.Account))
+ {
+ LoadView_BindAccount(memberInfo, btnMemberEmail, btnMemberName, memberHeadImageView);
+ }
+
+
#endregion
#region 鏄电О淇℃伅
@@ -213,7 +234,7 @@
Width = Application.GetRealWidth(311),
BackgroundColor = CSS_Color.DividingLineColor,
});
- LoadView_EidtNickname(btnNickname, btnNicknameRight, memberInfo);
+ LoadView_EidtNickname(btnNickname, btnNicknameRight, memberInfo, memberInfo.isVirtualAccount ? btnMemberName : null);
#endregion
#region 浣跨敤鏉冮檺
@@ -244,17 +265,12 @@
};
view3.AddChidren(btnPermissionRight);
- //sView.AddChidren(new Button()
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Height = Application.GetRealWidth(1),
- // Width = Application.GetRealWidth(311),
- // BackgroundColor = CSS_Color.DividingLineColor,
- //});
+
EventHandler<MouseEventArgs> eHandler = (sender, e) =>
{
- action = () => {
+ action = () =>
+ {
residenceMemberInfos.Remove(memberInfo);
LoadMemberRow();
};
@@ -273,6 +289,14 @@
#region 浜鸿劯绠＄悊
if (Entity.DB_ResidenceData.Instance.SupportFacePass)
{
+ sView.AddChidren(new Button()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealWidth(1),
+ Width = Application.GetRealWidth(311),
+ BackgroundColor = CSS_Color.DividingLineColor,
+ });
+
var view4 = new FrameLayout()
{
Height = Application.GetRealWidth(49),
@@ -286,7 +310,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- TextID = StringId.PermissionToUse,
+ TextID = StringId.FaceManagemant,
};
view4.AddChidren(btnFaceManagementTitle);
@@ -300,65 +324,21 @@
};
view4.AddChidren(btnFaceManagementRight);
- //sView.AddChidren(new Button()
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Height = Application.GetRealWidth(1),
- // Width = Application.GetRealWidth(311),
- // BackgroundColor = CSS_Color.DividingLineColor,
- //});
EventHandler<MouseEventArgs> eFaceHandler = (sender, e) =>
{
- action = () =>
- {
- residenceMemberInfos.Remove(memberInfo);
- LoadMemberRow();
- };
- var mmp = new MemberPermissionPage(memberInfo, action);
- MainPage.BasePageView.AddChidren(mmp);
- mmp.LoadPage();
+ var page = new MemberFaceManagementPage(memberInfo);
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- view4.MouseUpEventHandler = eHandler;
- btnFaceManagementTitle.MouseUpEventHandler = eFaceHandler;
+ view4.MouseUpEventHandler = eFaceHandler;
btnFaceManagementRight.MouseUpEventHandler = eFaceHandler;
+ btnFaceManagementTitle.MouseUpEventHandler = eFaceHandler;
}
#endregion
- //#region 鍒涘缓鍦烘櫙 2020-12-23 闅愯棌鍒涘缓鍦烘櫙鎸夐挳
- //var view4 = new FrameLayout()
- //{
- // Height = Application.GetRealWidth(50),
- //};
- //sView.AddChidren(view4);
-
- //var btnCreateSceneTitle = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Width = Application.GetRealWidth(200),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.TextFontSize,
- // TextID = StringId.CreateScene,
- //};
- //view4.AddChidren(btnCreateSceneTitle);
-
- //var btnCreateSceneRight = new Button()
- //{
- // X = Application.GetRealWidth(287),
- // Y = Application.GetRealHeight(4),
- // Width = Application.GetMinRealAverage(38),
- // Height = Application.GetMinRealAverage(38),
- // UnSelectedImagePath = "Public/Switch_2.png",
- // SelectedImagePath = "Public/SwitchOn_2.png",
- // IsSelected = memberInfo.isAllowCreateScene
- //};
- //view4.AddChidren(btnCreateSceneRight);
-
- //LoadView_ChangeCreateSceneState(btnCreateSceneRight, btnCreateSceneTitle, memberInfo);
- //#endregion
}
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0