From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 391 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 258 insertions(+), 133 deletions(-)
diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
index 862e5fc..8ad95c4 100644
--- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
+++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs
@@ -84,19 +84,18 @@
/// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceMemberText;
- #region F3闃舵
- ///// <summary>
- ///// 鍖哄煙瀹夋斁灏忓尯鍩�
- ///// </summary>
- //FrameLayout residenceArmView;
- ///// <summary>
- ///// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
- ///// </summary>
- //Button btnResidenceArmIcon;
- ///// <summary>
- ///// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
- ///// </summary>
- //Button btnResidenceArmText;
+ /// <summary>
+ /// 鍖哄煙瀹夋斁灏忓尯鍩�
+ /// </summary>
+ FrameLayout residenceArmView;
+ /// <summary>
+ /// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣
+ /// </summary>
+ Button btnResidenceArmIcon;
+ /// <summary>
+ /// 鍖哄煙瀹夋斁灏忓尯鍩熸枃鏈�
+ /// </summary>
+ Button btnResidenceArmText;
///// <summary>
///// 鍖哄煙杈呭姪鍔熻兘灏忓尯鍩�
///// </summary>
@@ -121,9 +120,7 @@
/// 鍖哄煙娣诲姞鍔熻兘灏忓尯鍩熸枃鏈�
/// </summary>
Button btnResidenceAddFunctionText;
- #endregion
- #region F3闃舵
///// <summary>
///// 杞欢璁剧疆鍖哄煙
///// </summary>
@@ -140,7 +137,7 @@
/// <summary>
/// 鑾峰彇鏀寔灏忓尯鍩�
/// </summary>
- FrameLayout supportView;
+ VerticalScrolViewLayout supportView;
/// <summary>
/// 鑾峰彇鏀寔鏂囨湰
/// </summary>
@@ -150,8 +147,11 @@
/// 鍏充簬On鏂囨湰
/// </summary>
Button btnAboutOnText;
+ /// <summary>
+ /// 鏅鸿兘闊崇鏂囨湰
+ /// </summary>
+ Button btnSmartSpeakerText;
- #endregion
public PersonalCenterPage()
{
@@ -192,12 +192,12 @@
TextAlignment = TextAlignment.Center,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.SubheadingFontSize,
- Text = 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))
+ if (!string.IsNullOrEmpty( UserInfo.Current.userName) && UserInfo.Current.userName == UserInfo.Current.AccountString)
{
- btnUserName.Text = UserInfo.Current.userName; ;
+ btnUserName.Text = Language.StringByID(StringId.UsersWhoNameIsEmpty);
}
btnEmail = new Button()
{
@@ -230,9 +230,46 @@
#endregion
+ //浣撻獙妯″紡
+ if(MainPage.NoLoginMode)
+ {
+ Button btnExit = new Button()
+ {
+ Y = Application.GetRealHeight(288) + personalInfoView.Bottom,
+ Gravity = Gravity.CenterHorizontal,
+ Height = Application.GetRealHeight(60),
+ Width = Application.GetRealWidth(330),
+ TextAlignment = TextAlignment.Center,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.WarningColor,
+ TextSize = CSS_FontSize.SubheadingFontSize,
+ TextID = StringId.NextStep,
+ Radius = 10,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ SelectedBackgroundColor = CSS_Color.MainBackgroundColor,
+ };
+ if(Language.CurrentLanguage =="Chinese")
+ {
+ btnExit.Text = "閫�鍑轰綋楠屾ā寮�";
+ }
+ else
+ {
+ btnExit.Text = "Exit dome";
+ }
+ btnExit.MouseUpEventHandler = (sender, e) =>
+ {
+ MainPage.NoLoginMode = false;
+ UserInfo.Current.ClearUserInfo();
+ HDLCommon.Current.Logout();
+ };
+ bodyView.AddChidren(btnExit);
+ return;
+ }
+
contentView = new VerticalScrolViewLayout()
{
Y = Application.GetRealHeight(8) + personalInfoView.Bottom,
+
Height = Application.GetRealHeight(400),
ScrollEnabled = false
};
@@ -245,7 +282,7 @@
contentView.RemoveAll();
#region 浣忓畢淇℃伅鍖哄煙
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare && DB_ResidenceData.Instance.GatewayType == 1)
{
residenceInfoView = new FrameLayout()
{
@@ -294,7 +331,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.EmphasisFontSize_FirstLevel,
- Text = DB_ResidenceData.Instance.CurrentRegion.Name,
+ Text = DB_ResidenceData.Instance.CurrentRegion.homeName,
IsBold = true
};
residenceInfoView.AddChidren(btnCurResidenceName);
@@ -308,7 +345,7 @@
BackgroundImagePath = "PersonalCenter/UserTypebg.png",
};
residenceInfoView.AddChidren(userTypeView);
- if (Language.CurrentLanguage != "Chinese" && !DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+ if (Language.CurrentLanguage != "Chinese" )//&& !DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
userTypeView.X = Application.GetRealWidth(200);
userTypeView.Width = Application.GetRealWidth(180);
@@ -321,7 +358,7 @@
Y = Application.GetRealHeight(15),
Width = Application.GetMinRealAverage(20),
Height = Application.GetMinRealAverage(20),
- UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
+ UnSelectedImagePath = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
== false ? "PersonalCenter/AdminTypeIcon.png" : "PersonalCenter/MemberTypeIcon.png",
};
userTypeView.AddChidren(btnUserTypeIcon);
@@ -333,14 +370,14 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.MainBackgroundColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- TextID = DB_ResidenceData.Instance.CurrentRegion.IsOthreShare
+ TextID = DB_ResidenceData.Instance.CurrentRegion.isOtherShare
== false ? StringId.Administrators : StringId.Member
};
userTypeView.AddChidren(btnUserTypeName);
#endregion
#region 浣忓畢绠＄悊
-
- if (!DB_ResidenceData.Instance.CurrentRegion.IsOthreShare)
+
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
{
#region ---浣忓畢绠＄悊鍖哄煙
residenceManageView = new FrameLayout()
@@ -404,36 +441,40 @@
};
residenceMemberView.AddChidren(btnResidenceMemberText);
#endregion
- #region ---瀹夋斁鍖哄煙
- #region F3闃舵
- //residenceArmView = new FrameLayout()
- //{
- // X = residenceMemberView.Right,
- // Y = Application.GetRealHeight(68),
- // Width = Application.GetRealWidth(64 + 48),
- // Height = Application.GetRealHeight(64),
- //};
- //residenceInfoView.AddChidren(residenceArmView);
- //btnResidenceArmIcon = new Button
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(5),
- // Width = Application.GetMinRealAverage(30),
- // Height = Application.GetMinRealAverage(30),
- // UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
- //};
- //residenceArmView.AddChidren(btnResidenceArmIcon);
- //btnResidenceArmText = new Button()
- //{
- // Y = btnResidenceManageIcon.Bottom,
- // Height = Application.GetRealHeight(29),
- // TextID = StringId.Undefense,
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- //};
- //residenceArmView.AddChidren(btnResidenceArmText);
- #endregion
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ #region ---瀹夋斁鍖哄煙
+ residenceArmView = new FrameLayout()
+ {
+ X = residenceMemberView.Right,
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealHeight(64),
+ };
+ residenceInfoView.AddChidren(residenceArmView);
+ btnResidenceArmIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+ SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
+ };
+ residenceArmView.AddChidren(btnResidenceArmIcon);
+ btnResidenceArmText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.Undefense,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceArmView.AddChidren(btnResidenceArmText);
+ #endregion
+ }
+
#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
@@ -495,37 +536,39 @@
//residenceAuxiliaryFunctionView.AddChidren(btnResidenceAuxiliaryFunctionText);
#endregion
- #region ---娣诲姞鍔熻兘鍖哄煙
- residenceAddFunctionView = new FrameLayout()
+ if (DB_ResidenceData.Instance.GatewayType == 1)
{
- //X = residenceAuxiliaryFunctionView.Right,
- X = Application.GetRealWidth(28 - 24),
- Y = residenceManageView.Bottom,
- Width = Application.GetRealWidth(64 + 48),
- Height = Application.GetRealWidth(64),
- };
- residenceInfoView.AddChidren(residenceAddFunctionView);
- btnResidenceAddFunctionIcon = new Button
- {
- Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(5),
- Width = Application.GetMinRealAverage(30),
- Height = Application.GetMinRealAverage(30),
- UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
- };
- residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
- btnResidenceAddFunctionText = new Button()
- {
- Y = btnResidenceManageIcon.Bottom,
- Height = Application.GetRealHeight(29),
- TextID = StringId.AddFunction,
- TextAlignment = TextAlignment.Center,
- TextColor = CSS_Color.FirstLevelTitleColor,
- TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- };
- residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
- #endregion
- #endregion
+ #region ---娣诲姞鍔熻兘鍖哄煙
+ residenceAddFunctionView = new FrameLayout()
+ {
+ //X = residenceMemberView.Right,
+ X = Application.GetRealWidth(28 - 24),
+ Y = residenceManageView.Bottom,
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(residenceAddFunctionView);
+ btnResidenceAddFunctionIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/AddFunctionIcon.png",
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionIcon);
+ btnResidenceAddFunctionText = new Button()
+ {
+ Y = btnResidenceManageIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.AddFunction,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceAddFunctionView.AddChidren(btnResidenceAddFunctionText);
+ #endregion
+ }
}
else
{
@@ -539,36 +582,40 @@
TextID = StringId.FunctionNotOpen,
});
+ if (DB_ResidenceData.Instance.GatewayType == 1)
+ {
+ #region ---瀹夋斁鍖哄煙
+ residenceArmView = new FrameLayout()
+ {
+ X = Application.GetRealWidth(28 - 24),
+ Y = Application.GetRealHeight(68),
+ Width = Application.GetRealWidth(64 + 48),
+ Height = Application.GetRealWidth(64),
+ };
+ residenceInfoView.AddChidren(residenceArmView);
+ btnResidenceArmIcon = new Button
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Y = Application.GetRealHeight(5),
+ Width = Application.GetMinRealAverage(30),
+ Height = Application.GetMinRealAverage(30),
+ UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
+ SelectedImagePath = "PersonalCenter/ResidenceDefenseIcon.png",
+ };
+ residenceArmView.AddChidren(btnResidenceArmIcon);
+ btnResidenceArmText = new Button()
+ {
+ Y = btnResidenceArmIcon.Bottom,
+ Height = Application.GetRealHeight(29),
+ TextID = StringId.Undefense,
+ TextAlignment = TextAlignment.Center,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_FirstLevel
+ };
+ residenceArmView.AddChidren(btnResidenceArmText);
+ #endregion
+ }
#region F3闃舵
- #region ---瀹夋斁鍖哄煙
- //residenceArmView = new FrameLayout()
- //{
- // X = Application.GetRealWidth(28 - 24),
- // Y = Application.GetRealHeight(68),
- // Width = Application.GetRealWidth(64 + 48),
- // Height = Application.GetRealWidth(64),
- //};
- //residenceInfoView.AddChidren(residenceArmView);
- //btnResidenceArmIcon = new Button
- //{
- // Gravity = Gravity.CenterHorizontal,
- // Y = Application.GetRealHeight(5),
- // Width = Application.GetMinRealAverage(30),
- // Height = Application.GetMinRealAverage(30),
- // UnSelectedImagePath = "PersonalCenter/ResidenceArmIcon.png",
- //};
- //residenceArmView.AddChidren(btnResidenceArmIcon);
- //btnResidenceArmText = new Button()
- //{
- // Y = btnResidenceArmIcon.Bottom,
- // Height = Application.GetRealHeight(29),
- // TextID = StringId.Undefense,
- // TextAlignment = TextAlignment.Center,
- // TextColor = CSS_Color.FirstLevelTitleColor,
- // TextSize = CSS_FontSize.PromptFontSize_FirstLevel
- //};
- //residenceArmView.AddChidren(btnResidenceArmText);
- #endregion
#region ---鏁版嵁澶囦唤鍖哄煙
//residenceDataBackupView = new FrameLayout()
//{
@@ -724,9 +771,11 @@
//softSettingView.AddChidren(btnGeneralSettingsRight);
#endregion
#endregion
- #region 鑾峰彇鏀寔
+
+ #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰N+ 绛夎彍鍗曞垪琛�
contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) });
- supportView = new FrameLayout()
+
+ supportView = new VerticalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
@@ -735,18 +784,87 @@
Radius = (uint)Application.GetRealHeight(12),
BorderColor = 0x00FFFFFF,
BorderWidth = 0,
+ ScrollEnabled = false,
+ VerticalScrollBarEnabled = false,//闅愯棌婊氬姩鏉�
};
contentView.AddChidren(supportView);
+
+
+
+ #region 鏅鸿兘闊崇
+ if (!DB_ResidenceData.Instance.CurrentRegion.isOtherShare)
+ {
+ //supportView 鍔犻珮 鏄剧ず3琛� 3*44
+ supportView.Height = Application.GetRealWidth(3*44);
+
+ FrameLayout smartSpeakerView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(smartSpeakerView);
+
+ //浣忓畢涓哄綋鍓嶈处鍙锋墠鏄剧ず鏅鸿兘闊崇鍏ュ彛
+ Button btnSmartSpeakerIcon = new Button()
+ {
+ X = Application.GetRealWidth(12),
+ Y = Application.GetRealWidth(10),
+ Width = Application.GetMinRealAverage(24),
+ Height = Application.GetMinRealAverage(24),
+ UnSelectedImagePath = "PersonalCenter/SmartSpeaker.png",
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerIcon);
+
+ btnSmartSpeakerText = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Width = Application.GetRealWidth(270),
+ Height = Application.GetRealWidth(44),
+ TextID = StringId.SmartSpeaker,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextAlignment = TextAlignment.CenterLeft,
+ TextSize = CSS_FontSize.TextFontSize
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerText);
+
+ Button btnSmartSpeakerRight = new Button()
+ {
+ X = Application.GetRealWidth(315),
+ Y = Application.GetRealWidth(14),
+ Width = Application.GetMinRealAverage(16),
+ Height = Application.GetMinRealAverage(16),
+ UnSelectedImagePath = "Public/Right.png",
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerRight);
+
+ var btnSmartSpeakerViewLine = new Button()
+ {
+ X = Application.GetRealWidth(48),
+ Y = Application.GetRealWidth(43),
+ Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(279),
+ BackgroundColor = CSS_Color.DividingLineColor
+ };
+ smartSpeakerView.AddChidren(btnSmartSpeakerViewLine);
+ }
+
+ #endregion
+
+ #region 鑾峰彇鏀寔
+ FrameLayout supView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(supView);
Button btnSupportIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealHeight(10),
+ Y = Application.GetRealWidth(10),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/SupportIcon.png",
};
- supportView.AddChidren(btnSupportIcon);
+ supView.AddChidren(btnSupportIcon);
btnSupportText = new Button()
{
@@ -758,7 +876,8 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize
};
- supportView.AddChidren(btnSupportText);
+ supView.AddChidren(btnSupportText);
+
Button btnSupportRight = new Button()
{
X = Application.GetRealWidth(315),
@@ -767,33 +886,39 @@
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/Right.png",
};
- supportView.AddChidren(btnSupportRight);
-
-
+ supView.AddChidren(btnSupportRight);
var btnSupportViewLine = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSupportText.Bottom,
+ Y = Application.GetRealWidth(43),
Height = Application.GetRealHeight(1),
+ Width = Application.GetRealWidth(279),
BackgroundColor = CSS_Color.DividingLineColor
};
- supportView.AddChidren(btnSupportViewLine);
+ supView.AddChidren(btnSupportViewLine);
+ #endregion
+
+ #region 鍏充簬ON+
+ FrameLayout aboutView = new FrameLayout()
+ {
+ Height = Application.GetRealWidth(44),
+ };
+ supportView.AddChidren(aboutView);
Button btnAboutOnIcon = new Button()
{
X = Application.GetRealWidth(12),
- Y = Application.GetRealWidth(54),
+ Y = Application.GetRealWidth(10),
Width = Application.GetMinRealAverage(24),
Height = Application.GetMinRealAverage(24),
UnSelectedImagePath = "PersonalCenter/InfoOnIcon.png",
};
- supportView.AddChidren(btnAboutOnIcon);
+ aboutView.AddChidren(btnAboutOnIcon);
btnAboutOnText = new Button()
{
X = Application.GetRealWidth(48),
- Y = btnSupportViewLine.Bottom,
Width = Application.GetRealWidth(370),
Height = Application.GetRealWidth(44),
TextID = StringId.AboutOn,
@@ -801,18 +926,18 @@
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.TextFontSize
};
- supportView.AddChidren(btnAboutOnText);
+ aboutView.AddChidren(btnAboutOnText);
Button btnAboutOnRight = new Button()
{
X = Application.GetRealWidth(315),
- Y = Application.GetRealWidth(58),
+ Y = Application.GetRealWidth(14),
Width = Application.GetMinRealAverage(16),
Height = Application.GetMinRealAverage(16),
UnSelectedImagePath = "Public/Right.png",
};
- supportView.AddChidren(btnAboutOnRight);
-
+ aboutView.AddChidren(btnAboutOnRight);
+ #endregion
#endregion
--
Gitblit v1.8.0