From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/UI2/UserPage.cs | 55 ++++++++++++++++++++++---------------------------------
1 files changed, 22 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 51e922d..2da462c 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -8,7 +8,6 @@
{
public partial class UserPage : FrameLayout
{
-
#region 鎺т欢鍒楄〃
/// <summary>
/// 褰撳墠鍖哄煙
@@ -18,6 +17,7 @@
/// 鍐呭鍖哄煙
/// </summary>
FrameLayout ContextView;
+ //VerticalRefreshLayout ContextView;
/// <summary>
/// 瀵艰埅鏍忓尯鍩�
/// </summary>
@@ -86,14 +86,6 @@
#endregion
#endregion
- /// <summary>
- /// 褰撳墠鍔ㄧ敾鏁堟灉
- /// 0:鏀惰棌
- /// 1:鍒嗙被
- /// 2:鏅鸿兘
- /// 3:涓汉
- /// </summary>
- int CurAnimationEffect = 0;
public void LoadPage()
{
@@ -129,8 +121,11 @@
ContextView.AddChidren(homePage);
homePage.LoadPage();
- //娉ㄥ唽鎺ㄩ�両D
- RegisteredPush();
+ if (!MainPage.NoLoginMode)
+ {
+ //娉ㄥ唽鎺ㄩ�両D
+ RegisteredPush();
+ }
//2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
HDLCommon.Current.CheckIfNeedForceUpdate();
@@ -307,9 +302,9 @@
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
- void ChooseCollection()
+ public void ChooseCollection()
{
- if (CurAnimationEffect == 0)
+ if (MainPage.CurPageIndex == 0)
{
return;
}
@@ -337,10 +332,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;
}
@@ -391,7 +386,7 @@
/// </summary>
void ChooseClassification()
{
- if (CurAnimationEffect == 1)
+ if (MainPage.CurPageIndex == 1)
{
return;
}
@@ -413,15 +408,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;
}
@@ -482,7 +477,7 @@
/// </summary>
void ChooseIntellectualization()
{
- if (CurAnimationEffect == 2)
+ if (MainPage.CurPageIndex == 2)
{
return;
}
@@ -503,15 +498,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;
}
@@ -571,15 +566,9 @@
/// <summary>
/// 鍒囨崲鍒颁釜浜轰腑蹇冪晫闈�
/// </summary>
- void ChoosePersonalCenter()
+ public void ChoosePersonalCenter()
{
-#if DEBUG
- if(MainPage.NoLoginMode)
- {
- return;
- }
-#endif
- if (CurAnimationEffect == 3)
+ if (MainPage.CurPageIndex == 3)
{
return;
}
@@ -605,11 +594,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;
}
--
Gitblit v1.8.0