From ae86b09b30621e1a8512c6bcdd7e22e9c67a5402 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期二, 17 五月 2022 14:02:06 +0800
Subject: [PATCH] Merge branch 'dev' into lss
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs | 87 +++++++++++++++++++++++--------------------
1 files changed, 47 insertions(+), 40 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
index 12ce6ef..3e639fb 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalDataPage.cs
@@ -703,52 +703,59 @@
//璁垮绠＄悊
#region 涓汉閫夐」-璁垮绠＄悊
- optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
-
- visitorManagementView = new FrameLayout()
+ if (!Entity.DB_ResidenceData.Instance.SupportVisitorManage)//鍒ゆ柇鏄惁鏀寔璁垮绠＄悊
{
- Height = Application.GetRealHeight(50),
- };
- optionListView.AddChidren(visitorManagementView);
+ optionListView.AddChidren(new Button() { X = Application.GetRealWidth(16), Height = Application.GetRealHeight(1), Width = Application.GetRealWidth(343), BackgroundColor = CSS_Color.DividingLineColor });
- 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);
+ visitorManagementView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(50),
+ };
+ optionListView.AddChidren(visitorManagementView);
- 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) =>
- {
- //鍒锋柊鎺ュ彛璇锋眰鎵�闇�瑕佺殑鍙傛暟
- 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();
- };
+ 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);
- #endregion
- #endregion
+ 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) =>
+ {
+#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 瑙ｉ攣璁剧疆鍖哄煙
+#region 瑙ｉ攣璁剧疆鍖哄煙
///// <summary>
///// 瑙ｉ攣璁剧疆鍖哄煙
///// </summary>
@@ -798,9 +805,9 @@
//};
//interpretationSettingsView.AddChidren(btnInterpretationSettingsRight);
//interpretationSettingsView.AddChidren(new LineView(interpretationSettingsView.Height));
- #endregion
+#endregion
- #region 鏈嶅姟鍣ㄤ俊鎭�
+#region 鏈嶅姟鍣ㄤ俊鎭�
ListCellView myServerInfoCellView = new ListCellView()
{
};
@@ -817,10 +824,10 @@
myServerInfoCellView.BtnTilte.Text = Language.StringByID(StringId.ServerInformation);
//myServerInfoCellView.LineView.RemoveFromParent();
- #endregion
+#endregion
- #region 娉ㄩ攢璐﹀彿
+#region 娉ㄩ攢璐﹀彿
ListCellView logOffView = new ListCellView()
{
};
@@ -837,7 +844,7 @@
logOffView.BtnTilte.Text = Language.StringByID(StringId.CancelAccount);
logOffView.LineView.RemoveFromParent();
- #endregion
+#endregion
btnLogout = new Button()
{
--
Gitblit v1.8.0