From de53d12e223eb8c9a562aeefdcfa9b4039b3d0b0 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 16 六月 2021 10:24:18 +0800
Subject: [PATCH] dome - 1

---
 HDL_ON/UI/MainPage.cs |  214 +++++++++++++++++++++++++++--------------------------
 1 files changed, 109 insertions(+), 105 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 798e219..47d262e 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -171,6 +171,115 @@
         /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
         public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
         {
+            BaseView.RemoveAll();
+            #region 鍚庨��浜嬩欢
+            BasePageView = new PageLayout();
+            BasePageView.ScrollEnabled = false;
+            BasePageView.IsShowPoint = false;
+            BasePageView.PageChange = (sender, e) =>
+            {
+                if (e < BasePageView.ChildrenCount - 1)
+                {
+                    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
+                }
+                try
+                {
+                    ReturnRefreshAction?.Invoke();
+                    ReturnRefreshAction = null;
+                }
+                catch (Exception ex)
+                {
+                    Log($"鍚庨��浜嬩欢寮傚父:{ex.Message}");
+                }
+            };
+            BaseView.AddChidren(BasePageView);
+            var backView = new FrameLayout()
+            {
+                Y = Application.GetRealHeight(100),
+                Width = Application.GetRealWidth(10),
+                Height = Application.GetRealHeight(440),
+            };
+            BaseView.AddChidren(backView);
+
+            BtnBackIcon = new Button()
+            {
+                X = -Application.GetRealWidth(100),
+                Gravity = Gravity.CenterVertical,
+                Width = Application.GetRealWidth(88 / 2),
+                Height = Application.GetRealHeight(56 / 2),
+                UnSelectedImagePath = "Public/RightSlideBackIcon.png"
+            };
+            BaseView.AddChidren(BtnBackIcon);
+            backView.MouseMoveEventHandler = (sender, e) =>
+            {
+                if (BasePageView.ChildrenCount <= 1)
+                {
+                    return;
+                }
+                MainPage.Log($"move:{e.X}");
+                if (StartX == 0 && e.X < 30)
+                {
+                    StartX = (int)e.X;
+                }
+                if (StartX < 30)
+                {
+                    if (e.X < Application.GetRealWidth(100))
+                    {
+                        BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100);
+                    }
+                }
+            };
+            backView.MouseDownEventHandler = (sender, e) =>
+            {
+                if (BasePageView.ChildrenCount <= 1)
+                {
+                    return;
+                }
+                MainPage.Log($"down:{e.X}");
+                StartX = (int)e.X;
+                BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
+            };
+            backView.MouseUpEventHandler = (sender, e) => {
+                MainPage.Log($"up{e.X}");
+                StartX = 0;
+                BtnBackIcon.X = -Application.GetRealWidth(100);
+
+                if (e.X > 70)
+                {
+                    if (BasePageView.ChildrenCount > 1)
+                    {
+                        BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
+                    }
+                }
+            };
+            backView.MouseUpOutsideEventHandler = (sender, e) => {
+                MainPage.Log($"up{e.X}");
+                StartX = 0;
+                BtnBackIcon.X = -Application.GetRealWidth(100);
+
+                if (e.X > 70)
+                {
+                    if (BasePageView.ChildrenCount > 1)
+                    {
+                        BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
+                    }
+                }
+            };
+            #endregion
+
+
+
+            if (NoLoginMode)
+            {
+                //璺宠浆椤甸潰----
+                var UserBasePage = new UserPage();
+                BasePageView.AddChidren(UserBasePage);
+                UserBasePage.LoadPage();
+                BasePageView.PageIndex = 0;
+
+                return;
+            }
+
             //鍔犺浇Loading鏁堟灉
             var waitPage = new Loading();
             BaseView.AddChidren(waitPage);
