From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期三, 15 十二月 2021 09:01:53 +0800 Subject: [PATCH] 更新 --- HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs | 160 ++++++++++++++++++++++++++-------------------------- 1 files changed, 80 insertions(+), 80 deletions(-) diff --git a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs index 95475ac..2e19364 100644 --- a/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs +++ b/HDL_ON/UI/UI2/4-PersonalCenter/PersonalCenterPage.cs @@ -85,10 +85,10 @@ /// 鍖哄煙鎴愬憳灏忓尯鍩熸枃鏈� /// </summary> Button btnResidenceMemberText; - /// <summary> - /// 鍖哄煙瀹夋斁灏忓尯鍩� - /// </summary> - FrameLayout residenceArmView; + ///// <summary> + ///// 鍖哄煙瀹夋斁灏忓尯鍩� + ///// </summary> + //FrameLayout residenceArmView; /// <summary> /// 鍖哄煙鎴愬畨鏀惧皬鍖哄煙鍥炬爣 /// </summary> @@ -287,21 +287,21 @@ contentView.RemoveAll(); #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) + //{ + // 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() { @@ -449,34 +449,34 @@ 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); + //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 } @@ -546,9 +546,9 @@ #region ---娣诲姞鍔熻兘鍖哄煙 residenceAddFunctionView = new FrameLayout() { - //X = residenceMemberView.Right, - X = Application.GetRealWidth(28 - 24), - Y = residenceManageView.Bottom, + X = residenceMemberView.Right, + //X = Application.GetRealWidth(28 - 24), + Y = Application.GetRealHeight(68),//residenceManageView.Bottom, Width = Application.GetRealWidth(64 + 48), Height = Application.GetRealWidth(64), }; @@ -590,34 +590,34 @@ 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); + //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闃舵 @@ -777,7 +777,7 @@ #endregion #endregion - #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰N+ 绛夎彍鍗曞垪琛� + #region 鏅鸿兘闊崇銆佽幏鍙栨敮鎸併�佸叧浜嶰n Pro 绛夎彍鍗曞垪琛� contentView.AddChidren(new Button() { Height = Application.GetRealHeight(8) }); supportView = new VerticalScrolViewLayout() @@ -1022,7 +1022,7 @@ //supView.AddChidren(btnSupportViewLine); #endregion - #region 鍏充簬ON+ + #region 鍏充簬On Pro FrameLayout aboutView = new FrameLayout() { Height = Application.GetRealWidth(44), -- Gitblit v1.8.0