From e1a8f2f7e4d850beedeb1469610b878c1427e976 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 15 十二月 2021 09:01:53 +0800
Subject: [PATCH] 更新

---
 HDL_ON/UI/MainPage.cs |   76 ++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 5c0af7d..b17177f 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
     /// <summary>
     /// 鐗堟湰鍙�
     /// </summary>
-    public static string VersionString = "1.3.1103";
+    public static string VersionString = "1.4.3";
     ///// <summary>
     ///// 瀹㈡埛绔被鍨�
     ///// </summary>
@@ -146,8 +146,6 @@
 
         BaseView = Application.MainPage;
         Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
-
-
         //#region 娴嬭瘯
         //var ddd = new UI.test.TestDialog();
         //ddd.InitView();
@@ -344,30 +342,30 @@
         {
           Entity.FunctionList.List.Clear();
           Entity.SpatialInfo.CurrentSpatial.Clear();
-                ///绛夊緟鑾峰彇浣忓畢淇℃伅
-                Application.RunOnMainThread(() =>
-               {
-                if (waitPage != null)
-                {
-                  waitPage.RemoveFromParent();
-                  waitPage = null;
-                }
+          ///绛夊緟鑾峰彇浣忓畢淇℃伅
+          Application.RunOnMainThread(() =>
+          {
+            if (waitPage != null)
+            {
+              waitPage.RemoveFromParent();
+              waitPage = null;
+            }
 
-                      //璺宠浆椤甸潰----
-                      UserBasePage = new UserPage();
-                BasePageView.AddChidren(UserBasePage);
-                UserBasePage.LoadPage();
-                BasePageView.PageIndex = 0;
+            //璺宠浆椤甸潰----
+            UserBasePage = new UserPage();
+            BasePageView.AddChidren(UserBasePage);
+            UserBasePage.LoadPage();
+            BasePageView.PageIndex = 0;
 
-                if (isFirstOpen)
-                {
-                        //鍚姩瀵嗙爜楠岃瘉
-                        new AppUnlockPage().LoadPage(isFirstOpen);
-                }
-                      //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
-                      pageShowEvent?.Invoke();
-                pageShowEvent = null;
-              });
+            if (isFirstOpen)
+            {
+              //鍚姩瀵嗙爜楠岃瘉
+              new AppUnlockPage().LoadPage(isFirstOpen);
+            }
+            //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+            pageShowEvent?.Invoke();
+            pageShowEvent = null;
+          });
         }
         catch (Exception ex)
         {
@@ -376,14 +374,14 @@
         finally
         {
           Application.RunOnMainThread(() =>
-                {
-                if (downloadData)
-                {
-                  DB_ResidenceData.Instance.EixtAccount();
-                        ///鍒濆鍖朼pp鏁版嵁
-                        Common.ApiUtlis.Ins.DownloadData();
-                };
-              });
+          {
+            if (downloadData)
+            {
+              DB_ResidenceData.Instance.EixtAccount();
+              ///鍒濆鍖朼pp鏁版嵁
+              Common.ApiUtlis.Ins.DownloadData();
+            };
+          });
         }
       }).Start();
 
@@ -403,7 +401,7 @@
         if (BasePageView == null || BasePageView.ChildrenCount <= 1)
         {
           result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
-              }
+        }
         if (BasePageView.ChildrenCount > 1)
         {
           int index = BasePageView.ChildrenCount - 1;
@@ -412,14 +410,14 @@
           {
             var loading = view as Loading;
             if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
-                  {
+            {
               loading.RemoveFromParent();
               result = LoadEvent_BackAction();
             }
             else
             {
               result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
-                  }
+            }
           }
           else
           {
@@ -446,7 +444,7 @@
         else
         {
           result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
-              }
+        }
       });
       return result;
     }
@@ -458,11 +456,11 @@
     public static void Log(string msg)
     {
 #if DEBUG
-      Console.WriteLine(msg);
+            Console.WriteLine(msg);
 #endif
     }
 
 
   }
 
-}
+}
\ No newline at end of file

--
Gitblit v1.8.0