From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112

---
 HDL_ON/UI/UI2/UserPage.cs |  206 +++++++++++++++++++++++++++++++++++----------------
 1 files changed, 140 insertions(+), 66 deletions(-)

diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 4b00e51..61db3e3 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -1,5 +1,7 @@
 锘縰sing System;
+using HDL_ON.Entity;
 using Shared;
+using HDL_ON.UI.CSS;
 
 namespace HDL_ON.UI
 {
@@ -94,25 +96,45 @@
 
         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_Color.MainBackgroundColor;
+                ContextView = new FrameLayout()
+                {
+                    Height = Application.GetRealHeight(618 + 17),//瀵艰埅鏍忓簳閮ㄧ晫闄�
+                    BackgroundColor = CSS_Color.BackgroundColor,
+                };
+                bodyView.AddChidren(ContextView);
 
-            navigationView = new FrameLayout()
+                navigationView = new FrameLayout()
+                {
+                    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);
+                }
+                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,10 +144,10 @@
         {
             navigationSelectionView = new FrameLayout()
             {
-                X = Application.GetMinRealAverage(0 - 94 * 3),
+                X = Application.GetRealWidth(0 - 94 * 3),
                 Y = Application.GetMinRealAverage(4),
-                Width = Application.GetMinRealAverage(94 * 7),
-                Height = Application.GetMinRealAverage(38),
+                Width = Application.GetRealWidth(94 * 7),
+                Height = Application.GetRealWidth(38),
                 BackgroundImagePath = "Navigation/UserPageNavbg.png",
             };
             navigationView.AddChidren(navigationSelectionView);
@@ -133,10 +155,10 @@
             btnNavigationSelectionIcon = new Button()
             {
                 Gravity = Gravity.CenterHorizontal,
-                Y = Application.GetMinRealAverage(6),
-                Width = Application.GetMinRealAverage(22),
-                Height = Application.GetMinRealAverage(22),
-                UnSelectedImagePath = "Navigation/CollectionIconOn.png",
+                Y = Application.GetRealWidth(6),
+                Width = Application.GetRealWidth(22),
+                Height = Application.GetRealWidth(22),
+                UnSelectedImagePath = "Navigation/HomePageIconOn.png",
             };
             navigationSelectionView.AddChidren(btnNavigationSelectionIcon);
 
@@ -158,8 +180,8 @@
                 Y = Application.GetRealHeight(5),
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
-                UnSelectedImagePath = "Navigation/CollectionIcon.png",
-                SelectedImagePath = "0Common/transparent.png",
+                UnSelectedImagePath = "Navigation/HomePageIcon.png",
+                SelectedImagePath = "Public/transparent.png",
                 IsSelected = true,
             };
             collectionView.AddChidren(btnCollectionIcon);
@@ -168,11 +190,12 @@
                 Gravity = Gravity.CenterHorizontal,
                 Y = btnCollectionIcon.Bottom,
                 Height = Application.GetRealHeight(16),
-                SelectedTextColor = CSS.CSS_Color.MainColor,
-                TextColor =CSS.CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextColor =CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                 TextID = StringId.Collection,
                 TextAlignment = TextAlignment.Center,
+                IsSelected = true,
             };
             collectionView.AddChidren(btnCollectionText);
             #endregion
@@ -191,7 +214,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()
@@ -199,9 +222,9 @@
                 Gravity = Gravity.CenterHorizontal,
                 Y = btnCollectionIcon.Bottom,
                 Height = Application.GetRealHeight(16),
-                SelectedTextColor = CSS.CSS_Color.MainColor,
-                TextColor = CSS.CSS_Color.FirstLevelTitleColor,
-                TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                 TextID = StringId.Classification,
                 TextAlignment = TextAlignment.Center,
             };
@@ -222,7 +245,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()
@@ -230,9 +253,9 @@
                 Gravity = Gravity.CenterHorizontal,
                 Y = btnCollectionIcon.Bottom,
                 Height = Application.GetRealHeight(16),
-                TextColor = CSS.CSS_Color.FirstLevelTitleColor,
-                SelectedTextColor = CSS.CSS_Color.MainColor,
-                TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                 TextID = StringId.Intellectualization,
                 TextAlignment = TextAlignment.Center,
             };
