From 1802b849f0dadc81644fb0a706d6fb45efdf2a20 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 24 十一月 2021 16:13:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/MainPage.cs | 733 +++++++++++++++++++++++++++++++-------------------------
1 files changed, 407 insertions(+), 326 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index fe49208..a36e803 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -8,9 +8,85 @@
namespace HDL_ON
{
- public static class MainPage
+ public static class MainPage
+ {
+
+ /// <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.1103";
+ ///// <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
{
-
+
/// <summary>
/// BaseView
/// </summary>
@@ -26,14 +102,14 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.3.1119";
+ 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>
@@ -95,15 +171,15 @@
}
return false;
#else
- return false;
+ return false;
#endif
- }
- }
+ }
+ }
- /// <summary>
- /// 鍦烘櫙鏀寔鐨勫姛鑳藉垪琛�
- /// </summary>
- public static List<string> SceneSupportFunctionList = new List<string> {
+ /// <summary>
+ /// 鍦烘櫙鏀寔鐨勫姛鑳藉垪琛�
+ /// </summary>
+ public static List<string> SceneSupportFunctionList = new List<string> {
SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,
SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
@@ -114,350 +190,355 @@
};
- static List<string> _RoomNotSupportFunctionList = null;
- /// <summary>
- /// 鎴块棿鍔熻兘鍒楄〃涓嶅姞杞界殑鍔熻兘鍒楄〃
- /// </summary>
- public static List<string> RoomNotSupportFunctionList
+ static List<string> _RoomNotSupportFunctionList = null;
+ /// <summary>
+ /// 鎴块棿鍔熻兘鍒楄〃涓嶅姞杞界殑鍔熻兘鍒楄〃
+ /// </summary>
+ public static List<string> RoomNotSupportFunctionList
+ {
+ get
+ {
+ if (_RoomNotSupportFunctionList == null)
{
- get {
- if(_RoomNotSupportFunctionList == null)
- {
- _RoomNotSupportFunctionList = new List<string>();
- _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
- _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
- _RoomNotSupportFunctionList.Add(SPK.AvMusic);
- _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
- _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
- _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
- _RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
- }
- return _RoomNotSupportFunctionList;
- }
+ _RoomNotSupportFunctionList = new List<string>();
+ _RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
+ _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
+ _RoomNotSupportFunctionList.Add(SPK.AvMusic);
+ _RoomNotSupportFunctionList.Add(SPK.AirSwitch);
+ _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
+ _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
+ _RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
}
+ return _RoomNotSupportFunctionList;
+ }
+ }
- public static void Show()
+ public static void Show()
+ {
+ try
+ {
+ Application.DesignWidth = 375;
+ Application.DesignHeight = 667;
+
+ 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))
{
- try
- {
- Application.DesignWidth = 375;
- Application.DesignHeight = 667;
-
- BaseView = Application.MainPage;
- Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- ///鐩戝惉缁忕含搴�
- HDL_ON.UI.UI2.Intelligence.Automation.LogicMethod.CurrLogicMethod.AppLatAndLonEvent();
-
- //#region 娴嬭瘯
- //var ddd = new UI.test.TestDialog();
- //ddd.InitView();
- //return;
- //#endregion
-
- if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
- {
- GoLoginPage();
- }
- else
- {
- //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
- if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
- {
- GoLoginPage(UserInfo.Current);
- }
- else
- {
- //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(false,true);
- }
- }
- }
- catch (Exception ex)
- {
- Log("root erorr : " + ex.Message);
- }
- finally
- {
- //Application.RunOnMainThread(() => {
- // Application.HideSoftInput();
- //});
- }
+ GoLoginPage();
}
-
- /// <summary>
- /// 杩涘叆鐧诲綍鐣岄潰
- /// </summary>
- public static void GoLoginPage(UserInfo userInfo = null)
+ else
{
- BaseView.RemoveAll();
- BaseView.BackgroundColor = CSS_Color.BackgroundColor;
- var fisrtView = new UI.UI1Login.LoginPage();
- fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
- BaseView.AddChidren(fisrtView);
- fisrtView.LoadView(userInfo);
+ //鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
+ if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
+ {
+ GoLoginPage(UserInfo.Current);
+ }
+ else
+ {
+ //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(false, true);
+ }
}
+ }
+ catch (Exception ex)
+ {
+ Log("root erorr : " + ex.Message);
+ }
+ finally
+ {
+ //Application.RunOnMainThread(() => {
+ // Application.HideSoftInput();
+ //});
+ }
+ }
- /// <summary>
- /// 杩涘叆涓婚〉
- /// </summary>
- /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
- /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
- 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);
+ /// <summary>
+ /// 杩涘叆鐧诲綍鐣岄潰
+ /// </summary>
+ public static void GoLoginPage(UserInfo userInfo = null)
+ {
+ BaseView.RemoveAll();
+ BaseView.BackgroundColor = CSS_Color.BackgroundColor;
+ var fisrtView = new UI.UI1Login.LoginPage();
+ fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
+ BaseView.AddChidren(fisrtView);
+ fisrtView.LoadView(userInfo);
+ }
- 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);
+ /// <summary>
+ /// 杩涘叆涓婚〉
+ /// </summary>
+ /// <param name="isFirstOpen">濡傛灉鏄涓�娆″惎鍔� 妫�娴嬫牎楠屽瘑鐮�</param>
+ /// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
+ 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);
- 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);
+ 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;
- }
- }
- };
- #endregion
+ 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();
+ //浣撻獙妯″紡
+ if (NoLoginMode)
+ {
+ //璺宠浆椤甸潰----
+ UserBasePage = new UserPage();
+ BasePageView.AddChidren(UserBasePage);
+ UserBasePage.LoadPage();
+ BasePageView.PageIndex = 0;
+
+ return;
+ }
+
+ //鍔犺浇Loading鏁堟灉
+ var waitPage = new Loading();
+ BaseView.AddChidren(waitPage);
+ waitPage.Start(Language.StringByID(StringId.PleaseWait));
+
+ //褰撴病鏈変綇瀹呮椂,涓嶈兘璁╁畠寰�涓嬭蛋
+ if (UserInfo.Current.regionList.Count == 0)
+ {
+ waitPage.Hide();
+ var addResidencePage = new BindingResidencePage();
+ BaseView.AddChidren(addResidencePage);
+ addResidencePage.LoadView();
+ return;
+ }
+ new System.Threading.Thread(async () =>
+ {
+ try
+ {
+ Entity.FunctionList.List.Clear();
+ Entity.SpatialInfo.CurrentSpatial.Clear();
+ ///绛夊緟鑾峰彇浣忓畢淇℃伅
+ Application.RunOnMainThread(() =>
+ {
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
+
+ //璺宠浆椤甸潰----
+ UserBasePage = new UserPage();
BasePageView.AddChidren(UserBasePage);
UserBasePage.LoadPage();
BasePageView.PageIndex = 0;
- return;
- }
-
- //鍔犺浇Loading鏁堟灉
- var waitPage = new Loading();
- BaseView.AddChidren(waitPage);
- waitPage.Start(Language.StringByID(StringId.PleaseWait));
-
- //褰撴病鏈変綇瀹呮椂,涓嶈兘璁╁畠寰�涓嬭蛋
- if (UserInfo.Current.regionList.Count == 0)
- {
- waitPage.Hide();
- var addResidencePage = new BindingResidencePage();
- BaseView.AddChidren(addResidencePage);
- addResidencePage.LoadView();
- return;
- }
- new System.Threading.Thread(async () =>
- {
- try
+ if (isFirstOpen)
{
- Entity.FunctionList.List.Clear();
- Entity.SpatialInfo.CurrentSpatial.Clear();
- ///绛夊緟鑾峰彇浣忓畢淇℃伅
- Application.RunOnMainThread( () =>
- {
- if (waitPage != null)
- {
- waitPage.RemoveFromParent();
- waitPage = null;
- }
-
- //璺宠浆椤甸潰----
- UserBasePage = new UserPage();
- BasePageView.AddChidren(UserBasePage);
- UserBasePage.LoadPage();
- BasePageView.PageIndex = 0;
-
- if (isFirstOpen)
- {
- //鍚姩瀵嗙爜楠岃瘉
- new AppUnlockPage().LoadPage(isFirstOpen);
- }
- //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
- pageShowEvent?.Invoke();
- pageShowEvent = null;
- });
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage(isFirstOpen);
}
- catch (Exception ex)
- {
- MainPage.Log($"GoUserPage : {ex.Message}");
- }finally
- {
- Application.RunOnMainThread(() =>
- {
- if (downloadData)
- {
- DB_ResidenceData.Instance.EixtAccount();
- ///鍒濆鍖朼pp鏁版嵁
- Common.ApiUtlis.Ins.DownloadData();
- };
- });
- }
- }).Start();
-
+ //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢
+ pageShowEvent?.Invoke();
+ pageShowEvent = null;
+ });
}
-
- /// <summary>
- /// 鍚庨��浜嬩欢
- /// 0:鍚庨��
- /// 1:鏈夌瓑寰呯晫闈�
- /// 2:鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
- /// </summary>
- public static int LoadEvent_BackAction()
+ catch (Exception ex)
{
- int result = 0;
- Application.RunOnMainThread(() =>
+ MainPage.Log($"GoUserPage : {ex.Message}");
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ if (downloadData)
+ {
+ DB_ResidenceData.Instance.EixtAccount();
+ ///鍒濆鍖朼pp鏁版嵁
+ Common.ApiUtlis.Ins.DownloadData();
+ };
+ });
+ }
+ }).Start();
+
+ }
+
+ /// <summary>
+ /// 鍚庨��浜嬩欢
+ /// 0:鍚庨��
+ /// 1:鏈夌瓑寰呯晫闈�
+ /// 2:鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ /// </summary>
+ public static int LoadEvent_BackAction()
+ {
+ 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
{
- if (BasePageView == null || BasePageView.ChildrenCount<=1 )
+ result = 1;//姝ｅ湪绛夊緟鏌愪簺鎿嶄綔
+ }
+ }
+ else
+ {
+ if (view != null)
+ {
+ if (view.Tag != null)
+ {
+ if (view.Tag.ToString() != "unlockpage")
{
- 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!=null )
- {
- if (view.Tag.ToString() != "unlockpage")
- {
- view.RemoveFromParent();
- }else
- {
- result = 2;
- }
- }else
- {
- view.RemoveFromParent();
- }
- }
- }
+ view.RemoveFromParent();
}
else
{
- result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ result = 2;
}
- });
- return result;
+ }
+ else
+ {
+ view.RemoveFromParent();
+ }
+ }
+ }
}
-
-
- /// <summary>
- /// 鑷畾涔夋棩蹇楄緭鍑�
- /// </summary>
- public static void Log(string msg)
+ else
{
-#if DEBUG
- Console.WriteLine(msg);
-#endif
- }
-
-
+ result = 2;//鏃犳硶鍐嶅悗閫�锛屽彲浠ユ墽琛岄��鍒版闈�
+ }
+ });
+ return result;
}
+
+ /// <summary>
+ /// 鑷畾涔夋棩蹇楄緭鍑�
+ /// </summary>
+ public static void Log(string msg)
+ {
+#if DEBUG
+ Console.WriteLine(msg);
+#endif
+ }
+
+
+ }
+
}
--
Gitblit v1.8.0