From eda3fb873e59544ff36301b51e05aef64f87b0f9 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 13:21:21 +0800
Subject: [PATCH] Merge branch 'newBranch1' of http://172.16.1.23:6688/r/~wxr/HDL_APP_Project into newBranch1
---
HDL_ON/UI/UI2/UserPage.cs | 52 +++++++++++++++++++++++++++-------------------------
1 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 44540a8..0cca652 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -121,10 +121,18 @@
ContextView.AddChidren(homePage);
homePage.LoadPage();
- //娉ㄥ唽鎺ㄩ�両D
- RegisteredPush();
+ if (!MainPage.NoLoginMode)
+ {
+ //娉ㄥ唽鎺ㄩ�両D
+ RegisteredPush();
+ }
//2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
HDLCommon.Current.CheckIfNeedForceUpdate();
+
+#if __Android__
+ //寮�鍚畾浣嶆湇鍔�
+ Shared.Application.StartGPSLocationService();
+#endif
}
catch (Exception ex)
@@ -166,7 +174,7 @@
};
navigationView.AddChidren(NavigationSubView);
- #region 鏀惰棌鍖哄煙
+#region 鏀惰棌鍖哄煙
collectionView = new FrameLayout() {
Width = Application.GetRealWidth(94),
};
@@ -194,9 +202,9 @@
IsSelected = true,
};
collectionView.AddChidren(btnCollectionText);
- #endregion
+#endregion
- #region 鍒嗙被鍖哄煙
+#region 鍒嗙被鍖哄煙
classificationView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -225,9 +233,9 @@
TextAlignment = TextAlignment.Center,
};
classificationView.AddChidren(btnClassificationText);
- #endregion
+#endregion
- #region 鏅鸿兘鍖哄煙
+#region 鏅鸿兘鍖哄煙
intellectualizationView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -256,9 +264,9 @@
TextAlignment = TextAlignment.Center,
};
intellectualizationView.AddChidren(btnIntellectualizationText);
- #endregion
+#endregion
- #region 涓汉涓績
+#region 涓汉涓績
personalCenterView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -289,7 +297,7 @@
TextAlignment = TextAlignment.Center,
};
personalCenterView.AddChidren(btnPersonalCenterText);
- #endregion
+#endregion
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -299,7 +307,7 @@
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
- void ChooseCollection()
+ public void ChooseCollection()
{
if (MainPage.CurPageIndex == 0)
{
@@ -312,7 +320,7 @@
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
+#region 绉诲姩鍔ㄧ敾
//绉诲姩璺濈
var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
@@ -372,7 +380,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
}) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -394,7 +402,7 @@
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
+#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
@@ -461,7 +469,7 @@
});
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var classificaitionView = new ClassificationPage();
ContextView.AddChidren(classificaitionView);
@@ -485,7 +493,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
+#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
@@ -551,7 +559,7 @@
});
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var intelligenceView = new IntelligencePage();
ContextView.AddChidren(intelligenceView);
@@ -565,12 +573,6 @@
/// </summary>
public void ChoosePersonalCenter()
{
-#if DEBUG
- if(MainPage.NoLoginMode)
- {
- return;
- }
-#endif
if (MainPage.CurPageIndex == 3)
{
return;
@@ -582,7 +584,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
- #region 绉诲姩鍔ㄧ敾
+#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
@@ -641,7 +643,7 @@
});
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var personalCenterPage = new UI.PersonalCenterPage();
--
Gitblit v1.8.0