@@ -254,7 +277,7 @@
                 Width = Application.GetMinRealAverage(22),
                 Height = Application.GetMinRealAverage(22),
                 UnSelectedImagePath = "Navigation/PersonalCenterIcon.png",
-                SelectedImagePath = "0Common/transparent.png",
+                SelectedImagePath = "Public/transparent.png",
             };
             personalCenterView.AddChidren(btnPersonalCenterIcon);
 
@@ -263,29 +286,29 @@
                 Gravity = Gravity.CenterHorizontal,
                 Y = btnCollectionIcon.Bottom,
                 Height = Application.GetRealHeight(16),
-                TextColor = CSS.CSS_Color.FirstLevelTitleColor,
-                SelectedTextColor = CSS.CSS_Color.MainColor,
-                TextSize = CSS.CSS_FontSize.PromptFontSize_SecondaryLevel,
+                TextColor = CSS_Color.FirstLevelTitleColor,
+                SelectedTextColor = CSS_Color.MainColor,
+                TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
                 TextID = StringId.Personal,
                 TextAlignment = TextAlignment.Center,
             };
             personalCenterView.AddChidren(btnPersonalCenterText);
             #endregion
 
-
-
             var homePage = new HomePage();
             ContextView.AddChidren(homePage);
             homePage.LoadPage();
         }
-
 
         /// <summary>
         /// 鍒囨崲鍒版敹钘忕晫闈�
         /// </summary>
         void ChooseCollection()
         {
-            CurAnimationEffect = 0;
+            if (CurAnimationEffect == 0)
+            {
+                return;
+            }
             btnClassificationIcon.IsSelected = false;
             btnIntellectualizationIcon.IsSelected = false;
             btnPersonalCenterIcon.IsSelected = false;
@@ -294,23 +317,25 @@
             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)
             {
-                sleepTime = 600;
+                sleepTime = 400;
                 total = 30;
             }
             else if (distance > 100)
             {
-                sleepTime = 450;
                 total = 20;
             }
             distance /= total;
             new System.Threading.Thread(() => {
                 int index = 0;
-                while (index < total+1) {
+                CurAnimationEffect = 0;
+                while (index < total+1)
+                {
                     if (CurAnimationEffect != 0)
                     {
                         break;
@@ -324,7 +349,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;
@@ -333,10 +358,11 @@
                             btnClassificationText.IsSelected = false;
                             btnIntellectualizationText.IsSelected = false;
                             btnPersonalCenterText.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
                         }
                         if (index == (total/2))
                         {
-                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/CollectionIconOn.png";
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/HomePageIconOn.png";
                         }
                         //鏃嬭浆
                         btnNavigationSelectionIcon.SetRotation(-36f * index);
@@ -344,6 +370,11 @@
                     System.Threading.Thread.Sleep(sleepTime / total);
                     index++;
                 }
+
+                Application.RunOnMainThread(() =>
+                {
+                    btnNavigationSelectionIcon.SetRotation(0f);
+                });
             }) { IsBackground = true }.Start();
             #endregion
             ContextView.RemoveAll();
@@ -356,7 +387,10 @@
         /// </summary>
         void ChooseClassification()
         {
-            CurAnimationEffect = 1;
+            if (CurAnimationEffect == 1)
+            {
+                return;
+            }
             btnCollectionIcon.IsSelected = false;
             btnIntellectualizationIcon.IsSelected = false;
             btnPersonalCenterIcon.IsSelected = false;
@@ -365,17 +399,21 @@
             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)
             {
-                sleepTime = 450;
                 total = 20;
             }
             distance /= total;
             new System.Threading.Thread(() =>
             {
+                if (CurAnimationEffect == 1)
+                {
+                    return;
+                }
+                CurAnimationEffect = 1;
                 int index = 0;
                 while (index < total+1)
                 {
@@ -392,7 +430,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;
@@ -401,6 +439,7 @@
                             btnCollectionText.IsSelected = false;
                             btnIntellectualizationText.IsSelected = false;
                             btnPersonalCenterText.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/ClassificationIconOn.png";
                         }
                         if (index == (total / 2 ))
                         {
@@ -419,11 +458,16 @@
                     System.Threading.Thread.Sleep(sleepTime / total);
                     index++;
                 }
+
+                Application.RunOnMainThread(() =>
+                {
+                    btnNavigationSelectionIcon.SetRotation(0f);
+                });
             })
             { IsBackground = true }.Start();
             #endregion
             ContextView.RemoveAll();
-            var classificaitionView = new UI.ClassificationPage();
+            var classificaitionView = new ClassificationPage();
             ContextView.AddChidren(classificaitionView);
             classificaitionView.LoadPage();
 
@@ -434,7 +478,10 @@
         /// </summary>
         void ChooseIntellectualization()
         {
-            CurAnimationEffect = 2;
+            if (CurAnimationEffect == 2)
+            {
+                return;
+            }
             btnCollectionText.IsSelected = false;
             btnClassificationText.IsSelected = false;
             btnIntellectualizationText.IsSelected = false;
@@ -443,16 +490,20 @@
             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)
             {
-                sleepTime = 450;
                 total = 20;
             }
             distance /= total;
             new System.Threading.Thread(() => {
+                if (CurAnimationEffect == 2)
+                {
+                    return;
+                }
+                CurAnimationEffect = 2;
                 int index = 0;
                 while (index < total+1)
                 {
@@ -469,7 +520,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;
@@ -478,6 +529,7 @@
                             btnCollectionIcon.IsSelected = false;
                             btnClassificationIcon.IsSelected = false;
                             btnPersonalCenterIcon.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/IntellectualizationIconOn.png";
                         }
                         if (index == (total / 2 ))
                         {
@@ -496,10 +548,20 @@
                     System.Threading.Thread.Sleep(sleepTime / total);
                     index++;
                 }
+
+                Application.RunOnMainThread(() =>
+                {
+                    btnNavigationSelectionIcon.SetRotation(0f);
+                });
             })
             { IsBackground = true }.Start();
             #endregion
             ContextView.RemoveAll();
+            var intelligenceView = new IntelligencePage();
+            ContextView.AddChidren(intelligenceView);
+            intelligenceView.LoadPage();
+
+            
         }
 
         /// <summary>
