From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/UI2/UserPage.cs | 113 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 80 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index ecaf192..db0bc6f 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using HDL_ON.Entity;
using Shared;
+using HDL_ON.UI.CSS;
namespace HDL_ON.UI
{
@@ -98,11 +99,11 @@
try
{
bodyView = this;
- bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
+ bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
ContextView = new FrameLayout()
{
- Height = Application.GetRealHeight(618 + 20),
- BackgroundColor = CSS.CSS_Color.BackgroundColor,
+ Height = Application.GetRealHeight(618 + 17),//瀵艰埅鏍忓簳閮ㄧ晫闄�
+ BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(ContextView);
@@ -110,6 +111,7 @@
{
Y = Application.GetRealHeight(607),
Height = Application.GetMinRealAverage(60),
+ //BackgroundColor = CSS_Color.BackgroundColor
};
bodyView.AddChidren(navigationView);
if (MainPage.Increase)
@@ -145,7 +147,7 @@
X = Application.GetRealWidth(0 - 94 * 3),
Y = Application.GetMinRealAverage(4),
Width = Application.GetRealWidth(94 * 7),
- Height = Application.GetMinRealAverage(38),
+ Height = Application.GetRealWidth(38),
BackgroundImagePath = "Navigation/UserPageNavbg.png",
};
navigationView.AddChidren(navigationSelectionView);
@@ -153,9 +155,9 @@
btnNavigationSelectionIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(6),
- Width = Application.GetMinRealAverage(22),
- Height = Application.GetMinRealAverage(22),
+ Y = Application.GetRealWidth(6),
+ Width = Application.GetRealWidth(22),
+ Height = Application.GetRealWidth(22),
UnSelectedImagePath = "Navigation/CollectionIconOn.png",
};
navigationSelectionView.AddChidren(btnNavigationSelectionIcon);
@@ -188,11 +190,12 @@
Gravity = Gravity.CenterHorizontal,
Y = btnCollectionIcon.Bottom,
Height = Application.GetRealHeight(16),
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor =CSS.CSS_Color.FirstLevelTitleColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor =CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextID = StringId.Collection,
TextAlignment = TextAlignment.Center,
+ IsSelected = true,
};
collectionView.AddChidren(btnCollectionText);
#endregion
@@ -219,9 +222,9 @@
Gravity = Gravity.CenterHorizontal,
Y = btnCollectionIcon.Bottom,
Height = Application.GetRealHeight(16),
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextID = StringId.Classification,
TextAlignment = TextAlignment.Center,
};
@@ -250,9 +253,9 @@
Gravity = Gravity.CenterHorizontal,
Y = btnCollectionIcon.Bottom,
Height = Application.GetRealHeight(16),
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextID = StringId.Intellectualization,
TextAlignment = TextAlignment.Center,
};
@@ -283,9 +286,9 @@
Gravity = Gravity.CenterHorizontal,
Y = btnCollectionIcon.Bottom,
Height = Application.GetRealHeight(16),
- TextColor = CSS.CSS_Color.FirstLevelTitleColor,
- SelectedTextColor = CSS.CSS_Color.MainColor,
- TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+ TextColor = CSS_Color.FirstLevelTitleColor,
+ SelectedTextColor = CSS_Color.MainColor,
+ TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
TextID = StringId.Personal,
TextAlignment = TextAlignment.Center,
};
@@ -297,13 +300,15 @@
homePage.LoadPage();
}
-
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
void ChooseCollection()
{
- CurAnimationEffect = 0;
+ if (CurAnimationEffect == 0)
+ {
+ return;
+ }
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -312,23 +317,25 @@
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
+ //绉诲姩璺濈
var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
int sleepTime = 300;
if (distance > 200)
{
- sleepTime = 600;
+ sleepTime = 400;
total = 30;
}
else if (distance > 100)
{
- sleepTime = 450;
total = 20;
}
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- while (index < total+1) {
+ CurAnimationEffect = 0;
+ while (index < total+1)
+ {
if (CurAnimationEffect != 0)
{
break;
@@ -362,6 +369,11 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
}) { IsBackground = true }.Start();
#endregion
ContextView.RemoveAll();
@@ -374,7 +386,10 @@
/// </summary>
void ChooseClassification()
{
- CurAnimationEffect = 1;
+ if (CurAnimationEffect == 1)
+ {
+ return;
+ }
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -388,12 +403,16 @@
int sleepTime = 300;
if (distance > 100 || distance < -100)
{
- sleepTime = 450;
total = 20;
}
distance /= total;
new System.Threading.Thread(() =>
{
+ if (CurAnimationEffect == 1)
+ {
+ return;
+ }
+ CurAnimationEffect = 1;
int index = 0;
while (index < total+1)
{
@@ -437,6 +456,11 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
{ IsBackground = true }.Start();
#endregion
@@ -452,7 +476,10 @@
/// </summary>
void ChooseIntellectualization()
{
- CurAnimationEffect = 2;
+ if (CurAnimationEffect == 2)
+ {
+ return;
+ }
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -466,11 +493,15 @@
int sleepTime = 300;
if (distance > 100 || distance < -100)
{
- sleepTime = 450;
total = 20;
}
distance /= total;
new System.Threading.Thread(() => {
+ if (CurAnimationEffect == 2)
+ {
+ return;
+ }
+ CurAnimationEffect = 2;
int index = 0;
while (index < total+1)
{
@@ -514,6 +545,11 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
{ IsBackground = true }.Start();
#endregion
@@ -525,7 +561,16 @@
/// </summary>
void ChoosePersonalCenter()
{
- CurAnimationEffect = 3;
+#if DEBUG
+ if(MainPage.LocalMode)
+ {
+ return;
+ }
+#endif
+ if (CurAnimationEffect == 3)
+ {
+ return;
+ }
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -539,16 +584,16 @@
int sleepTime = 300;
if (distance < -200)
{
- sleepTime = 600;
+ sleepTime = 400;
total = 30;
}
else if (distance < -100)
{
- sleepTime = 450;
total = 20;
}
distance /= total;
new System.Threading.Thread(() => {
+ CurAnimationEffect = 3;
int index = 0;
while (index < total+1)
{
@@ -585,16 +630,18 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
{ IsBackground = true }.Start();
#endregion
-
ContextView.RemoveAll();
var personalCenterPage = new UI.PersonalCenterPage();
ContextView.AddChidren(personalCenterPage);
personalCenterPage.LoadView();
}
-
}
}
--
Gitblit v1.8.0