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 |  215 ++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 161 insertions(+), 54 deletions(-)

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index c15a939..ecaf192 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -1,16 +1,17 @@
 锘縰sing System;
+using HDL_ON.Entity;
 using Shared;
 
 namespace HDL_ON.UI
 {
-    public partial class UserPage : PageLayout
+    public partial class UserPage : FrameLayout
     {
 
         #region 鎺т欢鍒楄〃
         /// <summary>
         /// 褰撳墠鍖哄煙
         /// </summary>
-        static PageLayout bodyView;
+        FrameLayout bodyView;
         /// <summary>
         /// 鍐呭鍖哄煙
         /// </summary>
@@ -83,38 +84,87 @@
         #endregion
         #endregion
 
+        /// <summary>
+        /// 褰撳墠鍔ㄧ敾鏁堟灉
+        /// 0:鏀惰棌
+        /// 1:鍒嗙被
+        /// 2:鏅鸿兘
+        /// 3:涓汉
+        /// </summary>
+        int CurAnimationEffect = 0;
+
         public void LoadPage()
         {
-            bodyView = this;
-            ContextView = new FrameLayout()
+            try
             {
-                Height = Application.GetRealHeight(618),
-                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.GetRealHeight(60),
-            };
-            bodyView.AddChidren(navigationView);
-
-            InitBottomView();
-
-            LoadEventList();
+                MainPage.Log($"UserPage error {ex.Message}");
+            }
         }
 
         /// <summary>
         /// 鍒濆鍖栧簳閮ㄥ尯鍩�
         /// </summary>
         void InitBottomView()
-        { 
+        {
+            navigationSelectionView = new FrameLayout()
+            {
+                X = Application.GetRealWidth(0 - 94 * 3),
+                Y = Application.GetMinRealAverage(4),
+                Width = Application.GetRealWidth(94 * 7),
+                Height = Application.GetMinRealAverage(38),
+                BackgroundImagePath = "Navigation/UserPageNavbg.png",
+            };
+            navigationView.AddChidren(navigationSelectionView);
+
+            btnNavigationSelectionIcon = new Button()
+            {
+                Gravity = Gravity.CenterHorizontal,
+                Y = Application.GetMinRealAverage(6),
+                Width = Application.GetMinRealAverage(22),
+                Height = Application.GetMinRealAverage(22),
+                UnSelectedImagePath = "Navigation/CollectionIconOn.png",
+            };
+            navigationSelectionView.AddChidren(btnNavigationSelectionIcon);
+
             NavigationSubView = new FrameLayout()
             {
-                Y = Application.GetRealHeight(11),
+                Y = Application.GetMinRealAverage(11),
                 Height = Application.GetRealHeight(49),
-                BackgroundColor = CSS.CSS_Color.MainBackgroundColor,
+                //BackgroundColor=0xFF00F0F0
             };
             navigationView.AddChidren(NavigationSubView);
 
@@ -129,6 +179,8 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/CollectionIcon.png",
+                SelectedImagePath = "Public/transparent.png",
+                IsSelected = true,
             };
             collectionView.AddChidren(btnCollectionIcon);
             btnCollectionText = new Button()
@@ -139,7 +191,7 @@
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextColor =CSS.CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Collection,
+                TextID = StringId.Collection,
                 TextAlignment = TextAlignment.Center,
             };
             collectionView.AddChidren(btnCollectionText);
@@ -159,6 +211,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/ClassificationIcon.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             classificationView.AddChidren(btnClassificationIcon);
             btnClassificationText = new Button()
@@ -169,7 +222,7 @@
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Classification,
+                TextID = StringId.Classification,
                 TextAlignment = TextAlignment.Center,
             };
             classificationView.AddChidren(btnClassificationText);
@@ -189,6 +242,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/IntellectualizationIcon.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             intellectualizationView.AddChidren(btnIntellectualizationIcon);
             btnIntellectualizationText = new Button()
@@ -199,7 +253,7 @@
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Intellectualization,
+                TextID = StringId.Intellectualization,
                 TextAlignment = TextAlignment.Center,
             };
             intellectualizationView.AddChidren(btnIntellectualizationText);
@@ -220,7 +274,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/PersonalCenterIcon.png",
-                SelectedImagePath = "Navigation/PersonalCenterIconOn.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             personalCenterView.AddChidren(btnPersonalCenterIcon);
 
@@ -232,31 +286,15 @@
                 TextColor = CSS.CSS_Color.FirstLevelTitleColor,
                 SelectedTextColor = CSS.CSS_Color.MainColor,
                 TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
