From 565f7ae8ef01916cb435153a8a01ddd5c5f70c48 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期四, 13 五月 2021 14:43:11 +0800
Subject: [PATCH] 1.场景延时修改成0-3600s
---
HDL_ON/UI/MainPage.cs | 260 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 171 insertions(+), 89 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 8fae7d3..1315ac8 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -18,15 +18,9 @@
/// </summary>
public static PageLayout BasePageView { get; set; }
/// <summary>
- /// DisplayCompleted
- /// </summary>
- public static bool DisplayCompleted = false;
-
- //public static UserInfo LoginUser;
- /// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.0.1224";
+ public static string VersionString = "1.2.0428";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -41,13 +35,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 +51,14 @@
/// 鏄惁杩涘叆鍚庡彴
/// </summary>
public static bool IsEnterBackground = false;
+ /// <summary>
+ /// 褰撳墠鍒嗛〉绱㈠紩
+ /// 0:鏀惰棌
+ /// 1:鍒嗙被
+ /// 2:鏅鸿兘
+ /// 3:涓汉
+ /// </summary>
+ public static int CurPageIndex = 9999;
///// <summary>
///// 鍏徃浠ｇ爜
@@ -65,6 +67,14 @@
///// </summary>
//public static int Company = 0;
+ /// <summary>
+ /// 鍙虫粦鍚庨��鎻愮ず鎸夐挳
+ /// </summary>
+ public static Button BtnBackIcon;
+ /// <summary>
+ /// 鍚庨��鍙虫粦浜嗗灏戣窛绂伙紝瓒呰繃涓�瀹氳窛绂绘墠瑙﹀彂鍚庨��浜嬩欢
+ /// </summary>
+ public static int StartX = 0;
/// <summary>
/// 鏄惁鍏ㄩ潰灞忔墜鏈�
/// </summary>
@@ -95,6 +105,12 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
+
+ //#region 娴嬭瘯
+ //var ddd = new UI.test.TestDialog();
+ //ddd.InitView();
+ //return;
+ //#endregion
if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
{
@@ -169,7 +185,6 @@
addResidencePage.LoadView();
return;
}
-
new System.Threading.Thread(() =>
{
try
@@ -180,6 +195,7 @@
Application.RunOnMainThread(() =>
{
waitPage.Hide();
+ waitPage.RemoveFromParent();
BaseView.RemoveAll();
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
@@ -188,29 +204,104 @@
{
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;
+ 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 userPage = new UserPage();
- BasePageView.AddChidren(userPage);
- userPage.LoadPage();
+ var UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
+
+
if (isFirstOpen)
{
@@ -229,57 +320,72 @@
{
Application.RunOnMainThread(() =>
{
+
+
if (downloadData)
{
///鍒濆鍖朼pp鏁版嵁
Common.ApiUtlis.Ins.DownloadData();
};
+
+
+
});
}
}).Start();
}
/// <summary>
- /// 鍒濆鍖朼pp鎵�闇�瑕佺殑鏁版嵁
+ /// 鍚庨��浜嬩欢
+ /// 0:鍚庨��
+ /// 1:鏈夌瓑寰呯晫闈�
+ /// 2:鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
/// </summary>
- public static void InitializationData1()
+ public static int LoadEvent_BackAction()
{
- //new System.Threading.Thread(() =>
- //{
- // int count = 0;
- // while (count< 10)
- // {
- // if (Entity.DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull() )//|| Entity.DB_ResidenceData.residenceData.HomeGateway == null)
- // {
- // System.Threading.Thread.Sleep(200);
- // }
- // else
- // {
- // break;
- // }
- // count++;
- // }
- // if(Entity.DB_ResidenceData.Instance.CheckWhetherGatewayIdIsNull())
- // {
- // return;
- // }
- // //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();
-
+ int result = 0;
+ Application.RunOnMainThread(() =>
+ {
+ if (BasePageView == null || BasePageView.ChildrenCount<=1 )
+ {
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
+ if (BasePageView.ChildrenCount > 1)
+ {
+ int index = BasePageView.ChildrenCount - 1;
+ var view = BasePageView.GetChildren(index);
+ if (view.GetType() == typeof(Loading))
+ {
+ var loading = view as Loading;
+ if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎
+ {
+ loading.RemoveFromParent();
+ result = LoadEvent_BackAction();
+ }
+ else
+ {
+ result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
+ }
+ }
+ else
+ {
+ if (view != null)
+ {
+ if(view.Tag.ToString() != "unlockpage")
+ {
+ view.RemoveFromParent();
+ }
+ }
+ }
+ }
+ else
+ {
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
+ });
+ return result;
}
+
/// <summary>
/// 鑷畾涔夋棩蹇楄緭鍑�
@@ -291,30 +397,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