From 6ad070dbf9a88bb95a6eb38ed40e91959ca56115 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 10 一月 2023 10:18:25 +0800
Subject: [PATCH] 空调控制界面优化
---
HDL_ON/UI/UI2/UserPage.cs | 111 +++++++++++++++++++++++++++----------------------------
1 files changed, 54 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 506cee4..6a3074f 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -125,10 +125,9 @@
{
//娉ㄥ唽鎺ㄩ�両D
RegisteredPush();
+ //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
+ HDLCommon.Current.CheckIfNeedForceUpdate();
}
- //2020-12-07 澧炲姞鐗堟湰妫�娴嬫洿鏂版柟娉�
- HDLCommon.Current.CheckIfNeedForceUpdate();
-
#if __Android__
//寮�鍚畾浣嶆湇鍔�
try
@@ -333,6 +332,7 @@
{
return;
}
+ MainPage.CurPageIndex = 0;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -344,10 +344,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)
@@ -357,7 +355,6 @@
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- MainPage.CurPageIndex = 0;
while (index < total+1)
{
if (MainPage.CurPageIndex != 0)
@@ -371,11 +368,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;
@@ -384,27 +384,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>
/// 鍒囨崲鍒板垎绫荤晫闈�
@@ -415,6 +415,7 @@
{
return;
}
+ MainPage.CurPageIndex = 1;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -425,7 +426,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;
@@ -433,11 +433,6 @@
distance /= total;
new System.Threading.Thread(() =>
{
- if (MainPage.CurPageIndex == 1)
- {
- return;
- }
- MainPage.CurPageIndex = 1;
int index = 0;
while (index < total+1)
{
@@ -452,11 +447,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;
@@ -465,9 +463,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)
@@ -479,21 +477,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 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();
}
@@ -506,6 +504,7 @@
{
return;
}
+ MainPage.CurPageIndex = 2;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -516,18 +515,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)
{
@@ -542,11 +535,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;
@@ -555,9 +551,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)
@@ -569,21 +565,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();
}
@@ -597,6 +593,7 @@
{
return;
}
+ MainPage.CurPageIndex = 3;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -607,10 +604,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)
@@ -619,7 +614,6 @@
}
distance /= total;
new System.Threading.Thread(() => {
- MainPage.CurPageIndex = 3;
int index = 0;
while (index < total+1)
{
@@ -634,11 +628,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;
@@ -647,28 +644,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