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 | 40 ++++++++++++++++++++++------------------
1 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 4b00e51..1fca242 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -98,7 +98,7 @@
bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
ContextView = new FrameLayout()
{
- Height = Application.GetRealHeight(618+30),
+ Height = Application.GetRealHeight(618+20),
BackgroundColor = CSS.CSS_Color.BackgroundColor,
};
bodyView.AddChidren(ContextView);
@@ -109,6 +109,12 @@
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 +128,9 @@
{
navigationSelectionView = new FrameLayout()
{
- X = Application.GetMinRealAverage(0 - 94 * 3),
+ X = Application.GetRealWidth(0 - 94 * 3),
Y = Application.GetMinRealAverage(4),
- Width = Application.GetMinRealAverage(94 * 7),
+ Width = Application.GetRealWidth(94 * 7),
Height = Application.GetMinRealAverage(38),
BackgroundImagePath = "Navigation/UserPageNavbg.png",
};
@@ -159,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);
@@ -191,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()
@@ -222,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()
@@ -254,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);
@@ -271,8 +277,6 @@
};
personalCenterView.AddChidren(btnPersonalCenterText);
#endregion
-
-
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -294,7 +298,7 @@
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - collectionView.X + Application.GetMinRealAverage(94*3);
+ var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
int sleepTime = 300;
if (distance > 200)
@@ -324,7 +328,7 @@
}
else
{
- navigationSelectionView.X = collectionView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = collectionView.X - Application.GetRealWidth(94 * 3);
btnCollectionText.IsSelected = true;
btnCollectionIcon.IsSelected = true;
btnClassificationIcon.IsSelected = false;
@@ -365,7 +369,7 @@
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - classificationView.X + Application.GetMinRealAverage(94 * 3);
+ var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance > 100 || distance < -100)
@@ -392,7 +396,7 @@
}
else
{
- navigationSelectionView.X = classificationView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = classificationView.X - Application.GetRealWidth(94 * 3);
btnClassificationText.IsSelected = true;
btnClassificationIcon.IsSelected = true;
btnCollectionIcon.IsSelected = false;
@@ -423,7 +427,7 @@
{ IsBackground = true }.Start();
#endregion
ContextView.RemoveAll();
- var classificaitionView = new UI.ClassificationPage();
+ var classificaitionView = new ClassificationPage();
ContextView.AddChidren(classificaitionView);
classificaitionView.LoadPage();
@@ -443,7 +447,7 @@
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetMinRealAverage(94 * 3);
+ var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance > 100 || distance < -100)
@@ -469,7 +473,7 @@
}
else
{
- navigationSelectionView.X = intellectualizationView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = intellectualizationView.X - Application.GetRealWidth(94 * 3);
btnIntellectualizationText.IsSelected = true;
btnIntellectualizationIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
@@ -516,7 +520,7 @@
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - personalCenterView.X + Application.GetMinRealAverage(94 * 3);
+ var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance < -200)
@@ -547,7 +551,7 @@
}
else
{
- navigationSelectionView.X = personalCenterView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = personalCenterView.X - Application.GetRealWidth(94 * 3);
btnPersonalCenterText.IsSelected = true;
btnPersonalCenterIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
--
Gitblit v1.8.0