From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/UserPage.cs | 105 ++++++++++++++++++++++++++++------------------------
1 files changed, 57 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 51a7e42..e8c5add 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -86,14 +86,6 @@
#endregion
#endregion
- /// <summary>
- /// 褰撳墠鍔ㄧ敾鏁堟灉
- /// 0:鏀惰棌
- /// 1:鍒嗙被
- /// 2:鏅鸿兘
- /// 3:涓汉
- /// </summary>
- int CurAnimationEffect = 0;
public void LoadPage()
{
@@ -129,10 +121,33 @@
ContextView.AddChidren(homePage);
homePage.LoadPage();
- //娉ㄥ唽鎺ㄩ�両D
- RegisteredPush();
+ if (!MainPage.NoLoginMode)
+ {
+ //娉ㄥ唽鎺ㄩ�両D
+ RegisteredPush();
+ }
//2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
HDLCommon.Current.CheckIfNeedForceUpdate();
+
+#if __Android__
+ //寮�鍚畾浣嶆湇鍔�
+ Shared.Application.StartGPSLocationService();
+
+ if (DB_ResidenceData.Instance.NeedTip) {
+ DB_ResidenceData.Instance.LastTipTime = DateTime.Now;
+ if (CN.Jpush.Android.Api.JPushInterface.IsNotificationEnabled(Shared.Application.Activity) != 1)
+ {
+ Action action = () =>
+ {
+ CN.Jpush.Android.Api.JPushInterface.GoToAppNotificationSettings(Shared.Application.Activity);
+ };
+ Shared.Application.RunOnMainThread(() =>
+ {
+ new HDL_ON.UI.ConfirmDialog().ShowDialog(StringId.Tip, StringId.Android_MessagePushTip, action);
+ });
+ }
+ }
+#endif
}
catch (Exception ex)
@@ -174,7 +189,7 @@
};
navigationView.AddChidren(NavigationSubView);
- #region 鏀惰棌鍖哄煙
+#region 鏀惰棌鍖哄煙
collectionView = new FrameLayout() {
Width = Application.GetRealWidth(94),
};
@@ -202,9 +217,9 @@
IsSelected = true,
};
collectionView.AddChidren(btnCollectionText);
- #endregion
+#endregion
- #region 鍒嗙被鍖哄煙
+#region 鍒嗙被鍖哄煙
classificationView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -233,9 +248,9 @@
TextAlignment = TextAlignment.Center,
};
classificationView.AddChidren(btnClassificationText);
- #endregion
+#endregion
- #region 鏅鸿兘鍖哄煙
+#region 鏅鸿兘鍖哄煙
intellectualizationView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -264,9 +279,9 @@
TextAlignment = TextAlignment.Center,
};
intellectualizationView.AddChidren(btnIntellectualizationText);
- #endregion
+#endregion
- #region 涓汉涓績
+#region 涓汉涓績
personalCenterView = new FrameLayout()
{
Width = Application.GetRealWidth(94),
@@ -297,7 +312,7 @@
TextAlignment = TextAlignment.Center,
};
personalCenterView.AddChidren(btnPersonalCenterText);
- #endregion
+#endregion
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -307,9 +322,9 @@
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
- void ChooseCollection(bool qiangzhishuaxin = false)
+ public void ChooseCollection()
{
- if (CurAnimationEffect == 0 || qiangzhishuaxin)
+ if (MainPage.CurPageIndex == 0)
{
return;
}
@@ -320,7 +335,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;
@@ -337,10 +352,10 @@
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- CurAnimationEffect = 0;
+ MainPage.CurPageIndex = 0;
while (index < total+1)
{
- if (CurAnimationEffect != 0)
+ if (MainPage.CurPageIndex != 0)
{
break;
}
@@ -380,7 +395,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
}) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -391,7 +406,7 @@
/// </summary>
void ChooseClassification()
{
- if (CurAnimationEffect == 1)
+ if (MainPage.CurPageIndex == 1)
{
return;
}
@@ -402,7 +417,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;
@@ -413,15 +428,15 @@
distance /= total;
new System.Threading.Thread(() =>
{
- if (CurAnimationEffect == 1)
+ if (MainPage.CurPageIndex == 1)
{
return;
}
- CurAnimationEffect = 1;
+ MainPage.CurPageIndex = 1;
int index = 0;
while (index < total+1)
{
- if (CurAnimationEffect != 1)
+ if (MainPage.CurPageIndex != 1)
{
break;
}
@@ -469,7 +484,7 @@
});
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var classificaitionView = new ClassificationPage();
ContextView.AddChidren(classificaitionView);
@@ -482,7 +497,7 @@
/// </summary>
void ChooseIntellectualization()
{
- if (CurAnimationEffect == 2)
+ if (MainPage.CurPageIndex == 2)
{
return;
}
@@ -493,7 +508,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;
@@ -503,15 +518,15 @@
}
distance /= total;
new System.Threading.Thread(() => {
- if (CurAnimationEffect == 2)
+ if (MainPage.CurPageIndex == 2)
{
return;
}
- CurAnimationEffect = 2;
+ MainPage.CurPageIndex = 2;
int index = 0;
while (index < total+1)
{
- if(CurAnimationEffect!=2)
+ if(MainPage.CurPageIndex!=2)
{
break;
}
@@ -559,7 +574,7 @@
});
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var intelligenceView = new IntelligencePage();
ContextView.AddChidren(intelligenceView);
@@ -571,15 +586,9 @@
/// <summary>
/// 鍒囨崲鍒颁釜浜轰腑蹇冪晫闈�
/// </summary>
- void ChoosePersonalCenter()
+ public void ChoosePersonalCenter()
{
-#if DEBUG
- if(MainPage.NoLoginMode)
- {
- return;
- }
-#endif
- if (CurAnimationEffect == 3)
+ if (MainPage.CurPageIndex == 3)
{
return;
}
@@ -590,7 +599,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;
@@ -605,11 +614,11 @@
}
distance /= total;
new System.Threading.Thread(() => {
- CurAnimationEffect = 3;
+ MainPage.CurPageIndex = 3;
int index = 0;
while (index < total+1)
{
- if (CurAnimationEffect != 3)
+ if (MainPage.CurPageIndex != 3)
{
break;
}
@@ -649,7 +658,7 @@
});
})
{ IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
- #endregion
+#endregion
ContextView.RemoveAll();
var personalCenterPage = new UI.PersonalCenterPage();
--
Gitblit v1.8.0