@@ -507,7 +569,16 @@
         /// </summary>
         void ChoosePersonalCenter()
         {
-            CurAnimationEffect = 3;
+#if DEBUG
+            if(MainPage.NoLoginMode)
+            {
+                return;
+            }
+#endif
+            if (CurAnimationEffect == 3)
+            {
+                return;
+            }
             btnCollectionText.IsSelected = false;
             btnClassificationText.IsSelected = false;
             btnIntellectualizationText.IsSelected = false;
@@ -516,21 +587,21 @@
             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)
             {
-                sleepTime = 600;
+                sleepTime = 400;
                 total = 30;
             }
             else if (distance < -100)
             {
-                sleepTime = 450;
                 total = 20;
             }
             distance /= total;
             new System.Threading.Thread(() => {
+                CurAnimationEffect = 3;
                 int index = 0;
                 while (index < total+1)
                 {
@@ -547,7 +618,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;
@@ -556,6 +627,7 @@
                             btnCollectionIcon.IsSelected = false;
                             btnClassificationIcon.IsSelected = false;
                             btnIntellectualizationIcon.IsSelected = false;
+                            btnNavigationSelectionIcon.UnSelectedImagePath = "Navigation/PersonalCenterIconOn.png";
                         }
                         if (index == (total / 2 ))
                         {
@@ -567,16 +639,18 @@
                     System.Threading.Thread.Sleep(sleepTime / total);
                     index++;
                 }
+                Application.RunOnMainThread(() =>
+                {
+                    btnNavigationSelectionIcon.SetRotation(0f);
+                });
             })
             { IsBackground = true }.Start();
             #endregion
-
 
             ContextView.RemoveAll();
             var personalCenterPage = new UI.PersonalCenterPage();
             ContextView.AddChidren(personalCenterPage);
             personalCenterPage.LoadView();
         }
-
     }
 }

--
Gitblit v1.8.0