From 5c25f9546d0954befb202910540a5ac59af1adfe Mon Sep 17 00:00:00 2001 From: wei <kaede@kaededeMacBook-Air.local> Date: 星期一, 04 一月 2021 14:07:27 +0800 Subject: [PATCH] 20210103:增加安卓后退按键 --- HDL_ON/UI/MainPage.cs | 116 ++++++++++++++++++++++++---------------------------------- 1 files changed, 48 insertions(+), 68 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index ff4f6b3..3592ab2 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -44,10 +44,6 @@ /// 鏃犵櫥褰曟ā寮� /// </summary> public static bool NoLoginMode = false; - ///// <summary> - ///// 杩滅▼妯″紡 - ///// </summary> - //public static bool IsRemote = false; /// <summary> /// 缃戠粶杩炴帴鐘舵�� /// 0:鏃犵綉缁� @@ -180,6 +176,7 @@ Application.RunOnMainThread(() => { waitPage.Hide(); + waitPage.RemoveFromParent(); BaseView.RemoveAll(); BasePageView = new PageLayout(); BasePageView.ScrollEnabled = false; @@ -207,9 +204,9 @@ BaseView.AddChidren(BasePageView); //璺宠浆椤甸潰---- - var userPage = new UserPage(); - BasePageView.AddChidren(userPage); - userPage.LoadPage(); + var UserBasePage = new UserPage(); + BasePageView.AddChidren(UserBasePage); + UserBasePage.LoadPage(); BasePageView.PageIndex = 0; if (isFirstOpen) @@ -240,46 +237,53 @@ } /// <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 (BaseView.ChildrenCount>1) + { + var view = BaseView.GetChildren(BaseView.ChildrenCount - 1); + if(view.GetType() == typeof(Loading)) + { + var loading = view as Loading; + if (loading.CurStatus == false)//鏈変竴浜涚瓑寰呯晫闈㈤殣钘忎簡锛屼絾鏄病鏈夌Щ闄ゅ埌锛岄渶瑕佸厛绉婚櫎 + { + loading.RemoveFromParent(); + result = LoadEvent_BackAction(); + } + else + { + result = 1;//姝e湪绛夊緟鏌愪簺鎿嶄綔 + } + } + } + else + { + if (BasePageView.ChildrenCount > 1) + { + int index = BasePageView.ChildrenCount - 1; + var view = BasePageView.GetChildren(index); + if (view != null) + { + view.RemoveFromParent(); + } + } + else + { + result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈� + } + } + }); + return result; } + /// <summary> /// 鑷畾涔夋棩蹇楄緭鍑� @@ -291,30 +295,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