From c1d681f496f2e1c53f88472d803e3c95fab521af Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 29 七月 2021 09:46:16 +0800
Subject: [PATCH] 萤石测试通过
---
HDL_ON/UI/UI2/UserPage.cs | 274 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 175 insertions(+), 99 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 88fd5a9..0cca652 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -1,11 +1,13 @@
锘縰sing System;
+using HDL_ON.Entity;
using Shared;
+using HDL_ON.UI.CSS;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
public partial class UserPage : FrameLayout
{
-
#region 鎺т欢鍒楄〃
/// <summary>
/// 褰撳墠鍖哄煙
@@ -15,6 +17,7 @@
/// 鍐呭鍖哄煙
/// </summary>
FrameLayout ContextView;
+ //VerticalRefreshLayout ContextView;
/// <summary>
/// 瀵艰埅鏍忓尯鍩�
/// </summary>
@@ -83,42 +86,59 @@
#endregion
#endregion
- /// <summary>
- /// 褰撳墠鍔ㄧ敾鏁堟灉
- /// 0:鏀惰棌
- /// 1:鍒嗙被
- /// 2:鏅鸿兘
- /// 3:涓汉
- /// </summary>
- int CurAnimationEffect = 0;
public void LoadPage()
{
- bodyView = this;
- bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
- ContextView = new FrameLayout()
+ try
{
- Height = Application.GetRealHeight(618+20),
- BackgroundColor = CSS.CSS_Color.BackgroundColor,
- };
- bodyView.AddChidren(ContextView);
+ bodyView = this;
+ bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ ContextView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(618 + 17),//瀵艰埅鏍忓簳閮ㄧ晫闄�
+ BackgroundColor = CSS_Color.BackgroundColor,
+ };
+ bodyView.AddChidren(ContextView);
- navigationView = new FrameLayout()
- {
- Y = Application.GetRealHeight(607),
- 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);
+ navigationView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(607),
+ Height = Application.GetMinRealAverage(60),
+ //BackgroundColor = CSS_Color.BackgroundColor
+ };
+ 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();
+
+ LoadEventList();
+
+ var homePage = new HomePage();
+ ContextView.AddChidren(homePage);
+ homePage.LoadPage();
+
+ if (!MainPage.NoLoginMode)
+ {
+ //娉ㄥ唽鎺ㄩ�両D
+ RegisteredPush();
+ }
+ //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+ HDLCommon.Current.CheckIfNeedForceUpdate();
+
+#if __Android__
+ //寮�鍚畾浣嶆湇鍔�
+ Shared.Application.StartGPSLocationService();
+#endif
+
}
-
- InitBottomView();
-
- LoadEventList();
+ catch (Exception ex)
+ {
+ MainPage.Log($"UserPage error {ex.Message}");
+ }
}
/// <summary>
@@ -128,10 +148,10 @@
{
navigationSelectionView = new FrameLayout()
{
- X = Application.GetMinRealAverage(0 - 94 * 3),
+ X = Application.GetRealWidth(0 - 94 * 3),
Y = Application.GetMinRealAverage(4),
- Width = Application.GetMinRealAverage(94 * 7),
- Height = Application.GetMinRealAverage(38),
+ Width = Application.GetRealWidth(94 * 7),
+ Height = Application.GetRealWidth(38),
BackgroundImagePath = "Navigation/UserPageNavbg.png",
};
navigationView.AddChidren(navigationSelectionView);
@@ -139,10 +159,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);
@@ -154,7 +174,7 @@
};
navigationView.AddChidren(NavigationSubView);
- #region 鏀惰棌鍖哄煙
+#region 鏀惰棌鍖哄煙
collectionView = new FrameLayout() {
Width = Application.GetRealWidth(94),
};
@@ -164,7 +184,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,
};
@@ -174,16 +194,17 @@
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
+#endregion
- #region 鍒嗙被鍖哄煙
+#region 鍒嗙被鍖哄煙
classificationView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -205,16 +226,16 @@
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,
};
classificationView.AddChidren(btnClassificationText);
- #endregion
+#endregion
- #region 鏅鸿兘鍖哄煙
+#region 鏅鸿兘鍖哄煙
intellectualizationView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -236,16 +257,16 @@
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,
};
intellectualizationView.AddChidren(btnIntellectualizationText);
- #endregion
+#endregion
- #region 涓汉涓績
+#region 涓汉涓績
personalCenterView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -269,27 +290,29 @@
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,
};
personalCenterView.AddChidren(btnPersonalCenterText);
- #endregion
+#endregion
var homePage = new HomePage();
ContextView.AddChidren(homePage);
homePage.LoadPage();
}
-
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
- void ChooseCollection()
+ public void ChooseCollection()
{
- CurAnimationEffect = 0;
+ if (MainPage.CurPageIndex == 0)
+ {
+ return;
+ }
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -297,25 +320,27 @@
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - collectionView.X + Application.GetMinRealAverage(94*3);
+#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) {
- if (CurAnimationEffect != 0)
+ MainPage.CurPageIndex = 0;
+ while (index < total+1)
+ {
+ if (MainPage.CurPageIndex != 0)
{
break;
}
@@ -328,7 +353,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;
@@ -337,10 +362,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);
@@ -348,8 +374,13 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
- }) { IsBackground = true }.Start();
- #endregion
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
+ }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
+#endregion
ContextView.RemoveAll();
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -360,7 +391,10 @@
/// </summary>
void ChooseClassification()
{
- CurAnimationEffect = 1;
+ if (MainPage.CurPageIndex == 1)
+ {
+ return;
+ }
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -368,22 +402,26 @@
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - classificationView.X + Application.GetMinRealAverage(94 * 3);
+#region 绉诲姩鍔ㄧ敾
+ var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance > 100 || distance < -100)
{
- sleepTime = 450;
total = 20;
}
distance /= total;
new System.Threading.Thread(() =>
{
+ if (MainPage.CurPageIndex == 1)
+ {
+ return;
+ }
+ MainPage.CurPageIndex = 1;
int index = 0;
while (index < total+1)
{
- if (CurAnimationEffect != 1)
+ if (MainPage.CurPageIndex != 1)
{
break;
}
@@ -396,7 +434,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;
@@ -405,6 +443,7 @@
btnCollectionText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
}
if (index == (total / 2 ))
{
@@ -423,9 +462,14 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
- { IsBackground = true }.Start();
- #endregion
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+#endregion
ContextView.RemoveAll();
var classificaitionView = new ClassificationPage();
ContextView.AddChidren(classificaitionView);
@@ -438,7 +482,10 @@
/// </summary>
void ChooseIntellectualization()
{
- CurAnimationEffect = 2;
+ if (MainPage.CurPageIndex == 2)
+ {
+ return;
+ }
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -446,21 +493,25 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetMinRealAverage(94 * 3);
+#region 绉诲姩鍔ㄧ敾
+ var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance > 100 || distance < -100)
{
- sleepTime = 450;
total = 20;
}
distance /= total;
new System.Threading.Thread(() => {
+ if (MainPage.CurPageIndex == 2)
+ {
+ return;
+ }
+ MainPage.CurPageIndex = 2;
int index = 0;
while (index < total+1)
{
- if(CurAnimationEffect!=2)
+ if(MainPage.CurPageIndex!=2)
{
break;
}
@@ -473,7 +524,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;
@@ -482,6 +533,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
}
if (index == (total / 2 ))
{
@@ -500,18 +552,31 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
- { IsBackground = true }.Start();
- #endregion
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+#endregion
ContextView.RemoveAll();
+ var intelligenceView = new IntelligencePage();
+ ContextView.AddChidren(intelligenceView);
+ intelligenceView.LoadPage();
+
+
}
/// <summary>
/// 鍒囨崲鍒颁釜浜轰腑蹇冪晫闈�
/// </summary>
- void ChoosePersonalCenter()
+ public void ChoosePersonalCenter()
{
- CurAnimationEffect = 3;
+ if (MainPage.CurPageIndex == 3)
+ {
+ return;
+ }
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -519,26 +584,26 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - personalCenterView.X + Application.GetMinRealAverage(94 * 3);
+#region 绉诲姩鍔ㄧ敾
+ var distance = navigationSelectionView.X - personalCenterView.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(() => {
+ MainPage.CurPageIndex = 3;
int index = 0;
while (index < total+1)
{
- if (CurAnimationEffect != 3)
+ if (MainPage.CurPageIndex != 3)
{
break;
}
@@ -551,7 +616,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;
@@ -560,6 +625,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
}
if (index == (total / 2 ))
{
@@ -571,10 +637,13 @@
System.Threading.Thread.Sleep(sleepTime / total);
index++;
}
+ Application.RunOnMainThread(() =>
+ {
+ btnNavigationSelectionIcon.SetRotation(0f);
+ });
})
- { IsBackground = true }.Start();
- #endregion
-
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+#endregion
ContextView.RemoveAll();
var personalCenterPage = new UI.PersonalCenterPage();
@@ -582,5 +651,12 @@
personalCenterPage.LoadView();
}
+ /// <summary>
+ /// 娉ㄥ唽鎺ㄩ��
+ /// </summary>
+ void RegisteredPush()
+ {
+ new HttpServerRequest().RegisteredPush();
+ }
}
}
--
Gitblit v1.8.0