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 | 55 ++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 4ca2bdf..72e11f2 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -164,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()
{
@@ -198,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);
}
@@ -212,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);
@@ -223,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)
@@ -237,7 +254,7 @@
#endregion
//浣撻獙妯″紡
- if(MainPage.NoLoginMode)
+ if (MainPage.NoLoginMode)
{
Button btnExit = new Button()
{
@@ -254,7 +271,7 @@
BackgroundColor = CSS_Color.MainBackgroundColor,
SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
};
- if(Language.CurrentLanguage =="Chinese")
+ if (Language.CurrentLanguage == "Chinese")
{
btnExit.Text = "閫�鍑�";
}
@@ -296,7 +313,7 @@
#region 浣忓畢淇℃伅鍖哄煙
if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare
&& DB_ResidenceData.Instance.GatewayType == 1
- && DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ && DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl)
{
residenceInfoView = new FrameLayout()
{
@@ -359,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);
@@ -586,7 +603,8 @@
residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
#endregion
- if (DB_ResidenceData.Instance.CurrentRegion.isSupportGroupControl)
+ bool needShow = false;
+ if (DB_ResidenceData.Instance.HomeGateway.isSupportGroupControl || needShow)
{
residenceFunctionCount++;
#region ---缁勫悎璋冨厜
@@ -612,10 +630,11 @@
{
Y = btnResidenceManageIcon.Bottom,
Height = Application.GetRealHeight(29),
- TextID = StringId.CombinedDimming,
+ TextID = StringId.GroupControl,
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
+ IsMoreLines = true,
};
faceManagementView.AddChidren(btnFaceManagementText);
@@ -914,7 +933,7 @@
#endregion
#region Siri
- #if __IOS__
+#if __IOS__
//if (Application.PhoneType >= 12)
{
supportViewCellCount++;
@@ -947,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";
}
@@ -958,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();
};
@@ -983,7 +1004,7 @@
};
siriView.AddChidren(btnSmartSpeakerViewLine);
}
- #endif
+#endif
#endregion
#region 鑾峰彇鏀寔
--
Gitblit v1.8.0