From 43b0d5870d528f23ecd6aeceb6cfd4325188b46f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 01 七月 2021 15:50:43 +0800
Subject: [PATCH] Revert "1"
---
HDL_ON/UI/MainPage.cs | 307 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 202 insertions(+), 105 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 8a03892..cc24670 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -18,15 +18,13 @@
/// </summary>
public static PageLayout BasePageView { get; set; }
/// <summary>
- /// DisplayCompleted
+ /// 鐢ㄦ埛鎺у埗鐖跺鍣�
/// </summary>
- public static bool DisplayCompleted = false;
-
- //public static UserInfo LoginUser;
+ public static UserPage UserBasePage;
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.1220";
+ public static string VersionString = "1.2.0629";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -41,13 +39,13 @@
/// </summary>
public static Action RefreshAir;
/// <summary>
+ /// 鍥為��椤甸潰action 娌℃湁闇�瑕佸彲浠ヤ笉鐢�
+ /// </summary>
+ public static Action ReturnRefreshAction;
+ /// <summary>
/// 鏃犵櫥褰曟ā寮�
/// </summary>
public static bool NoLoginMode = false;
- /// <summary>
- /// 杩滅▼妯″紡
- /// </summary>
- public static bool IsRemote = false;
/// <summary>
/// 缃戠粶杩炴帴鐘舵��
/// 0:鏃犵綉缁�
@@ -57,6 +55,14 @@
/// 鏄惁杩涘叆鍚庡彴
/// </summary>
public static bool IsEnterBackground = false;
+ /// <summary>
+ /// 褰撳墠鍒嗛〉绱㈠紩
+ /// 0:鏀惰棌
+ /// 1:鍒嗙被
+ /// 2:鏅鸿兘
+ /// 3:涓汉
+ /// </summary>
+ public static int CurPageIndex = 9999;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -65,6 +71,14 @@
///// </summary>
//public static int Company = 0;
+ /// <summary>
+ /// 鍙虫粦鍚庨��鎻愮ず鎸夐挳
+ /// </summary>
+ public static Button BtnBackIcon;
+ /// <summary>
+ /// 鍚庨��鍙虫粦浜嗗灏戣窛绂伙紝瓒呰繃涓�瀹氳窛绂绘墠瑙﹀彂鍚庨��浜嬩欢
+ /// </summary>
+ public static int StartX = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
/// </summary>
@@ -96,6 +110,12 @@
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
+ //#region 娴嬭瘯
+ //var ddd = new UI.test.TestDialog();
+ //ddd.InitView();
+ //return;
+ //#endregion
+
if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
{
GoLoginPage();
@@ -109,16 +129,17 @@
}
else
{
- new System.Threading.Thread(() =>
- {
- var pm = new DAL.Server.HttpServerRequest();
- pm.RefreshToken();//鍒锋柊Token
- pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
- pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
- })
- { IsBackground = true }.Start();
+ //new System.Threading.Thread(() =>
+ //{
+ // var pm = new DAL.Server.HttpServerRequest();
+ // pm.RefreshToken();//鍒锋柊Token
+ // pm.GetHomePager();//鍒锋柊浣忓畢淇℃伅
+ // pm.GetUserInfo();//鍒锋柊涓汉淇℃伅
+ //})
+ //{ IsBackground = true }.Start();
+ Common.ApiUtlis.Ins.DownloadData();
- GoUserPage(true);
+ GoUserPage(false,true);
}
}
}
@@ -152,8 +173,117 @@
/// </summary>
/// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
- public static void GoUserPage(bool isFirstOpen = false, Action pageShowEvent = null)
+ 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)
+ {
+ //璺宠浆椤甸潰----
+ UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
+ BasePageView.PageIndex = 0;
+
+ return;
+ }
+
//鍔犺浇Loading鏁堟灉
var waitPage = new Loading();
BaseView.AddChidren(waitPage);
@@ -168,47 +298,22 @@
addResidencePage.LoadView();
return;
}
-
- new System.Threading.Thread(() =>
+ new System.Threading.Thread(async () =>
{
try
{
Entity.FunctionList.List.Clear();
Entity.SpatialInfo.CurrentSpatial.Clear();
///绛夊緟鑾峰彇浣忓畢淇℃伅
- Application.RunOnMainThread(() =>
+ Application.RunOnMainThread( () =>
{
waitPage.Hide();
- BaseView.RemoveAll();
- BasePageView = new PageLayout();
- BasePageView.ScrollEnabled = false;
- BasePageView.IsShowPoint = false;
- BasePageView.PageChange = (sender, e) =>
- {
- if (e < BasePageView.ChildrenCount - 1)
- {
- MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
-
- while (e < BasePageView.ChildrenCount - 1)
- {
- BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
- };
- BasePageView.MouseDownEventHandler += (sender, e) =>
- {
- BasePageView.ScrollEnabled = true;
- };
- BasePageView.MouseUpEventHandler += (sender, e) =>
- {
- BasePageView.ScrollEnabled = false;
- };
- BaseView.AddChidren(BasePageView);
+ waitPage.RemoveFromParent();
//璺宠浆椤甸潰----
- var userPage = new UserPage();
- BasePageView.AddChidren(userPage);
- userPage.LoadPage();
+ UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
if (isFirstOpen)
@@ -226,53 +331,69 @@
MainPage.Log($"GoUserPage : {ex.Message}");
}finally
{
- ///鍒濆鍖朼pp鏁版嵁
- InitializationData();
+ Application.RunOnMainThread(() =>
+ {
+ if (downloadData)
+ {
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
}
}).Start();
}
/// <summary>
- /// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
+ /// 鍚庨��浜嬩欢
+ /// 0:鍚庨��
+ /// 1:鏈夌瓑寰呯晫闈�
+ /// 2:鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
/// </summary>
- public static void InitializationData()
+ public static int LoadEvent_BackAction()
{
- new System.Threading.Thread(() =>
+ int result = 0;
+ Application.RunOnMainThread(() =>
{
- while (true)
+ if (BasePageView == null || BasePageView.ChildrenCount<=1 )
{
- if (Entity.DB_ResidenceData.Instance == null )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
+ if (BasePageView.ChildrenCount > 1)
+ {
+ int index = BasePageView.ChildrenCount - 1;
+ var view = BasePageView.GetChildren(index);
+ if (view.GetType() == typeof(Loading))
{
- System.Threading.Thread.Sleep(100);
+ var loading = view as Loading;
+ if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
+ {
+ loading.RemoveFromParent();
+ result = LoadEvent_BackAction();
+ }
+ else
+ {
+ result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
+ }
}
else
{
- break;
+ if (view != null)
+ {
+ if(view.Tag.ToString() != "unlockpage")
+ {
+ view.RemoveFromParent();
+ }
+ }
}
}
- //System.Threading.Thread.Sleep(2000);
- #region 璇诲彇浜戠鏁版嵁--
- //todo鏁版嵁瑕嗙洊澶勭悊
- //璇诲彇浜戠鎴块棿銆佹ゼ灞傛暟鎹�
- Entity.SpatialInfo.CurrentSpatial.DownloadRoomList();
- //璇诲彇浜戠璁惧鏁版嵁
- Entity.FunctionList.List.DownloadFunctionList();
- //璇诲彇浜戠鍦烘櫙鏁版嵁
- Entity.FunctionList.List.DownloadSceneList();
- //璇诲彇閫昏緫鍒楄〃
- UI.UI2.Intelligence.Automation.MainView.GetLogicList();
- #endregion
-
- })
- { IsBackground = true }.Start();
-
- #region 璇诲彇鏈湴鏁版嵁
- //璇诲彇闊充箰淇℃伅
- UI.Music.A31MusicModel.ReadMusicStates();
- //鎼滅储缃戝叧
- DriverLayer.Control.Ins.SearchLoaclGateway();
- #endregion
+ else
+ {
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
+ });
+ return result;
}
+
/// <summary>
/// 鑷畾涔夋棩蹇楄緭鍑�
@@ -284,30 +405,6 @@
#endif
}
- /// <summary>
- /// 鐢熸垚13浣嶆椂闂存埑
- /// </summary>
- /// <param name="value">鏃堕棿</param>
- /// <returns></returns>
- public static long GetTimestamp13bit(DateTime value)
- {
- return new DateTimeOffset(value).ToUnixTimeSeconds();
- }
-
- /// <summary>
- /// 鑾峰彇鏃堕棿
- /// </summary>
- /// <param name="timestamp"></param>
- /// <returns></returns>
- public static DateTime GetDateTime (long timestamp)
- {
- long begtime = timestamp * 10000000;
- DateTime dt_1970 = new DateTime(1970, 1, 1, 0, 0, 0);
- long tricks_1970 = dt_1970.Ticks;//1970骞�1鏈�1鏃ュ埢搴�
- long time_tricks = tricks_1970 + begtime;//鏃ュ織鏃ユ湡鍒诲害
- DateTime dt = new DateTime(time_tricks);//杞寲涓篋ateTime
- return dt;
- }
}
--
Gitblit v1.8.0