From d72ca686a3e262693f8a6e45e747e8e8da43335b Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期二, 06 七月 2021 09:39:03 +0800
Subject: [PATCH] 2021-07-06 1.更新
---
HDL_ON/UI/UI2/UserPage.cs | 50 +++++++++++++++++++++-----------------------------
1 files changed, 21 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index fca117f..4397173 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,10 +121,10 @@
ContextView.AddChidren(homePage);
homePage.LoadPage();
- //鍒锋柊鍔熻兘鐘舵��
- DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
//娉ㄥ唽鎺ㄩ�両D
RegisteredPush();
+ //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+ HDLCommon.Current.CheckIfNeedForceUpdate();
}
catch (Exception ex)
@@ -309,7 +301,7 @@
/// </summary>
void ChooseCollection()
{
- if (CurAnimationEffect == 0)
+ if (MainPage.CurPageIndex == 0)
{
return;
}
@@ -337,10 +329,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;
}
@@ -379,7 +371,7 @@
{
btnNavigationSelectionIcon.SetRotation(0f);
});
- }) { IsBackground = true }.Start();
+ }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
#endregion
ContextView.RemoveAll();
var homePage = new HomePage();
@@ -391,7 +383,7 @@
/// </summary>
void ChooseClassification()
{
- if (CurAnimationEffect == 1)
+ if (MainPage.CurPageIndex == 1)
{
return;
}
@@ -413,15 +405,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;
}
@@ -468,7 +460,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
var classificaitionView = new ClassificationPage();
@@ -482,7 +474,7 @@
/// </summary>
void ChooseIntellectualization()
{
- if (CurAnimationEffect == 2)
+ if (MainPage.CurPageIndex == 2)
{
return;
}
@@ -503,15 +495,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;
}
@@ -558,7 +550,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
var intelligenceView = new IntelligencePage();
@@ -579,7 +571,7 @@
return;
}
#endif
- if (CurAnimationEffect == 3)
+ if (MainPage.CurPageIndex == 3)
{
return;
}
@@ -605,11 +597,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;
}
@@ -648,7 +640,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
--
Gitblit v1.8.0