From df8d4ab0ef17a7fab5dea9c47bbd9f4d4a2a40b0 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 15 三月 2021 14:55:49 +0800
Subject: [PATCH] 合并前上传一个版本
---
HDL_ON/UI/UI2/UserPage.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index fca117f..51a7e42 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>
@@ -129,10 +129,10 @@
ContextView.AddChidren(homePage);
homePage.LoadPage();
- //鍒锋柊鍔熻兘鐘舵��
- DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
//娉ㄥ唽鎺ㄩ�両D
RegisteredPush();
+ //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+ HDLCommon.Current.CheckIfNeedForceUpdate();
}
catch (Exception ex)
@@ -307,9 +307,9 @@
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
- void ChooseCollection()
+ void ChooseCollection(bool qiangzhishuaxin = false)
{
- if (CurAnimationEffect == 0)
+ if (CurAnimationEffect == 0 || qiangzhishuaxin)
{
return;
}
@@ -379,7 +379,7 @@
{
btnNavigationSelectionIcon.SetRotation(0f);
});
- }) { IsBackground = true }.Start();
+ }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
#endregion
ContextView.RemoveAll();
var homePage = new HomePage();
@@ -468,7 +468,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
var classificaitionView = new ClassificationPage();
@@ -558,7 +558,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
var intelligenceView = new IntelligencePage();
@@ -648,7 +648,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
--
Gitblit v1.8.0