From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 177 +++++++++++++++++++++++++---------------------------------
1 files changed, 76 insertions(+), 101 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index ccba2be..04ae455 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -1,14 +1,16 @@
-锘� using System;
+锘縰sing System;
using HDL_ON.DAL.Server;
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
-
+#if IOS
+using Foundation;
+#endif
namespace HDL_ON.UI
{
public partial class PersonalDataPage : FrameLayout
{
- #region 鎺т欢鍒楄〃
+#region 鎺т欢鍒楄〃
/// <summary>
/// 褰撳墠
/// </summary>
@@ -27,7 +29,7 @@
/// </summary>
ImageView userHeadImageView;
- #region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣
+#region 鍥炬爣閫夋嫨閮ㄥ垎鍥炬爣
/// <summary>
/// 鑳屾櫙鍥鹃�夐」鍖哄煙
/// </summary>
@@ -48,14 +50,14 @@
/// 鍙栨秷鎸夐挳
/// </summary>
Button btnCancel;
- #endregion
+#endregion
- #region 涓汉淇℃伅閫夐」鍖哄煙
+#region 涓汉淇℃伅閫夐」鍖哄煙
/// <summary>
/// 涓汉淇℃伅閫夐」鍖哄煙
/// </summary>
VerticalScrolViewLayout optionListView;
- #region 涓汉閫夐」-鍚嶅瓧鍖哄煙
+#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// </summary>
@@ -72,8 +74,8 @@
/// 淇敼鐢ㄦ埛鍚嶇О鎸夐挳
/// </summary>
Button btnEditUserNameIcon;
- #endregion
- #region 涓汉閫夐」-浜岀淮鐮佸尯鍩�
+#endregion
+#region 涓汉閫夐」-浜岀淮鐮佸尯鍩�
/// <summary>
/// 涓汉閫夐」-浜岀淮鐮佸尯鍩�
/// </summary>
@@ -90,8 +92,8 @@
/// 浜岀淮鐮佸墠杩涘浘鏍�
/// </summary>
Button btnQRcodeRight;
- #endregion
- #region 涓汉閫夐」-閭淇℃伅鍖哄煙
+#endregion
+#region 涓汉閫夐」-閭淇℃伅鍖哄煙
/// <summary>
/// 涓汉閫夐」-閭淇℃伅鍖哄煙
/// </summary>
@@ -108,8 +110,8 @@
/// 鐢ㄦ埛閭淇℃伅鍓嶈繘鍥炬爣
/// </summary>
Button btnUserEmailRight;
- #endregion
- #region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
+#endregion
+#region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
/// <summary>
/// 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
/// </summary>
@@ -126,8 +128,8 @@
/// 鐢ㄦ埛鎵嬫満淇℃伅鍓嶈繘鍥炬爣
/// </summary>
Button btnUserPhoneRight;
- #endregion
- #region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
+#endregion
+#region 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
/// <summary>
/// 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
/// </summary>
@@ -137,7 +139,7 @@
/// </summary>
Button btnThirdPartyAuthorizationTitle;
Button btnThirdPartyAuthorizationRight;
- #region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
+#region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
/// <summary>
/// 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
/// </summary>
@@ -147,10 +149,10 @@
/// </summary>
Button btnResetPasswordText;
Button btnResetPasswordRight;
- #endregion
+#endregion
- #region 涓汉閫夐」-鏂板浣忓畢
+#region 涓汉閫夐」-鏂板浣忓畢
/// <summary>
/// 涓汉閫夐」-鏂板浣忓畢鍖哄煙
/// </summary>
@@ -160,10 +162,10 @@
/// </summary>
Button btnAddResidenceText;
Button btnAddResidenceScan;
- #endregion
+#endregion
- #region 涓汉閫夐」-浜鸿劯閫氳绠＄悊
+#region 涓汉閫夐」-浜鸿劯閫氳绠＄悊
/// <summary>
/// 涓汉閫夐」-浜鸿劯閫氳绠＄悊琛�
/// </summary>
@@ -172,14 +174,25 @@
/// 浜鸿劯閫氳绠＄悊鏂囨湰
/// </summary>
Button btnFaceManagementText;
- #endregion
+#endregion
+#region 涓汉閫夐」-璁垮绠＄悊
+ /// <summary>
+ /// 涓汉閫夐」-璁垮绠＄悊
+ ///
+ /// </summary>
+ FrameLayout visitorManagementView;
+ /// <summary>
+ /// 浜鸿劯閫氳绠＄悊鏂囨湰isitor
+ /// </summary>
+ Button btnisitorVManagementText;
+#endregion
- #endregion
+#endregion
- #endregion
+#endregion
- #region 瑙ｉ攣璁剧疆鍖哄煙
+#region 瑙ｉ攣璁剧疆鍖哄煙
/// <summary>
/// 瑙ｉ攣璁剧疆鍖哄煙
/// </summary>
@@ -187,14 +200,14 @@
//Button btnInterpretationSettingsTitle;
//Button btnInterpretationSettingsTip;
//Button btnInterpretationSettingsRight;
- #endregion
+#endregion
/// <summary>
/// 閫�鍑虹櫥褰曟寜閽�
/// </summary>
Button btnLogout;
- #endregion
+#endregion
/// <summary>
/// 鏇存柊澶村儚鐨勫洖璋冨嚱鏁�
/// </summary>
@@ -214,19 +227,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()
@@ -266,10 +281,21 @@
};
bodyScrolView.AddChidren(optionListView);
+ //鏍规嵁闇�瑕佹坊鍔犺
+ int addRow = 0;
if(Entity.DB_ResidenceData.Instance.SupportFacePass)
{
- optionListView.Height = Application.GetRealHeight(51 * (6 + 1));
+ addRow += 1;
}
+
+ if (Entity.DB_ResidenceData.Instance.SupportVisitorManage)
+ {
+ addRow += 1;
+ }
+
+ //鏈夊叏瑙嗛�氱殑鎯呭喌
+ optionListView.Height = Application.GetRealHeight(51 * (6 + addRow));
+
#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
@@ -465,8 +491,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>
/// 涓汉閫夐」-绗笁鏂规巿鏉冨尯鍩�
@@ -498,8 +524,8 @@
UnSelectedImagePath = "Public/Right.png",
};
thirdPartyAuthorizationView.AddChidren(btnThirdPartyAuthorizationRight);
- #endregion
- #region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
+#endregion
+#region 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
/// <summary>
/// 涓汉閫夐」-淇敼鐧诲綍瀵嗙爜鍖哄煙
/// </summary>
@@ -531,12 +557,12 @@
};
resetPasswordView.AddChidren(btnResetPasswordRight);
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
- #endregion
-
- #region 涓汉閫夐」-娣诲姞浣忓畢
+#endregion
+
+#region 涓汉閫夐」-娣诲姞浣忓畢
addResidenceView = new FrameLayout()
{
- Height = Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(50),
};
optionListView.AddChidren(addResidenceView);
btnAddResidenceScan = new Button()
@@ -580,8 +606,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);
@@ -633,11 +659,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()
@@ -674,70 +700,18 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- #endregion
+#endregion
}
- #endregion
+#endregion
var topPaddingView2 = new FrameLayout()
{
Height = Application.GetRealHeight(8)
};
bodyScrolView.AddChidren(topPaddingView2);
- #region 瑙ｉ攣璁剧疆鍖哄煙
- ///// <summary>
- ///// 瑙ｉ攣璁剧疆鍖哄煙
- ///// </summary>
- //interpretationSettingsView = new FrameLayout()
- //{
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- // Height = Application.GetRealHeight(70),
- //};
- //bodyScrolView.AddChidren(interpretationSettingsView);
- //if(Language.CurrentLanguage != "Chinese")
- //{
- // interpretationSettingsView.Height = Application.GetRealHeight(80);
- //}
-
- //btnInterpretationSettingsTitle = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Height = Application.GetRealHeight(32),
- // TextAlignment = TextAlignment.BottomLeft,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextID = StringId.InterpretationSettings,
- //};
- //interpretationSettingsView.AddChidren(btnInterpretationSettingsTitle);
-
- //btnInterpretationSettingsTip = new Button()
- //{
- // X = Application.GetRealWidth(16),
- // Y = btnInterpretationSettingsTitle.Bottom,
- // Height = Application.GetRealHeight(32),
- // Width = Application.GetRealWidth(310),
- // TextAlignment = TextAlignment.TopLeft,
- // TextColor = CSS_Color.PromptingColor1,
- // TextSize = CSS_FontSize.TextFontSize,
- // TextID = StringId.AppUnlockSettingsTip,
- // IsMoreLines = true,
- //};
- //interpretationSettingsView.AddChidren(btnInterpretationSettingsTip);
-
- //btnInterpretationSettingsRight = new Button()
- //{
- // X = Application.GetRealWidth(339),
- // Gravity = Gravity.CenterVertical,
- // Width = Application.GetMinRealAverage(16),
- // Height = Application.GetMinRealAverage(16),
- // UnSelectedImagePath = "Public/Right.png",
- //};
- //interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
- //interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
- #endregion
-
- #region 鏈嶅姟鍣ㄤ俊鎭�
+#region 鏈嶅姟鍣ㄤ俊鎭�
ListCellView myServerInfoCellView = new ListCellView()
{
};
@@ -749,15 +723,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()
{
};
@@ -778,7 +753,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