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/PersonalDataPage.cs | 130 ++++++++++++++++++++++++------------------- 1 files changed, 72 insertions(+), 58 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs index b1e3fa5..85a2377 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs @@ -1,15 +1,17 @@ -锘� using System; +锘縰sing System; using HDL_ON.DAL.Server; using HDL_ON.UI; using HDL_ON.UI.CSS; using Shared; +using HDL_ON.UI.UI2.PersonalCenter.Visitor; +#if IOS using Foundation; - +#endif namespace HDL_ON.UI { public partial class PersonalDataPage : FrameLayout { - #region 鎺т欢鍒楄〃 +#region 鎺т欢鍒楄〃 /// <summary> /// 褰撳墠 /// </summary> @@ -28,7 +30,7 @@ /// </summary> ImageView userHeadImageView; - #region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣 +#region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣 /// <summary> /// 鑳屾櫙鍥鹃�夐」鍖哄煙 /// </summary> @@ -49,14 +51,14 @@ /// 鍙栨秷鎸夐挳 /// </summary> Button btnCancel; - #endregion +#endregion - #region 涓汉淇℃伅閫夐」鍖哄煙 +#region 涓汉淇℃伅閫夐」鍖哄煙 /// <summary> /// 涓汉淇℃伅閫夐」鍖哄煙 /// </summary> VerticalScrolViewLayout optionListView; - #region 涓汉閫夐」-鍚嶅瓧鍖哄煙 +#region 涓汉閫夐」-鍚嶅瓧鍖哄煙 /// <summary> /// 涓汉閫夐」-鍚嶅瓧鍖哄煙 /// </summary> @@ -73,8 +75,8 @@ /// 淇敼鐢ㄦ埛鍚嶇О鎸夐挳 /// </summary> Button btnEditUserNameIcon; - #endregion - #region 涓汉閫夐」-浜岀淮鐮佸尯鍩� +#endregion +#region 涓汉閫夐」-浜岀淮鐮佸尯鍩� /// <summary> /// 涓汉閫夐」-浜岀淮鐮佸尯鍩� /// </summary> @@ -91,8 +93,8 @@ /// 浜岀淮鐮佸墠杩涘浘鏍� /// </summary> Button btnQRcodeRight; - #endregion - #region 涓汉閫夐」-閭淇℃伅鍖哄煙 +#endregion +#region 涓汉閫夐」-閭淇℃伅鍖哄煙 /// <summary> /// 涓汉閫夐」-閭淇℃伅鍖哄煙 /// </summary> @@ -109,8 +111,8 @@ /// 鐢ㄦ埛閭淇℃伅鍓嶈繘鍥炬爣 /// </summary> Button btnUserEmailRight; - #endregion - #region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙 +#endregion +#region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙 /// <summary> /// 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙 /// </summary> @@ -127,8 +129,8 @@ /// 鐢ㄦ埛鎵嬫満淇℃伅鍓嶈繘鍥炬爣 /// </summary> Button btnUserPhoneRight; - #endregion - #region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩� +#endregion +#region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩� /// <summary> /// 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩� /// </summary> @@ -138,7 +140,7 @@ /// </summary> Button btnThirdPartyAuthorizationTitle; Button btnThirdPartyAuthorizationRight; - #region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙 +#region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙 /// <summary> /// 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙 /// </summary> @@ -148,10 +150,10 @@ /// </summary> Button btnResetPasswordText; Button btnResetPasswordRight; - #endregion +#endregion - #region 涓汉閫夐」-鏂板浣忓畢 +#region 涓汉閫夐」-鏂板浣忓畢 /// <summary> /// 涓汉閫夐」-鏂板浣忓畢鍖哄煙 /// </summary> @@ -161,10 +163,10 @@ /// </summary> Button btnAddResidenceText; Button btnAddResidenceScan; - #endregion +#endregion - #region 涓汉閫夐」-浜鸿劯閫氳绠$悊 +#region 涓汉閫夐」-浜鸿劯閫氳绠$悊 /// <summary> /// 涓汉閫夐」-浜鸿劯閫氳绠$悊琛� /// </summary> @@ -173,9 +175,9 @@ /// 浜鸿劯閫氳绠$悊鏂囨湰 /// </summary> Button btnFaceManagementText; - #endregion +#endregion - #region 涓汉閫夐」-璁垮绠$悊 +#region 涓汉閫夐」-璁垮绠$悊 /// <summary> /// 涓汉閫夐」-璁垮绠$悊 /// @@ -185,13 +187,13 @@ /// 浜鸿劯閫氳绠$悊鏂囨湰isitor /// </summary> Button btnisitorVManagementText; - #endregion +#endregion - #endregion +#endregion - #endregion +#endregion - #region 瑙i攣璁剧疆鍖哄煙 +#region 瑙i攣璁剧疆鍖哄煙 /// <summary> /// 瑙i攣璁剧疆鍖哄煙 /// </summary> @@ -199,14 +201,14 @@ //Button btnInterpretationSettingsTitle; //Button btnInterpretationSettingsTip; //Button btnInterpretationSettingsRight; - #endregion +#endregion /// <summary> /// 閫�鍑虹櫥褰曟寜閽� /// </summary> Button btnLogout; - #endregion +#endregion /// <summary> /// 鏇存柊澶村儚鐨勫洖璋冨嚱鏁� /// </summary> @@ -226,19 +228,21 @@ public void LoadView() { bodyView.BackgroundColor = CSS_Color.BackgroundColor; - new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)).LoadTopView(); + var topView = new TopViewDiv(bodyView, Language.StringByID(StringId.PersonalCenter)); + topView.maginY = 10; + topView.LoadTopView(); bodyScrolView = new VerticalScrolViewLayout() { - Y = Application.GetRealHeight(64), + Y = Application.GetRealHeight(64+10), VerticalScrollBarEnabled = false, - Height = Application.GetRealHeight(551), + Height = Application.GetRealHeight(551-10), }; bodyView.AddChidren(bodyScrolView); if (MainPage.Increase) { - bodyScrolView.Height = Application.GetRealHeight(541); + bodyScrolView.Height = Application.GetRealHeight(541-10); } headPortraitView = new FrameLayout() @@ -440,7 +444,7 @@ userEmailInfoView.AddChidren(btnUserEmailRight); optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor }); #endregion - #region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙 +#region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙 /// <summary> /// 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙 /// </summary> @@ -488,8 +492,8 @@ }; userPhoneInfoView.AddChidren(btnUserPhoneRight); optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor }); - #endregion - #region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩� +#endregion +#region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩� //2020-12-08 鏆傛椂闅愯棌绗笁鏂规巿鏉冨姛鑳� /// <summary> /// 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩� @@ -521,8 +525,8 @@ UnSelectedImagePath = "Public/Right.png", }; thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight); - #endregion - #region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙 +#endregion +#region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙 /// <summary> /// 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙 /// </summary> @@ -554,9 +558,9 @@ }; resetPasswordView.AddChidren(btnResetPasswordRight); optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor }); - #endregion +#endregion - #region 涓汉閫夐」-娣诲姞浣忓畢 +#region 涓汉閫夐」-娣诲姞浣忓畢 addResidenceView = new FrameLayout() { Height = Application.GetRealHeight(50), @@ -603,8 +607,8 @@ }); var sendString = scanString.Replace("source://bind/", ""); MainPage.Log($"缁戝畾source灞�:{sendString}"); - //缁戝畾source灞� - var pack = new HttpServerRequest().BindSourcePanel(sendString); + //缁戝畾source灞� + var pack = new HttpServerRequest().BindSourcePanel(sendString); Application.RunOnMainThread(() => { var title = Language.StringByID(StringId.Tip); @@ -656,11 +660,11 @@ }); }; - #endregion +#endregion if (Entity.DB_ResidenceData.Instance.SupportFacePass) { - #region 涓汉閫夐」-浜鸿劯閫氳绠$悊 +#region 涓汉閫夐」-浜鸿劯閫氳绠$悊 optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor }); faceManagementView = new FrameLayout() @@ -697,12 +701,12 @@ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; }; - #endregion +#endregion } //璁垮绠$悊 - #region 涓汉閫夐」-璁垮绠$悊 +#region 涓汉閫夐」-璁垮绠$悊 if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)//鍒ゆ柇鏄惁鏀寔璁垮绠$悊 { optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor }); @@ -736,24 +740,33 @@ btnisitorVManagementText.MouseUpEventHandler = (sender, e) => { - //鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟 - NSDictionary info = new NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken); - Shared.IOS.HDLFVSDK.Video.RefreshInfo(info); - //璺宠浆璁垮绠$悊鐣岄潰 - Shared.IOS.HDLFVSDK.Video.ShowVisitorManager(); + + +#if __IOS__ + ////鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟 + //Foundation.NSDictionary info = new Foundation.NSDictionary("regionUrl", HttpUtil.GlobalRequestHttpsHost, "token", UserInfo.Current.LoginTokenString, "appkey", "HDL-HOME-APP-TEST", "secret", "WeJ8TY88vbakCcnvH8G1tDUqzLWY8yss", "refreshToken", UserInfo.Current.RefreshToken); + //Shared.IOS.HDLFVSDK.Video.RefreshInfo(info); + //////璺宠浆璁垮绠$悊鐣岄潰 + //Shared.IOS.HDLFVSDK.Video.ShowVisitorManager(); +#else + var page = new VisitorQRCodePage(); + MainPage.BasePageView.AddChidren(page); + page.LoadPage(); + MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; +#endif }; } - #endregion - #endregion +#endregion +#endregion var topPaddingView2 = new FrameLayout() { Height = Application.GetRealHeight(8) }; bodyScrolView.AddChidren(topPaddingView2); - #region 瑙i攣璁剧疆鍖哄煙 +#region 瑙i攣璁剧疆鍖哄煙 ///// <summary> ///// 瑙i攣璁剧疆鍖哄煙 ///// </summary> @@ -803,9 +816,9 @@ //}; //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight); //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height)); - #endregion +#endregion - #region 鏈嶅姟鍣ㄤ俊鎭� +#region 鏈嶅姟鍣ㄤ俊鎭� ListCellView myServerInfoCellView = new ListCellView() { }; @@ -817,15 +830,16 @@ MainPage.BasePageView.AddChidren(myServerInfoPage); myServerInfoPage.LoadPage(); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + }; myServerInfoCellView.GoAction = selectAction; myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation); //myServerInfoCellView.LineView.RemoveFromParent(); - #endregion +#endregion - #region 娉ㄩ攢璐﹀彿 +#region 娉ㄩ攢璐﹀彿 ListCellView logOffView = new ListCellView() { }; @@ -846,7 +860,7 @@ btnLogout = new Button() { - Y = Application.GetRealHeight(623), + Y = Application.GetRealHeight(624), Height = Application.GetRealHeight(50), TextAlignment = TextAlignment.Center, TextSize = CSS_FontSize.SubheadingFontSize, -- Gitblit v1.8.0