@@ -196,112 +305,12 @@
                     {
                         waitPage.Hide();
                         waitPage.RemoveFromParent();
-                        BaseView.RemoveAll();
-                        BasePageView = new PageLayout();
-                        BasePageView.ScrollEnabled = false;
-                        BasePageView.IsShowPoint = false;
-                        BasePageView.PageChange = (sender, e) =>
-                        {
-                            if (e < BasePageView.ChildrenCount - 1)
-                            {
-                                BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
-                            }
-                            try
-                            {
-                                ReturnRefreshAction?.Invoke();
-                                ReturnRefreshAction = null;
-                            }
-                            catch (Exception ex)
-                            {
-                                Log($"鍚庨��浜嬩欢寮傚父:{ex.Message}");
-                            }
-                            //while (e < BasePageView.ChildrenCount - 1)
-                            //{
-                            //    BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
-                            //}
-                        };
-                        BaseView.AddChidren(BasePageView);
-
-                        var backView = new FrameLayout()
-                        {
-                            Y = Application.GetRealHeight(100),
-                            Width = Application.GetRealWidth(10),
-                            Height = Application.GetRealHeight(440),
-                        };
-                        BaseView.AddChidren(backView);
-
-                        BtnBackIcon = new Button()
-                        {
-                            X = -Application.GetRealWidth(100),
-                            Gravity = Gravity.CenterVertical,
-                            Width = Application.GetRealWidth(88/2),
-                            Height = Application.GetRealHeight(56/2),
-                            UnSelectedImagePath = "Public/RightSlideBackIcon.png"
-                        };
-                        BaseView.AddChidren(BtnBackIcon);
-                        backView.MouseMoveEventHandler = (sender, e) =>
-                        {
-                            if (BasePageView.ChildrenCount <= 1)
-                            {
-                                return;
-                            }
-                            MainPage.Log($"move:{e.X}");
-                            if (StartX == 0 && e.X < 30) {
-                                StartX = (int)e.X;
-                            }
-                            if (StartX < 30 ) 
-                            {
-                                if (e.X < Application.GetRealWidth(100))
-                                {
-                                    BtnBackIcon.X = (int)e.X - Application.GetRealWidth(100);
-                                }
-                            }
-                        };
-                        backView.MouseDownEventHandler = (sender, e) =>
-                        {
-                            if (BasePageView.ChildrenCount <= 1)
-                            {
-                                return;
-                            }
-                            MainPage.Log($"down:{e.X}");
-                            StartX = (int)e.X;
-                            BtnBackIcon.Y = (int)e.Y + Application.GetRealHeight(50);
-                        };
-                        backView.MouseUpEventHandler = (sender, e) => {
-                            MainPage.Log($"up{e.X}");
-                            StartX = 0;
-                            BtnBackIcon.X = -Application.GetRealWidth(100);
-
-                            if (e.X > 70)
-                            {
-                                if (BasePageView.ChildrenCount > 1)
-                                {
-                                    BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
-                                }
-                            }
-                        };
-                        backView.MouseUpOutsideEventHandler=(sender, e) => {
-                            MainPage.Log($"up{e.X}");
-                            StartX = 0;
-                            BtnBackIcon.X = -Application.GetRealWidth(100);
-
-                            if (e.X > 70)
-                            {
-                                if (BasePageView.ChildrenCount > 1)
-                                {
-                                    BasePageView.PageIndex = BasePageView.ChildrenCount - 2;
-                                }
-                            }
-                        };
-
 
                         //璺宠浆椤甸潰----
                         var UserBasePage = new UserPage();
                         BasePageView.AddChidren(UserBasePage);
                         UserBasePage.LoadPage();
                         BasePageView.PageIndex = 0;
-
-                   
 
                         if (isFirstOpen)
                         {
@@ -320,16 +329,11 @@
                 {
                     Application.RunOnMainThread(() =>
                     {
-                      
-
                         if (downloadData)
                         {
                             ///鍒濆鍖朼pp鏁版嵁
                             Common.ApiUtlis.Ins.DownloadData();
                         };
-
-                       
-
                     });
                 }
             }).Start();

--
Gitblit v1.8.0