~wxr/HDL_APP_Project.git

			@@ -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.1241";
			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>
			@@ -95,6 +109,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))
			{
			@@ -155,6 +175,115 @@
			/// <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);

			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);
			@@ -169,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)
			@@ -240,46 +344,56 @@
			}

			/// <summary>
			/// 初始化app所需要的数据
			/// 后退事件
			/// 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 +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);//转化为DateTime
			return dt;
			}

			}