From 7167334c0e89dd84827d59e726123d14776e3a09 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 16 六月 2020 11:14:13 +0800
Subject: [PATCH] 2020-06-16-1
---
HDL_ON/UI/UI2/UserPage.cs | 84 +++++++++++++++++++++++++----------------
1 files changed, 51 insertions(+), 33 deletions(-)
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 4b00e51..ecaf192 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,25 +95,44 @@
public void LoadPage()
{
- bodyView = this;
- bodyView.BackgroundColor = CSS.CSS_Color.MainBackgroundColor;
- ContextView = new FrameLayout()
+ try
{
- Height = Application.GetRealHeight(618+30),
- 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()
+ 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();
+ }
+ catch (Exception ex)
{
- Y = Application.GetRealHeight(607),
- Height = Application.GetMinRealAverage(60),
- };
- bodyView.AddChidren(navigationView);
-
- InitBottomView();
-
- LoadEventList();
+ MainPage.Log($"UserPage error {ex.Message}");
+ }
}
/// <summary>
@@ -122,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",
};
@@ -159,7 +179,7 @@
Width = Application.GetMinRealAverage(22),
Height = Application.GetMinRealAverage(22),
UnSelectedImagePath = "Navigation/CollectionIcon.png",
- SelectedImagePath = "0Common/transparent.png",
+ SelectedImagePath = "Public/transparent.png",
IsSelected = true,
};
collectionView.AddChidren(btnCollectionIcon);
@@ -191,7 +211,7 @@
Width = Application.GetMinRealAverage(22),
Height = Application.GetMinRealAverage(22),
UnSelectedImagePath = "Navigation/ClassificationIcon.png",
- SelectedImagePath = "0Common/transparent.png",
+ SelectedImagePath = "Public/transparent.png",
};
classificationView.AddChidren(btnClassificationIcon);
btnClassificationText = new Button()
@@ -222,7 +242,7 @@
Width = Application.GetMinRealAverage(22),
Height = Application.GetMinRealAverage(22),
UnSelectedImagePath = "Navigation/IntellectualizationIcon.png",
- SelectedImagePath = "0Common/transparent.png",
+ SelectedImagePath = "Public/transparent.png",
};
intellectualizationView.AddChidren(btnIntellectualizationIcon);
btnIntellectualizationText = new Button()
@@ -254,7 +274,7 @@
Width = Application.GetMinRealAverage(22),
Height = Application.GetMinRealAverage(22),
UnSelectedImagePath = "Navigation/PersonalCenterIcon.png",
- SelectedImagePath = "0Common/transparent.png",
+ SelectedImagePath = "Public/transparent.png",
};
personalCenterView.AddChidren(btnPersonalCenterIcon);
@@ -271,8 +291,6 @@
};
personalCenterView.AddChidren(btnPersonalCenterText);
#endregion
-
-
var homePage = new HomePage();
ContextView.AddChidren(homePage);
@@ -294,7 +312,7 @@
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)
@@ -324,7 +342,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;
@@ -365,7 +383,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)
@@ -392,7 +410,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;
@@ -423,7 +441,7 @@
{ IsBackground = true }.Start();
#endregion
ContextView.RemoveAll();
- var classificaitionView = new UI.ClassificationPage();
+ var classificaitionView = new ClassificationPage();
ContextView.AddChidren(classificaitionView);
classificaitionView.LoadPage();
@@ -443,7 +461,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)
@@ -469,7 +487,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;
@@ -516,7 +534,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)
@@ -547,7 +565,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