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 | 144 +++++++-----------------------------------------
1 files changed, 21 insertions(+), 123 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 69edf9b..04ae455 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -3,7 +3,6 @@
using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
-using HDL_ON.UI.UI2.PersonalCenter.Visitor;
#if IOS
using Foundation;
#endif
@@ -228,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()
@@ -262,7 +263,7 @@
};
headPortraitView.AddChidren(userHeadImageView);
-#region 涓汉淇℃伅閫夐」鍖哄煙
+ #region 涓汉淇℃伅閫夐」鍖哄煙
var topPaddingView = new FrameLayout()
{
Height = Application.GetRealHeight(8)
@@ -296,7 +297,7 @@
optionListView.Height = Application.GetRealHeight(51 * (6 + addRow));
-#region 涓汉閫夐」-鍚嶅瓧鍖哄煙
+ #region 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// <summary>
/// 涓汉閫夐」-鍚嶅瓧鍖哄煙
/// </summary>
@@ -344,8 +345,8 @@
};
userNameView.AddChidren(btnEditUserNameIcon);
optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-#endregion
-#region 涓汉閫夐」-浜岀淮鐮佸尯鍩�
+ #endregion
+ #region 涓汉閫夐」-浜岀淮鐮佸尯鍩�
/// <summary>
/// 涓汉閫夐」-浜岀淮鐮佸尯鍩�
/// </summary>
@@ -392,8 +393,8 @@
UnSelectedImagePath = "Public/Right.png",
};
_QRcodeView.AddChidren(btnQRcodeRight);
-#endregion
-#region 涓汉閫夐」-閭淇℃伅鍖哄煙
+ #endregion
+ #region 涓汉閫夐」-閭淇℃伅鍖哄煙
/// <summary>
/// 涓汉閫夐」-閭淇℃伅鍖哄煙
/// </summary>
@@ -441,8 +442,8 @@
};
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 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
+ #endregion
+ #region 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
/// <summary>
/// 涓汉閫夐」-鎵嬫満淇℃伅鍖哄煙
/// </summary>
@@ -557,11 +558,11 @@
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 涓汉閫夐」-娣诲姞浣忓畢
addResidenceView = new FrameLayout()
{
- Height = Application.GetRealHeight(50),
+ Height = Application.GetRealHeight(50),
};
optionListView.AddChidren(addResidenceView);
btnAddResidenceScan = new Button()
@@ -605,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);
@@ -703,116 +704,12 @@
}
- //璁垮绠＄悊
-#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 });
-
- visitorManagementView = new FrameLayout()
- {
- Height = Application.GetRealHeight(50),
- };
- optionListView.AddChidren(visitorManagementView);
-
-
- var btnVisitorManagementRight = new Button()
- {
- X = Application.GetRealWidth(339),
- Gravity = Gravity.CenterVertical,
- Width = Application.GetMinRealAverage(16),
- Height = Application.GetMinRealAverage(16),
- UnSelectedImagePath = "Public/Right.png",
- };
- visitorManagementView.AddChidren(btnVisitorManagementRight);
-
- btnisitorVManagementText = new Button()
- {
- X = Application.GetRealWidth(16),
- TextAlignment = TextAlignment.CenterLeft,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.SubheadingFontSize,
- TextID = StringId.VisitorManage,
- };
- visitorManagementView.AddChidren(btnisitorVManagementText);
-
- btnisitorVManagementText.MouseUpEventHandler = (sender, e) =>
- {
- var page = new VisitorQRCodePage();
- MainPage.BasePageView.AddChidren(page);
- page.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
-
-#if __IOS__
- //鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟
- 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();
-#endif
- };
- }
-
-
-#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 鏈嶅姟鍣ㄤ俊鎭�
ListCellView myServerInfoCellView = new ListCellView()
@@ -826,6 +723,7 @@
MainPage.BasePageView.AddChidren(myServerInfoPage);
myServerInfoPage.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+
};
myServerInfoCellView.GoAction = selectAction;
myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
@@ -851,11 +749,11 @@
logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
logOffView.LineView.RemoveFromParent();
-#endregion
+ #endregion
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