From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/UserPage.cs | 73 +++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 30 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 4cc9c29..4397173 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -2,12 +2,12 @@
using HDL_ON.Entity;
using Shared;
using HDL_ON.UI.CSS;
+using HDL_ON.DAL.Server;
namespace HDL_ON.UI
{
public partial class UserPage : FrameLayout
{
-
#region 鎺т欢鍒楄〃
/// <summary>
/// 褰撳墠鍖哄煙
@@ -17,6 +17,7 @@
/// 鍐呭鍖哄煙
/// </summary>
FrameLayout ContextView;
+ //VerticalRefreshLayout ContextView;
/// <summary>
/// 瀵艰埅鏍忓尯鍩�
/// </summary>
@@ -85,14 +86,6 @@
#endregion
#endregion
- /// <summary>
- /// 褰撳墠鍔ㄧ敾鏁堟灉
- /// 0:鏀惰棌
- /// 1:鍒嗙被
- /// 2:鏅鸿兘
- /// 3:涓汉
- /// </summary>
- int CurAnimationEffect = 0;
public void LoadPage()
{
@@ -128,8 +121,11 @@
ContextView.AddChidren(homePage);
homePage.LoadPage();
- //鍒锋柊鍔熻兘鐘舵��
- DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
+ //娉ㄥ唽鎺ㄩ�両D
+ RegisteredPush();
+ //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+ HDLCommon.Current.CheckIfNeedForceUpdate();
+
}
catch (Exception ex)
{
@@ -305,7 +301,7 @@
/// </summary>
void ChooseCollection()
{
- if (CurAnimationEffect == 0)
+ if (MainPage.CurPageIndex == 0)
{
return;
}
@@ -333,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;
}
@@ -358,6 +354,7 @@
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
}
if (index == (total/2))
{
@@ -374,7 +371,7 @@
{
btnNavigationSelectionIcon.SetRotation(0f);
});
- }) { IsBackground = true }.Start();
+ }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
#endregion
ContextView.RemoveAll();
var homePage = new HomePage();
@@ -386,7 +383,7 @@
/// </summary>
void ChooseClassification()
{
- if (CurAnimationEffect == 1)
+ if (MainPage.CurPageIndex == 1)
{
return;
}
@@ -408,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;
}
@@ -438,6 +435,7 @@
btnCollectionText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
}
if (index == (total / 2 ))
{
@@ -462,7 +460,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
var classificaitionView = new ClassificationPage();
@@ -476,7 +474,7 @@
/// </summary>
void ChooseIntellectualization()
{
- if (CurAnimationEffect == 2)
+ if (MainPage.CurPageIndex == 2)
{
return;
}
@@ -497,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;
}
@@ -527,6 +525,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
}
if (index == (total / 2 ))
{
@@ -551,9 +550,14 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
+ var intelligenceView = new IntelligencePage();
+ ContextView.AddChidren(intelligenceView);
+ intelligenceView.LoadPage();
+
+
}
/// <summary>
@@ -562,12 +566,12 @@
void ChoosePersonalCenter()
{
#if DEBUG
- if(MainPage.LocalMode)
+ if(MainPage.NoLoginMode)
{
return;
}
#endif
- if (CurAnimationEffect == 3)
+ if (MainPage.CurPageIndex == 3)
{
return;
}
@@ -593,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;
}
@@ -619,6 +623,7 @@
btnCollectionIcon.IsSelected = false;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
}
if (index == (total / 2 ))
{
@@ -635,7 +640,7 @@
btnNavigationSelectionIcon.SetRotation(0f);
});
})
- { IsBackground = true }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
#endregion
ContextView.RemoveAll();
@@ -643,5 +648,13 @@
ContextView.AddChidren(personalCenterPage);
personalCenterPage.LoadView();
}
+
+ /// <summary>
+ /// 娉ㄥ唽鎺ㄩ��
+ /// </summary>
+ void RegisteredPush()
+ {
+ new HttpServerRequest().RegisteredPush();
+ }
}
}
--
Gitblit v1.8.0