From 4cc04639fbadde3a7f3b9875353df0d90fc09043 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期六, 18 一月 2020 14:33:40 +0800
Subject: [PATCH] 节前备份

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

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 0d09bf7..b81fc04 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -95,6 +95,7 @@
         public void LoadPage()
         {
             bodyView = this;
+            bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
             ContextView = new FrameLayout()
             {
                 Height = Application.GetRealHeight(618+25),
@@ -105,7 +106,7 @@
             navigationView = new FrameLayout()
             {
                 Y = Application.GetRealHeight(607),
-                Height = Application.GetRealHeight(60),
+                Height = Application.GetMinRealAverage(60),
             };
             bodyView.AddChidren(navigationView);
 
@@ -121,10 +122,10 @@
         {
             navigationSelectionView = new FrameLayout()
             {
-                X = Application.GetRealWidth(0 - 94 * 3),
-                Y = Application.GetRealHeight(4),
-                Width = Application.GetRealWidth(94 * 7),
-                Height = Application.GetRealHeight(38),
+                X = Application.GetMinRealAverage(0 - 94 * 3),
+                Y = Application.GetMinRealAverage(4),
+                Width = Application.GetMinRealAverage(94 * 7),
+                Height = Application.GetMinRealAverage(38),
                 BackgroundImagePath = "Navigation/UserPageNavbg.png",
             };
             navigationView.AddChidren(navigationSelectionView);
@@ -132,22 +133,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() {
@@ -172,7 +171,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);
@@ -203,7 +202,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);
@@ -234,7 +233,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);
@@ -267,7 +266,7 @@
                 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);
@@ -295,7 +294,7 @@
             btnIntellectualizationText.IsSelected = false;
             btnPersonalCenterText.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
+            var distance = navigationSelectionView.X - collectionView.X + Application.GetMinRealAverage(94*3);
             int total = 10;
             int sleepTime = 300;
             if (distance > 200)
@@ -325,7 +324,7 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = collectionView.X - Application.GetRealWidth(94 * 3);
+                            navigationSelectionView.X = collectionView.X - Application.GetMinRealAverage(94 * 3);
                             btnCollectionText.IsSelected = true;
                             btnCollectionIcon.IsSelected = true;
                             btnClassificationIcon.IsSelected = false;
@@ -366,7 +365,7 @@
             btnIntellectualizationText.IsSelected = false;
             btnPersonalCenterText.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
+            var distance = navigationSelectionView.X - classificationView.X + Application.GetMinRealAverage(94 * 3);
             int total = 10;
             int sleepTime = 300;
             if (distance > 100 || distance < -100)
@@ -393,7 +392,7 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = classificationView.X - Application.GetRealWidth(94 * 3);
+                            navigationSelectionView.X = classificationView.X - Application.GetMinRealAverage(94 * 3);
                             btnClassificationText.IsSelected = true;
                             btnClassificationIcon.IsSelected = true;
                             btnCollectionIcon.IsSelected = false;
@@ -444,7 +443,7 @@
             btnClassificationIcon.IsSelected = false;
             btnPersonalCenterIcon.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
+            var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetMinRealAverage(94 * 3);
             int total = 10;
             int sleepTime = 300;
             if (distance > 100 || distance < -100)
@@ -470,7 +469,7 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = intellectualizationView.X - Application.GetRealWidth(94 * 3);
+                            navigationSelectionView.X = intellectualizationView.X - Application.GetMinRealAverage(94 * 3);
                             btnIntellectualizationText.IsSelected = true;
                             btnIntellectualizationIcon.IsSelected = true;
                             btnCollectionText.IsSelected = false;
@@ -517,7 +516,7 @@
             btnClassificationIcon.IsSelected = false;
             btnIntellectualizationIcon.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
+            var distance = navigationSelectionView.X - personalCenterView.X + Application.GetMinRealAverage(94 * 3);
             int total = 10;
             int sleepTime = 300;
             if (distance < -200)
@@ -548,7 +547,7 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = personalCenterView.X - Application.GetRealWidth(94 * 3);
+                            navigationSelectionView.X = personalCenterView.X - Application.GetMinRealAverage(94 * 3);
                             btnPersonalCenterText.IsSelected = true;
                             btnPersonalCenterIcon.IsSelected = true;
                             btnCollectionText.IsSelected = false;

--
Gitblit v1.8.0