From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期六, 14 九月 2024 10:05:34 +0800
Subject: [PATCH] 退出登录时间调整，新风，音乐
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 289 +++++++++++++++++++--------------------------------------
1 files changed, 95 insertions(+), 194 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 04247bf..72e11f2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -2,6 +2,7 @@
using HDL_ON.UI.CSS;
using HDL_ON.Entity;
using HDL_ON.DriverLayer;
+using System;
namespace HDL_ON.UI
{
@@ -163,8 +164,25 @@
bodyView = this;
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
}
+
public void LoadView()
{
+ //try
+ //{
+ // if (MainPage.CurPageIndex == 3)
+ // {
+ // Application.RunOnMainThread(() =>
+ // {
+ // this.RemoveFromParent();
+ // return;
+ // });
+ // }
+ //}
+ //catch (Exception ex)
+ //{
+ // MainPage.Log($"鐣岄潰鍒囨崲寮傚父:{ex.Message}");
+ //}
+ MainPage.CurPageIndex = 3;
#region 涓汉淇℃伅
topbg = new FrameLayout()
{
@@ -197,10 +215,10 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = UserInfo.Current.userName// string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
+ Text = UserInfo.Current.userName // string.IsNullOrEmpty(UserInfo.Current.userName) ? Language.StringByID(StringId.UsersWhoNameIsEmpty) : UserInfo.Current.userName
};
personalInfoView.AddChidren(btnUserName);
- if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
+ if (!string.IsNullOrEmpty(UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
{
btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
}
@@ -211,7 +229,7 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.TextualColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = UserInfo.Current.AccountString
+ Text = UserInfo.Current.AccountString
};
personalInfoView.AddChidren(btnEmail);
@@ -222,7 +240,7 @@
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
Radius = (uint)Application.GetMinRealAverage(42),
- ImagePath = UserInfo.Current.headImagePagePath
+ ImagePath = UserInfo.Current.headImagePagePath
};
bodyView.AddChidren(userHeadImageView);
//if ( UserInfo.Current.headImagePageBytes==null)
@@ -236,7 +254,7 @@
#endregion
//浣撻獙妯″紡
- if(MainPage.NoLoginMode)
+ if (MainPage.NoLoginMode)
{
Button btnExit = new Button()
{
@@ -253,7 +271,7 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
};
- if(Language.CurrentLanguage =="Chinese")
+ if (Language.CurrentLanguage == "Chinese")
{
btnExit.Text = "閫�鍑�";
}
@@ -293,21 +311,23 @@
var residenceFunctionCount = 0;
#region 浣忓畢淇℃伅鍖哄煙
- //if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
- //{
- // residenceInfoView = new FrameLayout()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Width = Application.GetRealWidth(343),
- // Height = Application.GetRealHeight(213),
- // BackgroundColor = CSS_Color.MainBackgroundColor,
- // Radius = (uint)Application.GetRealHeight(12),
- // BorderColor = 0x00FFFFFF,
- // BorderWidth = 0,
- // };
- // contentView.AddChidren(residenceInfoView);
- //}
- //else
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare
+ && DB_ResidenceData.Instance.GatewayType == 1
+ && DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
+ {
+ residenceInfoView = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(213),
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Radius = (uint)Application.GetRealHeight(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 0,
+ };
+ contentView.AddChidren(residenceInfoView);
+ }
+ else
{
residenceInfoView = new FrameLayout()
{
@@ -356,7 +376,7 @@
BackgroundImagePath = "PersonalCenter/UserTypebg.png",
};
residenceInfoView.AddChidren(userTypeView);
- if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ if (Language.CurrentLanguage != "Chinese")//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
userTypeView.X = Application.GetRealWidth(200);
userTypeView.Width = Application.GetRealWidth(180);
@@ -583,174 +603,53 @@
residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
- //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);
+ bool needShow = false;
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl || needShow)
+ {
+ 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/FaceManagementIcon.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);
- //btnFaceManagementIcon.MouseUpEventHandler = (sender, e) => {
- // if (OnAppConfig.Instance.FaceManagementTip) {
+ 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.GroupControl,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ IsMoreLines = true,
+ };
+ faceManagementView.AddChidren(btnFaceManagementText);
- // return;
- // }
-
- // Dialog dialog = new Dialog()
- // {
- // BackgroundColor = CSS_Color.DialogTransparentColor1,
- // };
-
- // FrameLayout contentView = new FrameLayout()
- // {
- // Gravity = Gravity.Center,
- // Width = Application.GetRealWidth(270),
- // Height = Application.GetRealHeight(192),
- // BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
- // BorderColor = 0x00000000,
- // BorderWidth = 0,
- // Radius = (uint)Application.GetMinRealAverage(10),
- // };
- // dialog.AddChidren(contentView);
-
- // Button btnTitle = new Button()
- // {
- // Y = Application.GetRealHeight(16),
- // Height = Application.GetRealHeight(30),
- // TextColor = CSS_Color.MainColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextAlignment = TextAlignment.Center,
- // IsBold = true,
- // TextID = StringId.FaceProtocolPrompt,
- // };
- // contentView.AddChidren(btnTitle);
-
- // Button btnMsg = new Button()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Height = Application.GetRealHeight(35),
- // Y = btnTitle.Bottom,
- // Width = Application.GetRealHeight(200),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.TextualColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = " 涓轰繚鎶ゆ偍鐨勪釜浜洪殣绉佹潈鐩婏紝鐗瑰悜鎮ㄩ�氱煡骞剁敵璇锋槑纭悓鎰忔巿鏉冦�傝浣犱粩缁嗛槄璇�",
- // IsMoreLines = true,
- // };
- // contentView.AddChidren(btnMsg);
-
- // Button btnMsg1 = new Button()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Height = Application.GetRealHeight(15),
- // Y = btnMsg.Bottom,
- // Width = Application.GetRealHeight(200),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.MainColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = " 銆奜n Pro浜鸿劯淇℃伅閲囬泦鍗忚銆�",
- // IsMoreLines = true,
- // };
- // contentView.AddChidren(btnMsg1);
-
- // Button btnMsg2 = new Button()
- // {
- // Gravity = Gravity.CenterHorizontal,
- // Height = Application.GetRealHeight(35),
- // Y = btnMsg1.Bottom,
- // Width = Application.GetRealHeight(200),
- // TextAlignment = TextAlignment.CenterLeft,
- // TextColor = CSS_Color.TextualColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- // Text = " 鑻ュ悓鎰忚鍗忚锛岃鐐瑰嚮銆愬悓鎰忋�戞寜閿紝琛ㄧず鎮ㄥ凡缁忕悊瑙ｅ苟鍚屾剰浜鸿劯淇℃伅閲囬泦鍗忚銆�",
- // IsMoreLines = true,
- // };
- // contentView.AddChidren(btnMsg2);
-
- // Button btnLine = new Button()
- // {
- // Y = Application.GetRealHeight(149),
- // Height = Application.GetRealHeight(1),
- // Width = Application.GetRealWidth(270 / 2),
- // BackgroundColor = CSS.CSS_Color.DividingLineColor,
- // };
- // contentView.AddChidren(btnLine);
-
- // Button btnCancel = new Button()
- // {
- // Y = btnLine.Bottom,
- // Width = Application.GetRealWidth(135),
- // Height = Application.GetRealHeight(43),
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.TextualColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // //SelectedTextColor = CSS_Color.MainBackgroundColor,
- // //SelectedBackgroundColor = CSS_Color.MainColor,
- // TextID = StringId.Disagree,
- // };
- // contentView.AddChidren(btnCancel);
-
- // Button btnConfirm = new Button()
- // {
- // X = btnCancel.Right,
- // Y = btnLine.Y,
- // Width = Application.GetRealWidth(135),
- // Height = Application.GetRealHeight(45),
- // TextAlignment = TextAlignment.Center,
- // //TextColor = CSS_Color.TextualColor,
- // TextSize = CSS_FontSize.SubheadingFontSize,
- // TextColor = CSS_Color.MainBackgroundColor,
- // BackgroundColor = CSS_Color.MainColor,
- // TextID = StringId.Agree,
- // };
- // contentView.AddChidren(btnConfirm);
- // //渚嬶細鍙充笅鍦嗚 澶у皬涓�50
- // int mRectCornerID = HDLUtils.RectCornerBottomRight;
- // btnConfirm.SetCornerWithSameRadius((uint)Application.GetMinRealAverage(10), mRectCornerID);
- // dialog.Show();
-
- // btnCancel.MouseUpEventHandler += (sender, e) =>
- // {
- // dialog.Close();
- // };
- // btnMsg1.MouseUpEventHandler += (sender, e) =>
- // {
- // string url = "https://developer.hdlcontrol.com/浜鸿劯淇℃伅閲囬泦鍗忚.html";
- // if (Language.CurrentLanguage != "Chinese")
- // {
- // url = "https://developer.hdlcontrol.com/Face information collection protocol.html";
- // }
- // new WebViewDialog().LoadPage("浜鸿劯淇℃伅閲囬泦鍗忚", url);
-
- // dialog.Close();
- // };
-
- //};
- //#endregion
-
+ 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
@@ -1034,7 +933,7 @@
#endregion
#region Siri
- #if __IOS__
+#if __IOS__
//if (Application.PhoneType >= 12)
{
supportViewCellCount++;
@@ -1067,10 +966,11 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize
};
- if(Language.CurrentLanguage == "Chinese")
+ if (Language.CurrentLanguage == "Chinese")
{
btnSiriText.Text = "Siri蹇嵎鏂瑰紡";
- }else
+ }
+ else
{
btnSiriText.Text = "Siri Shortcut";
}
@@ -1078,8 +978,9 @@
siriView.AddChidren(btnSiriText);
- btnSiriText.MouseUpEventHandler = (sender, e) => {
- var ddd =new Other.SkipControl();
+ btnSiriText.MouseUpEventHandler = (sender, e) =>
+ {
+ var ddd = new Other.SkipControl();
ddd.SkipSiriView();
};
@@ -1103,7 +1004,7 @@
};
siriView.AddChidren(btnSmartSpeakerViewLine);
}
- #endif
+#endif
#endregion
#region 鑾峰彇鏀寔
--
Gitblit v1.8.0