From bbbfbb1fff6d2520c3f7c85d834b166e813a8a74 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期四, 06 四月 2023 10:34:49 +0800
Subject: [PATCH] 1.更新EZSDK.IOS.dll 2.增加使用app中定位隐私描述 3.更新添加萤石设备storyboard 4.更改萤石门锁页面适配
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 79 ++++++++++++++++++++++-----------------
1 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index fa38584..4ca2bdf 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -294,7 +294,9 @@
var residenceFunctionCount = 0;
#region 浣忓畢淇℃伅鍖哄煙
- if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare
+ && DB_ResidenceData.Instance.GatewayType == 1
+ && DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
{
residenceInfoView = new FrameLayout()
{
@@ -584,42 +586,51 @@
residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
- residenceFunctionCount++;
- #region ---浜鸿劯绠＄悊
- var faceManagementView = new FrameLayout()
+ if (DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
{
- X = Application.GetRealWidth(28 - 24),
- Y = residenceManageView.Bottom,
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(faceManagementView);
+ residenceFunctionCount++;
+ #region ---缁勫悎璋冨厜
+ var faceManagementView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(28 - 24),
+ Y = residenceManageView.Bottom,
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(faceManagementView);
- var btnFaceManagementIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png",
- };
- faceManagementView.AddChidren(btnFaceManagementIcon);
- var btnFaceManagementText = new Button()
- {
- Y = btnResidenceManageIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.FaceManagemant,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- faceManagementView.AddChidren(btnFaceManagementText);
- #endregion
+ var btnFaceManagementIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/CombinedDimmingIcon.png",
+ };
+ faceManagementView.AddChidren(btnFaceManagementIcon);
+ var btnFaceManagementText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.CombinedDimming,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ faceManagementView.AddChidren(btnFaceManagementText);
- EventHandler<MouseEventArgs> eventHandler = (sender, e) => {
-
- };
-
+ EventHandler<MouseEventArgs> eventHandler = (sender, e) =>
+ {
+ var page = new CombinedDimmingListPage();
+ MainPage.BasePageView.AddChidren(page);
+ page.LoadPage();
+ MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ };
+ faceManagementView.MouseUpEventHandler = eventHandler;
+ btnFaceManagementText.MouseUpEventHandler = eventHandler;
+ btnFaceManagementIcon.MouseUpEventHandler = eventHandler;
+ #endregion
+ }
}
}
else
--
Gitblit v1.8.0