From a448538f9279d76158bd010e696e7012c0696439 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 24 十一月 2021 17:12:04 +0800
Subject: [PATCH] 2021-11-24-02
---
HDL_ON/UI/MainPage.cs | 158 +++++++++++++---------------------------------------
1 files changed, 40 insertions(+), 118 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index a36e803..043eafc 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,14 +26,14 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.3.1103";
+ public static string VersionString = "1.3.1123";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
//public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
/// <summary>
- ///
+ ///
/// </summary>
public static Entity.CityInfo cityInfo = new Entity.CityInfo();
/// <summary>
@@ -86,84 +86,8 @@
/// </summary>
public static bool Increase
{
-
- /// <summary>
- /// BaseView
- /// </summary>
- public static FrameLayout BaseView { get; internal set; }
- /// <summary>
- /// BasePageView
- /// </summary>
- public static PageLayout BasePageView { get; set; }
- /// <summary>
- /// 鐢ㄦ埛鎺у埗鐖跺鍣�
- /// </summary>
- public static UserPage UserBasePage;
- /// <summary>
- /// 鐗堟湰鍙�
- /// </summary>
- public static string VersionString = "1.3.1123";
- ///// <summary>
- ///// 瀹㈡埛绔被鍨�
- ///// </summary>
- //public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
-
- /// <summary>
- ///
- /// </summary>
- public static Entity.CityInfo cityInfo = new Entity.CityInfo();
- /// <summary>
- /// 澶╂皵鍒锋柊action
- /// </summary>
- public static Action RefreshAir;
- /// <summary>
- /// 鍥為��椤甸潰action 娌℃湁闇�瑕佸彲浠ヤ笉鐢�
- /// </summary>
- public static Action ReturnRefreshAction;
- /// <summary>
- /// 鏃犵櫥褰曟ā寮�
- /// </summary>
- public static bool NoLoginMode = false;
- /// <summary>
- /// 缃戠粶杩炴帴鐘舵��
- /// 0:鏃犵綉缁�
- /// </summary>
- public static int InternetStatus = 2;
- /// <summary>
- /// 鏄惁杩涘叆鍚庡彴
- /// </summary>
- public static bool IsEnterBackground = false;
- /// <summary>
- /// 褰撳墠鍒嗛〉绱㈠紩
- /// 0:鏀惰棌
- /// 1:鍒嗙被
- /// 2:鏅鸿兘
- /// 3:涓汉
- /// </summary>
- public static int CurPageIndex = 9999;
-
- ///// <summary>
- ///// 鍏徃浠ｇ爜
- ///// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
- ///// 0:HDL
- ///// </summary>
- //public static int Company = 0;
-
- /// <summary>
- /// 鍙虫粦鍚庨��鎻愮ず鎸夐挳
- /// </summary>
- public static Button BtnBackIcon;
- /// <summary>
- /// 鍚庨��鍙虫粦浜嗗灏戣窛绂伙紝瓒呰繃涓�瀹氳窛绂绘墠瑙﹀彂鍚庨��浜嬩欢
- /// </summary>
- public static int StartX = 0;
- /// <summary>
- /// 鏄惁鍏ㄩ潰灞忔墜鏈�
- /// </summary>
- public static bool Increase
- {
- get
- {
+ get
+ {
#if __IOS__
if (Application.PhoneType>10)
{
@@ -222,8 +146,6 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
-
-
//#region 娴嬭瘯
//var ddd = new UI.test.TestDialog();
//ddd.InitView();
@@ -420,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)
{
@@ -452,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();
@@ -479,7 +401,7 @@
if (BasePageView == null || BasePageView.ChildrenCount <= 1)
{
result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- }
+ }
if (BasePageView.ChildrenCount > 1)
{
int index = BasePageView.ChildrenCount - 1;
@@ -488,14 +410,14 @@
{
var loading = view as Loading;
if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
- {
+ {
loading.RemoveFromParent();
result = LoadEvent_BackAction();
}
else
{
result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
- }
+ }
}
else
{
@@ -522,7 +444,7 @@
else
{
result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- }
+ }
});
return result;
}
@@ -534,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