-                TextID = InternationalizationString.Personal,
+                TextID = StringId.Personal,
                 TextAlignment = TextAlignment.Center,
             };
             personalCenterView.AddChidren(btnPersonalCenterText);
             #endregion
 
-
-            navigationSelectionView = new FrameLayout()
-            {
-                X = Application.GetRealWidth(0),
-                Width = Application.GetRealWidth(94),
-                Height = Application.GetRealHeight(40),
-                BackgroundImagePath = "Navigation/UserPageNavbg.png",
-            };
-            navigationView.AddChidren(navigationSelectionView);
-
-            btnNavigationSelectionIcon = new Button()
-            {
-                Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetRealHeight(6),
-                Width = Application.GetMinRealAverage(22),
-                Height = Application.GetMinRealAverage(22),
-                UnSelectedImagePath = "Navigation/CollectionIconOn.png",
-            };
-            navigationSelectionView.AddChidren(btnNavigationSelectionIcon);
+            var homePage = new HomePage();
+            ContextView.AddChidren(homePage);
+            homePage.LoadPage();
         }
 
 
@@ -265,12 +303,16 @@
         /// </summary>
         void ChooseCollection()
         {
+            CurAnimationEffect = 0;
+            btnClassificationIcon.IsSelected = false;
+            btnIntellectualizationIcon.IsSelected = false;
+            btnPersonalCenterIcon.IsSelected = false;
             btnCollectionText.IsSelected = false;
             btnClassificationText.IsSelected = false;
             btnIntellectualizationText.IsSelected = false;
             btnPersonalCenterText.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - collectionView.X;
+            var distance = navigationSelectionView.X - collectionView.X + Application.GetRealWidth(94*3);
             int total = 10;
             int sleepTime = 300;
             if (distance > 200)
@@ -287,6 +329,10 @@
             new System.Threading.Thread(() => {
                 int index = 0;
                 while (index < total+1) {
+                    if (CurAnimationEffect != 0)
+                    {
+                        break;
+                    }
                     Application.RunOnMainThread(() =>
                     {
                         //绉诲姩
@@ -296,8 +342,15 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = collectionView.X;
+                            navigationSelectionView.X = collectionView.X - Application.GetRealWidth(94 * 3);
                             btnCollectionText.IsSelected = true;
+                            btnCollectionIcon.IsSelected = true;
+                            btnClassificationIcon.IsSelected = false;
+                            btnIntellectualizationIcon.IsSelected = false;
+                            btnPersonalCenterIcon.IsSelected = false;
+                            btnClassificationText.IsSelected = false;
+                            btnIntellectualizationText.IsSelected = false;
+                            btnPersonalCenterText.IsSelected = false;
                         }
                         if (index == (total/2))
                         {
@@ -311,18 +364,26 @@
                 }
             }) { IsBackground = true }.Start();
             #endregion
+            ContextView.RemoveAll();
+            var homePage = new HomePage();
+            ContextView.AddChidren(homePage);
+            homePage.LoadPage();
         }
         /// <summary>
         /// 鍒囨崲鍒板垎绫荤晫闈�
         /// </summary>
         void ChooseClassification()
         {
+            CurAnimationEffect = 1;
+            btnCollectionIcon.IsSelected = false;
+            btnIntellectualizationIcon.IsSelected = false;
+            btnPersonalCenterIcon.IsSelected = false;
             btnCollectionText.IsSelected = false;
             btnClassificationText.IsSelected = false;
             btnIntellectualizationText.IsSelected = false;
             btnPersonalCenterText.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - classificationView.X;
+            var distance = navigationSelectionView.X - classificationView.X + Application.GetRealWidth(94 * 3);
             int total = 10;
             int sleepTime = 300;
             if (distance > 100 || distance < -100)
@@ -336,6 +397,10 @@
                 int index = 0;
                 while (index < total+1)
                 {
+                    if (CurAnimationEffect != 1)
+                    {
+                        break;
+                    }
                     Application.RunOnMainThread(() =>
                     {
                         //绉诲姩
@@ -345,8 +410,15 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = classificationView.X;
+                            navigationSelectionView.X = classificationView.X - Application.GetRealWidth(94 * 3);
                             btnClassificationText.IsSelected = true;
+                            btnClassificationIcon.IsSelected = true;
+                            btnCollectionIcon.IsSelected = false;
+                            btnIntellectualizationIcon.IsSelected = false;
+                            btnPersonalCenterIcon.IsSelected = false;
+                            btnCollectionText.IsSelected = false;
+                            btnIntellectualizationText.IsSelected = false;
+                            btnPersonalCenterText.IsSelected = false;
                         }
                         if (index == (total / 2 ))
                         {
@@ -368,7 +440,10 @@
             })
             { IsBackground = true }.Start();
             #endregion
-
+            ContextView.RemoveAll();
+            var classificaitionView = new ClassificationPage();
+            ContextView.AddChidren(classificaitionView);
+            classificaitionView.LoadPage();
 
 
         }
@@ -377,12 +452,16 @@
         /// </summary>
         void ChooseIntellectualization()
         {
+            CurAnimationEffect = 2;
             btnCollectionText.IsSelected = false;
             btnClassificationText.IsSelected = false;
             btnIntellectualizationText.IsSelected = false;
             btnPersonalCenterText.IsSelected = false;
+            btnCollectionIcon.IsSelected = false;
+            btnClassificationIcon.IsSelected = false;
+            btnPersonalCenterIcon.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - intellectualizationView.X;
+            var distance = navigationSelectionView.X - intellectualizationView.X + Application.GetRealWidth(94 * 3);
             int total = 10;
             int sleepTime = 300;
             if (distance > 100 || distance < -100)
@@ -395,6 +474,10 @@
                 int index = 0;
                 while (index < total+1)
                 {
+                    if(CurAnimationEffect!=2)
+                    {
+                        break;
+                    }
                     Application.RunOnMainThread(() =>
                     {
                         //绉诲姩
@@ -404,8 +487,15 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = intellectualizationView.X;
+                            navigationSelectionView.X = intellectualizationView.X - Application.GetRealWidth(94 * 3);
                             btnIntellectualizationText.IsSelected = true;
+                            btnIntellectualizationIcon.IsSelected = true;
+                            btnCollectionText.IsSelected = false;
+                            btnClassificationText.IsSelected = false;
+                            btnPersonalCenterText.IsSelected = false;
+                            btnCollectionIcon.IsSelected = false;
+                            btnClassificationIcon.IsSelected = false;
+                            btnPersonalCenterIcon.IsSelected = false;
                         }
                         if (index == (total / 2 ))
                         {
@@ -427,6 +517,7 @@
             })
             { IsBackground = true }.Start();
             #endregion
+            ContextView.RemoveAll();
         }
 
         /// <summary>
@@ -434,12 +525,16 @@
         /// </summary>
         void ChoosePersonalCenter()
         {
+            CurAnimationEffect = 3;
             btnCollectionText.IsSelected = false;
             btnClassificationText.IsSelected = false;
             btnIntellectualizationText.IsSelected = false;
             btnPersonalCenterText.IsSelected = false;
+            btnCollectionIcon.IsSelected = false;
+            btnClassificationIcon.IsSelected = false;
+            btnIntellectualizationIcon.IsSelected = false;
             #region 绉诲姩鍔ㄧ敾
-            var distance = navigationSelectionView.X - personalCenterView.X;
+            var distance = navigationSelectionView.X - personalCenterView.X + Application.GetRealWidth(94 * 3);
             int total = 10;
             int sleepTime = 300;
             if (distance < -200)
@@ -457,6 +552,10 @@
                 int index = 0;
                 while (index < total+1)
                 {
+                    if (CurAnimationEffect != 3)
+                    {
+                        break;
+                    }
                     Application.RunOnMainThread(() =>
                     {
                         //绉诲姩
@@ -466,8 +565,15 @@
                         }
                         else
                         {
-                            navigationSelectionView.X = personalCenterView.X;
+                            navigationSelectionView.X = personalCenterView.X - Application.GetRealWidth(94 * 3);
                             btnPersonalCenterText.IsSelected = true;
+                            btnPersonalCenterIcon.IsSelected = true;
+                            btnCollectionText.IsSelected = false;
+                            btnClassificationText.IsSelected = false;
+                            btnIntellectualizationText.IsSelected = false;
+                            btnCollectionIcon.IsSelected = false;
+                            btnClassificationIcon.IsSelected = false;
+                            btnIntellectualizationIcon.IsSelected = false;
                         }
                         if (index == (total / 2 ))
                         {
@@ -484,7 +590,8 @@
             #endregion
 
 
-            var personalCenterPage = new UI2.PersonalCenterPage();
+            ContextView.RemoveAll();
+            var personalCenterPage = new UI.PersonalCenterPage();
             ContextView.AddChidren(personalCenterPage);
             personalCenterPage.LoadView();
         }

--
Gitblit v1.8.0