From 35a33afeeb29466c20ee39dc34e0468d687afce9 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期五, 20 十一月 2020 17:47:38 +0800
Subject: [PATCH] 2020-11-20-1
---
HDL_ON/UI/UI2/UserPage.cs | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 2366b11..64b1f37 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -98,11 +98,13 @@
{
try
{
+
+
bodyView = this;
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
ContextView = new FrameLayout()
{
- Height = Application.GetRealHeight(618 + 20 +10),
+ Height = Application.GetRealHeight(618 + 17),//瀵艰埅鏍忓簳閮ㄧ晫闄�
BackgroundColor = CSS_Color.BackgroundColor,
};
bodyView.AddChidren(ContextView);
@@ -147,7 +149,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);
@@ -155,10 +157,10 @@
btnNavigationSelectionIcon = new Button()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetMinRealAverage(6),
- Width = Application.GetMinRealAverage(22),
- Height = Application.GetMinRealAverage(22),
- UnSelectedImagePath = "Navigation/CollectionIconOn.png",
+ Y = Application.GetRealWidth(6),
+ Width = Application.GetRealWidth(22),
+ Height = Application.GetRealWidth(22),
+ UnSelectedImagePath = "Navigation/HomePageIconOn.png",
};
navigationSelectionView.AddChidren(btnNavigationSelectionIcon);
@@ -180,7 +182,7 @@
Y = Application.GetRealHeight(5),
Width = Application.GetMinRealAverage(22),
Height = Application.GetMinRealAverage(22),
- UnSelectedImagePath = "Navigation/CollectionIcon.png",
+ UnSelectedImagePath = "Navigation/HomePageIcon.png",
SelectedImagePath = "Public/transparent.png",
IsSelected = true,
};
@@ -358,10 +360,11 @@
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
}
if (index == (total/2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/CollectionIconOn.png";
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
}
//鏃嬭浆
btnNavigationSelectionIcon.SetRotation(-36f * index);
@@ -369,6 +372,11 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
}) { IsBackground = true }.Start();
#endregion
ContextView.RemoveAll();
@@ -433,6 +441,7 @@
btnCollectionText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
}
if (index == (total / 2 ))
{
@@ -451,6 +460,11 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
{ IsBackground = true }.Start();
#endregion
@@ -517,6 +531,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
}
if (index == (total / 2 ))
{
@@ -535,10 +550,20 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
{ IsBackground = true }.Start();
#endregion
ContextView.RemoveAll();
+ var intelligenceView = new IntelligencePage();
+ ContextView.AddChidren(intelligenceView);
+ intelligenceView.LoadPage();
+
+
}
/// <summary>
@@ -547,7 +572,7 @@
void ChoosePersonalCenter()
{
#if DEBUG
- if(MainPage.LocalMode)
+ if(MainPage.NoLoginMode)
{
return;
}
@@ -604,6 +629,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
}
if (index == (total / 2 ))
{
@@ -615,6 +641,10 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
{ IsBackground = true }.Start();
#endregion
--
Gitblit v1.8.0