From 171bf03f3664226eeff2b20ee9bd2e914b63a17d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 13 三月 2020 09:18:50 +0800
Subject: [PATCH] 20200313

---
 HDL_ON/UI/UI2/UserPage.cs |   45 ++++++++++++++++++++++++---------------------
 1 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 0d09bf7..1fca242 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -95,19 +95,26 @@
         public void LoadPage()
         {
             bodyView = this;
+            bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
             ContextView = new FrameLayout()
             {
-                Height = Application.GetRealHeight(618+25),
-                BackgroundColor = CSS.CSS_Color.BackgroundColor
+                Height = Application.GetRealHeight(618+20),
+                BackgroundColor = CSS.CSS_Color.BackgroundColor,
             };
             bodyView.AddChidren(ContextView);
 
             navigationView = new FrameLayout()
             {
                 Y = Application.GetRealHeight(607),
-                Height = Application.GetRealHeight(60),
+                Height = Application.GetMinRealAverage(60),
             };
             bodyView.AddChidren(navigationView);
+            if (MainPage.Increase)
+            {
+                //ContextView.Height = Application.GetRealHeight(618 + 20);
+                navigationView.Y = Application.GetRealHeight(597+5);
+                navigationView.Height = Application.GetRealHeight(70-5);
+            }
 
             InitBottomView();
 
@@ -122,9 +129,9 @@
             navigationSelectionView = new FrameLayout()
             {
                 X = Application.GetRealWidth(0 - 94 * 3),
-                Y = Application.GetRealHeight(4),
+                Y = Application.GetMinRealAverage(4),
                 Width = Application.GetRealWidth(94 * 7),
-                Height = Application.GetRealHeight(38),
+                Height = Application.GetMinRealAverage(38),
                 BackgroundImagePath = "Navigation/UserPageNavbg.png",
             };
             navigationView.AddChidren(navigationSelectionView);
@@ -132,22 +139,20 @@
             btnNavigationSelectionIcon = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(6),
+                Y = Application.GetMinRealAverage(6),
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/CollectionIconOn.png",
             };
             navigationSelectionView.AddChidren(btnNavigationSelectionIcon);
 
-
             NavigationSubView = new FrameLayout()
             {
-                Y = Application.GetRealHeight(11),
+                Y = Application.GetMinRealAverage(11),
                 Height = Application.GetRealHeight(49),
-                //BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+                //BackgroundColor=0xFF00F0F0
             };
             navigationView.AddChidren(NavigationSubView);
-
 
             #region 鏀惰棌鍖哄煙
             collectionView = new FrameLayout() {
@@ -160,7 +165,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/CollectionIcon.png",
-                SelectedImagePath = "0Common/transparent.png",
+                SelectedImagePath = "Public/transparent.png",
                 IsSelected = true,
             };
             collectionView.AddChidren(btnCollectionIcon);
@@ -172,7 +177,7 @@
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextColor =CSS.CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Collection,
+                TextID = StringId.Collection,
                 TextAlignment = TextAlignment.Center,
             };
             collectionView.AddChidren(btnCollectionText);
@@ -192,7 +197,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/ClassificationIcon.png",
-                SelectedImagePath = "0Common/transparent.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             classificationView.AddChidren(btnClassificationIcon);
             btnClassificationText = new Button()
@@ -203,7 +208,7 @@
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Classification,
+                TextID = StringId.Classification,
                 TextAlignment = TextAlignment.Center,
             };
             classificationView.AddChidren(btnClassificationText);
@@ -223,7 +228,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/IntellectualizationIcon.png",
-                SelectedImagePath = "0Common/transparent.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             intellectualizationView.AddChidren(btnIntellectualizationIcon);
             btnIntellectualizationText = new Button()
@@ -234,7 +239,7 @@
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Intellectualization,
+                TextID = StringId.Intellectualization,
                 TextAlignment = TextAlignment.Center,
             };
             intellectualizationView.AddChidren(btnIntellectualizationText);
@@ -255,7 +260,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/PersonalCenterIcon.png",
-                SelectedImagePath = "0Common/transparent.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             personalCenterView.AddChidren(btnPersonalCenterIcon);
 
@@ -267,13 +272,11 @@
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Personal,
+                TextID = StringId.Personal,
                 TextAlignment = TextAlignment.Center,
             };
             personalCenterView.AddChidren(btnPersonalCenterText);
             #endregion
-
-
 
             var homePage = new HomePage();
             ContextView.AddChidren(homePage);
@@ -424,7 +427,7 @@
             { IsBackground = true }.Start();
             #endregion
             ContextView.RemoveAll();
-            var classificaitionView = new UI.ClassificationPage();
+            var classificaitionView = new ClassificationPage();
             ContextView.AddChidren(classificaitionView);
             classificaitionView.LoadPage();
 

--
Gitblit v1.8.0