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 | 228 +++++++++----------------------------------------------- 1 files changed, 39 insertions(+), 189 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/MemberManagement/MemberManagementPage.cs index d96b5c4..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() { @@ -77,7 +84,6 @@ { Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), - //Height = Application.GetRealWidth(230), Height = Application.GetRealWidth(180), BackgroundColor = CSS_Color.MainBackgroundColor, Radius = (uint)Application.GetRealWidth(12), @@ -119,7 +125,7 @@ TextID = StringId.Member }; userTypeView.AddChidren(btnUserTypeName); - if(Language.CurrentLanguage == "English") + if (Language.CurrentLanguage == "English") { userTypeView.X = Application.GetRealWidth(260); } @@ -149,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), @@ -170,6 +180,13 @@ Width = Application.GetRealWidth(311), BackgroundColor = CSS_Color.DividingLineColor, }); + + if(string.IsNullOrEmpty(memberInfo.Account)) + { + LoadView_BindAccount(memberInfo, btnMemberEmail, btnMemberName, memberHeadImageView); + } + + #endregion #region 鏄电О淇℃伅 @@ -217,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 浣跨敤鏉冮檺 @@ -248,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(); }; @@ -277,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), @@ -304,191 +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) => { - if (OnAppConfig.Instance.FaceManagementTip) - { - - return; - } - - Dialog dialog = new Dialog() - { - BackgroundColor = CSS_Color.DialogTransparentColor1, - }; - - FrameLayout contentView = new FrameLayout() - { - Gravity = Gravity.Center, - Width = Application.GetRealWidth(270), - Height = Application.GetRealHeight(192), - BackgroundColor = CSS.CSS_Color.MainBackgroundColor, - BorderColor = 0x00000000, - BorderWidth = 0, - Radius = (uint)Application.GetMinRealAverage(10), - }; - dialog.AddChidren(contentView); - - Button btnTitle = new Button() - { - Y = Application.GetRealHeight(16), - Height = Application.GetRealHeight(30), - TextColor = CSS_Color.MainColor, - TextSize = CSS_FontSize.SubheadingFontSize, - TextAlignment = TextAlignment.Center, - IsBold = true, - TextID = StringId.FaceProtocolPrompt, - }; - contentView.AddChidren(btnTitle); - - Button btnMsg = new Button() - { - Gravity = Gravity.CenterHorizontal, - Height = Application.GetRealHeight(35), - Y = btnTitle.Bottom, - Width = Application.GetRealHeight(200), - TextAlignment = TextAlignment.CenterLeft, - TextColor = CSS_Color.TextualColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - Text = " 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�", - IsMoreLines = true, - }; - contentView.AddChidren(btnMsg); - - Button btnMsg1 = new Button() - { - Gravity = Gravity.CenterHorizontal, - Height = Application.GetRealHeight(15), - Y = btnMsg.Bottom, - Width = Application.GetRealHeight(200), - TextAlignment = TextAlignment.CenterLeft, - TextColor = CSS_Color.MainColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - Text = " 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�", - IsMoreLines = true, - }; - contentView.AddChidren(btnMsg1); - - Button btnMsg2 = new Button() - { - Gravity = Gravity.CenterHorizontal, - Height = Application.GetRealHeight(35), - Y = btnMsg1.Bottom, - Width = Application.GetRealHeight(200), - TextAlignment = TextAlignment.CenterLeft, - TextColor = CSS_Color.TextualColor, - TextSize = CSS_FontSize.PromptFontSize_FirstLevel, - Text = " 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙e苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�", - IsMoreLines = true, - }; - contentView.AddChidren(btnMsg2); - - Button btnLine = new Button() - { - Y = Application.GetRealHeight(149), - Height = Application.GetRealHeight(1), - Width = Application.GetRealWidth(270 / 2), - BackgroundColor = CSS.CSS_Color.DividingLineColor, - }; - contentView.AddChidren(btnLine); - - Button btnCancel = new Button() - { - Y = btnLine.Bottom, - Width = Application.GetRealWidth(135), - Height = Application.GetRealHeight(43), - TextAlignment = TextAlignment.Center, - TextColor = CSS_Color.TextualColor, - TextSize = CSS_FontSize.SubheadingFontSize, - //SelectedTextColor = CSS_Color.MainBackgroundColor, - //SelectedBackgroundColor = CSS_Color.MainColor, - TextID = StringId.Disagree, - }; - contentView.AddChidren(btnCancel); - - Button btnConfirm = new Button() - { - X = btnCancel.Right, - Y = btnLine.Y, - Width = Application.GetRealWidth(135), - Height = Application.GetRealHeight(45), - TextAlignment = TextAlignment.Center, - //TextColor = CSS_Color.TextualColor, - TextSize = CSS_FontSize.SubheadingFontSize, - TextColor = CSS_Color.MainBackgroundColor, - BackgroundColor = CSS_Color.MainColor, - TextID = StringId.Agree, - }; - contentView.AddChidren(btnConfirm); - //渚嬶細鍙充笅鍦嗚 澶у皬涓�50 - int mRectCornerID = HDLUtils.RectCornerBottomRight; - btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID); - dialog.Show(); - - btnCancel.MouseUpEventHandler += (sender, e) => - { - dialog.Close(); - }; - btnMsg1.MouseUpEventHandler += (sender, e) => - { - string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html"; - if (Language.CurrentLanguage != "Chinese") - { - url = "https://developer.hdlcontrol.com/Face information collection protocol.html"; - } - new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url); - - dialog.Close(); - }; - + 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