From af4101b1d8461331bc3163b738fc75d4bf67c85c Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 28 七月 2020 17:47:44 +0800
Subject: [PATCH] 2020-07-28-1
---
HDL_ON/UI/UI2/UserPage.cs | 107 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 69 insertions(+), 38 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 88fd5a9..0d5291a 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using HDL_ON.Entity;
using Shared;
namespace HDL_ON.UI
@@ -94,31 +95,44 @@
public void LoadPage()
{
- bodyView = this;
- bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
- ContextView = new FrameLayout()
+ try
{
- Height = Application.GetRealHeight(618+20),
- BackgroundColor = CSS.CSS_Color.BackgroundColor,
- };
- bodyView.AddChidren(ContextView);
+ bodyView = this;
+ bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
+ ContextView = new FrameLayout()
+ {
+ Height = Application.GetRealHeight(618 + 20),
+ BackgroundColor = CSS.CSS_Color.BackgroundColor,
+ };
+ bodyView.AddChidren(ContextView);
- navigationView = new FrameLayout()
- {
- Y = Application.GetRealHeight(607),
- Height = Application.GetMinRealAverage(60),
- };
- bodyView.AddChidren(navigationView);
- if (MainPage.Increase)
- {
- //ContextView.Height = Application.GetRealHeight(618 + 20);
- navigationView.Y = Application.GetRealHeight(597+5);
- navigationView.Height = Application.GetRealHeight(70-5);
+ navigationView = new FrameLayout()
+ {
+ Y = Application.GetRealHeight(607),
+ Height = Application.GetMinRealAverage(60),
+ };
+ bodyView.AddChidren(navigationView);
+ if (MainPage.Increase)
+ {
+ //ContextView.Height = Application.GetRealHeight(618 + 20);
+ navigationView.Y = Application.GetRealHeight(597 + 5);
+ navigationView.Height = Application.GetRealHeight(70 - 5);
+ }
+ InitBottomView();
+
+ LoadEventList();
+
+ var homePage = new HomePage();
+ ContextView.AddChidren(homePage);
+ homePage.LoadPage();
+
+ //鍒锋柊鍔熻兘鐘舵��
+ DB_ResidenceData.residenceData.RefreshResidenceFunctionStatus();
}
-
- InitBottomView();
-
- LoadEventList();
+ catch (Exception ex)
+ {
+ MainPage.Log($"UserPage error {ex.Message}");
+ }
}
/// <summary>
@@ -128,9 +142,9 @@
{
navigationSelectionView = new FrameLayout()
{
- X = Application.GetMinRealAverage(0 - 94 * 3),
+ X = Application.GetRealWidth(0 - 94 * 3),
Y = Application.GetMinRealAverage(4),
- Width = Application.GetMinRealAverage(94 * 7),
+ Width = Application.GetRealWidth(94 * 7),
Height = Application.GetMinRealAverage(38),
BackgroundImagePath = "Navigation/UserPageNavbg.png",
};
@@ -283,13 +297,11 @@
homePage.LoadPage();
}
-
/// <summary>
/// 鍒囨崲鍒版敹钘忕晫闈�
/// </summary>
void ChooseCollection()
{
- CurAnimationEffect = 0;
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -298,7 +310,8 @@
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - collectionView.X + Application.GetMinRealAverage(94*3);
+ //绉诲姩璺濈
+ var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
int total = 10;
int sleepTime = 300;
if (distance > 200)
@@ -314,7 +327,13 @@
distance /= total;
new System.Threading.Thread(() => {
int index = 0;
- while (index < total+1) {
+ if(CurAnimationEffect == 0)
+ {
+ return;
+ }
+ CurAnimationEffect = 0;
+ while (index < total+1)
+ {
if (CurAnimationEffect != 0)
{
break;
@@ -328,7 +347,7 @@
}
else
{
- navigationSelectionView.X = collectionView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = collectionView.X - Application.GetRealWidth(94 * 3);
btnCollectionText.IsSelected = true;
btnCollectionIcon.IsSelected = true;
btnClassificationIcon.IsSelected = false;
@@ -360,7 +379,6 @@
/// </summary>
void ChooseClassification()
{
- CurAnimationEffect = 1;
btnCollectionIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
@@ -369,7 +387,7 @@
btnIntellectualizationText.IsSelected = false;
btnPersonalCenterText.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - classificationView.X + Application.GetMinRealAverage(94 * 3);
+ var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance > 100 || distance < -100)
@@ -380,6 +398,11 @@
distance /= total;
new System.Threading.Thread(() =>
{
+ if (CurAnimationEffect == 1)
+ {
+ return;
+ }
+ CurAnimationEffect = 1;
int index = 0;
while (index < total+1)
{
@@ -396,7 +419,7 @@
}
else
{
- navigationSelectionView.X = classificationView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = classificationView.X - Application.GetRealWidth(94 * 3);
btnClassificationText.IsSelected = true;
btnClassificationIcon.IsSelected = true;
btnCollectionIcon.IsSelected = false;
@@ -438,7 +461,6 @@
/// </summary>
void ChooseIntellectualization()
{
- CurAnimationEffect = 2;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -447,7 +469,7 @@
btnClassificationIcon.IsSelected = false;
btnPersonalCenterIcon.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetMinRealAverage(94 * 3);
+ var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance > 100 || distance < -100)
@@ -457,6 +479,11 @@
}
distance /= total;
new System.Threading.Thread(() => {
+ if (CurAnimationEffect == 2)
+ {
+ return;
+ }
+ CurAnimationEffect = 2;
int index = 0;
while (index < total+1)
{
@@ -473,7 +500,7 @@
}
else
{
- navigationSelectionView.X = intellectualizationView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = intellectualizationView.X - Application.GetRealWidth(94 * 3);
btnIntellectualizationText.IsSelected = true;
btnIntellectualizationIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
@@ -511,7 +538,6 @@
/// </summary>
void ChoosePersonalCenter()
{
- CurAnimationEffect = 3;
btnCollectionText.IsSelected = false;
btnClassificationText.IsSelected = false;
btnIntellectualizationText.IsSelected = false;
@@ -520,7 +546,7 @@
btnClassificationIcon.IsSelected = false;
btnIntellectualizationIcon.IsSelected = false;
#region 绉诲姩鍔ㄧ敾
- var distance = navigationSelectionView.X - personalCenterView.X + Application.GetMinRealAverage(94 * 3);
+ var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
int total = 10;
int sleepTime = 300;
if (distance < -200)
@@ -535,6 +561,11 @@
}
distance /= total;
new System.Threading.Thread(() => {
+ if (CurAnimationEffect == 3)
+ {
+ return;
+ }
+ CurAnimationEffect = 3;
int index = 0;
while (index < total+1)
{
@@ -551,7 +582,7 @@
}
else
{
- navigationSelectionView.X = personalCenterView.X - Application.GetMinRealAverage(94 * 3);
+ navigationSelectionView.X = personalCenterView.X - Application.GetRealWidth(94 * 3);
btnPersonalCenterText.IsSelected = true;
btnPersonalCenterIcon.IsSelected = true;
btnCollectionText.IsSelected = false;
--
Gitblit v1.8.0