From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/UserPage.cs | 135 +++++++++++++++++++++++---------------------
1 files changed, 70 insertions(+), 65 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index e8c5add..28e34a8 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -91,7 +91,7 @@
{
try
{
- bodyView = this;
+ bodyView = this;//1
bodyView.BackgroundColor = CSS_Color.MainBackgroundColor;
ContextView = new FrameLayout()
{
@@ -104,12 +104,10 @@
{
Y = Application.GetRealHeight(607),
Height = Application.GetMinRealAverage(60),
- //BackgroundColor = CSS_Color.BackgroundColor
};
bodyView.AddChidren(navigationView);
if (MainPage.Increase)
{
- //ContextView.Height = Application.GetRealHeight(618 + 20);
navigationView.Y = Application.GetRealHeight(597 + 5);
navigationView.Height = Application.GetRealHeight(70 - 5);
}
@@ -117,22 +115,30 @@
LoadEventList();
- var homePage = new HomePage();
- ContextView.AddChidren(homePage);
- homePage.LoadPage();
+ //var homePage = new HomePage();
+ //ContextView.AddChidren(homePage);
+ //homePage.LoadPage();
if (!MainPage.NoLoginMode)
{
//娉ㄥ唽鎺ㄩ�両D
RegisteredPush();
+ //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+ HDLCommon.Current.CheckIfNeedForceUpdate();
}
- //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
- HDLCommon.Current.CheckIfNeedForceUpdate();
-
#if __Android__
//寮�鍚畾浣嶆湇鍔�
- Shared.Application.StartGPSLocationService();
-
+ try
+ {
+ if (DB_ResidenceData.Instance.CheckGPS_IsFirst)
+ {
+ DB_ResidenceData.Instance.CheckGPS_IsFirst = false;
+ Shared.Application.StartGPSLocationService();
+ }
+ }catch(Exception ex)
+ {
+ MainPage.Log("寮�鍚畾浣嶆湇鍔″紓甯�:" + ex.Message);
+ }
if (DB_ResidenceData.Instance.NeedTip) {
DB_ResidenceData.Instance.LastTipTime = DateTime.Now;
if (CN.Jpush.Android.Api.JPushInterface.IsNotificationEnabled(Shared.Application.Activity) != 1)
@@ -328,6 +334,7 @@
{
return;
}
+ MainPage.CurPageIndex = 0;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -339,10 +346,8 @@
//绉诲姩璺濈
var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
- int sleepTime = 300;
if (distance > 200)
{
- sleepTime = 400;
total = 30;
}
else if (distance > 100)
@@ -352,7 +357,6 @@
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- MainPage.CurPageIndex = 0;
while (index < total+1)
{
if (MainPage.CurPageIndex != 0)
@@ -366,11 +370,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
+ }
else
{
navigationSelectionView.X = collectionView.X - Application.GetRealWidth(94 * 3);
btnCollectionText.IsSelected = true;
- btnCollectionIcon.IsSelected = true;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -379,27 +386,27 @@
btnPersonalCenterText.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
}
- if (index == (total/2))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
+ btnCollectionIcon.IsSelected = true;
}
//鏃嬭浆
btnNavigationSelectionIcon.SetRotation(-36f * index);
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var homePage = new HomePage();
+ ContextView.AddChidren(homePage);
+ homePage.LoadPage();
});
- }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Highest}.Start();
+ }) { IsBackground = true ,Priority = System.Threading.ThreadPriority.Lowest}.Start();
#endregion
- ContextView.RemoveAll();
- var homePage = new HomePage();
- ContextView.AddChidren(homePage);
- homePage.LoadPage();
}
/// <summary>
/// 鍒囨崲鍒板垎绫荤晫闈�
@@ -410,6 +417,7 @@
{
return;
}
+ MainPage.CurPageIndex = 1;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -420,7 +428,6 @@
#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
- int sleepTime = 300;
if (distance > 100 || distance < -100)
{
total = 20;
@@ -428,11 +435,6 @@
distance /= total;
new System.Threading.Thread(() =>
{
- if (MainPage.CurPageIndex == 1)
- {
- return;
- }
- MainPage.CurPageIndex = 1;
int index = 0;
while (index < total+1)
{
@@ -447,11 +449,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
+ }
else
{
navigationSelectionView.X = classificationView.X - Application.GetRealWidth(94 * 3);
btnClassificationText.IsSelected = true;
- btnClassificationIcon.IsSelected = true;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -460,9 +465,9 @@
btnPersonalCenterText.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
}
- if (index == (total / 2 ))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
+ btnClassificationIcon.IsSelected = true;
}
//鏃嬭浆
if (distance < 0)
@@ -474,21 +479,22 @@
btnNavigationSelectionIcon.SetRotation(-36f * index);
}
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var classificaitionView = new ClassificationPage();
+ ContextView.AddChidren(classificaitionView);
+ classificaitionView.LoadPage();
+
});
})
- { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
#endregion
- ContextView.RemoveAll();
- var classificaitionView = new ClassificationPage();
- ContextView.AddChidren(classificaitionView);
- classificaitionView.LoadPage();
}
@@ -501,6 +507,7 @@
{
return;
}
+ MainPage.CurPageIndex = 2;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -511,18 +518,12 @@
#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
- int sleepTime = 300;
if (distance > 100 || distance < -100)
{
total = 20;
}
distance /= total;
new System.Threading.Thread(() => {
- if (MainPage.CurPageIndex == 2)
- {
- return;
- }
- MainPage.CurPageIndex = 2;
int index = 0;
while (index < total+1)
{
@@ -537,11 +538,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
+ }
else
{
navigationSelectionView.X = intellectualizationView.X - Application.GetRealWidth(94 * 3);
btnIntellectualizationText.IsSelected = true;
- btnIntellectualizationIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
@@ -550,9 +554,9 @@
btnPersonalCenterIcon.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
}
- if (index == (total / 2 ))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
+ btnIntellectualizationIcon.IsSelected = true;
}
//鏃嬭浆
if (distance < 0)
@@ -564,21 +568,21 @@
btnNavigationSelectionIcon.SetRotation(-36f * index);
}
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var intelligenceView = new IntelligencePage();
+ ContextView.AddChidren(intelligenceView);
+ intelligenceView.LoadPage();
});
})
- { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
#endregion
- ContextView.RemoveAll();
- var intelligenceView = new IntelligencePage();
- ContextView.AddChidren(intelligenceView);
- intelligenceView.LoadPage();
}
@@ -592,6 +596,7 @@
{
return;
}
+ MainPage.CurPageIndex = 3;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -602,10 +607,8 @@
#region 绉诲姩鍔ㄧ敾
var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
int total = 10;
- int sleepTime = 300;
if (distance < -200)
{
- sleepTime = 400;
total = 30;
}
else if (distance < -100)
@@ -614,7 +617,6 @@
}
distance /= total;
new System.Threading.Thread(() => {
- MainPage.CurPageIndex = 3;
int index = 0;
while (index < total+1)
{
@@ -629,11 +631,14 @@
{
navigationSelectionView.X -= distance;
}
+ else if (index == (total / 2))
+ {
+ btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
+ }
else
{
navigationSelectionView.X = personalCenterView.X - Application.GetRealWidth(94 * 3);
btnPersonalCenterText.IsSelected = true;
- btnPersonalCenterIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -642,28 +647,28 @@
btnIntellectualizationIcon.IsSelected = false;
btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
}
- if (index == (total / 2 ))
+ if (index < (total - 2))
{
- btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
+ btnPersonalCenterIcon.IsSelected = true;
}
//鏃嬭浆
btnNavigationSelectionIcon.SetRotation(36f * index);
});
- System.Threading.Thread.Sleep(sleepTime / total);
+ System.Threading.Thread.Sleep(5);
index++;
}
Application.RunOnMainThread(() =>
{
btnNavigationSelectionIcon.SetRotation(0f);
+ ContextView.RemoveAll();
+ var personalCenterPage = new UI.PersonalCenterPage();
+ ContextView.AddChidren(personalCenterPage);
+ personalCenterPage.LoadView();
});
})
- { IsBackground = true, Priority = System.Threading.ThreadPriority.Highest }.Start();
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.Lowest }.Start();
#endregion
- ContextView.RemoveAll();
- var personalCenterPage = new UI.PersonalCenterPage();
- ContextView.AddChidren(personalCenterPage);
- personalCenterPage.LoadView();
}
/// <summary>
--
Gitblit v1.8.0