~wxr/HDL_APP_Project.git

			@@ -1,6 +1,7 @@
			using System;
			using System.Collections.Generic;
			using HDL_ON.DAL;
			using HDL_ON.Entity;
			using HDL_ON.UI;
			using HDL_ON.UI.CSS;
			using Shared;
			@@ -9,6 +10,7 @@
			{
			public static class MainPage
			{

			/// <summary>
			/// BaseView
			/// </summary>
			@@ -18,9 +20,13 @@
			/// </summary>
			public static PageLayout BasePageView { get; set; }
			/// <summary>
			/// 用户控制父容器
			/// </summary>
			public static UserPage UserBasePage;
			/// <summary>
			/// 版本号
			/// </summary>
			public static string VersionString = "1.2.0413";
			public static string VersionString = "1.3.1117";
			///// <summary>
			///// 客户端类型
			///// </summary>
			@@ -94,6 +100,41 @@
			}
			}

			/// <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,
			SPK.FloorHeatStandard,SPK.HvacFloorHeat,
			SPK.AirFreshStandard,SPK.HvacAirFresh,
			SPK.AirSwitch,
			SPK.PanelSocket,SPK.ElectricSocket,
			};


			static List<string> _RoomNotSupportFunctionList = null;
			/// <summary>
			/// 房间功能列表不加载的功能列表
			/// </summary>
			public static List<string> RoomNotSupportFunctionList
			{
			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;
			}
			}

			public static void Show()
			{
			@@ -104,7 +145,8 @@

			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();
			@@ -134,7 +176,7 @@
			//})
			//{ IsBackground = true }.Start();
			Common.ApiUtlis.Ins.DownloadData();


			GoUserPage(false,true);
			}
			}
			@@ -170,7 +212,116 @@
			/// <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);

			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);
			@@ -185,123 +336,26 @@
			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();
			waitPage.RemoveFromParent();
			BaseView.RemoveAll();
			BasePageView = new PageLayout();
			BasePageView.ScrollEnabled = false;
			BasePageView.IsShowPoint = false;
			BasePageView.PageChange = (sender, e) =>
			if (waitPage != null)
			{
			if (e < BasePageView.ChildrenCount - 1)
			{
			BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
			}
			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;
			}
			}
			};

			waitPage.RemoveFromParent();
			waitPage = null;
			}

			//跳转页面----
			var UserBasePage = new UserPage();
			UserBasePage = new UserPage();
			BasePageView.AddChidren(UserBasePage);
			UserBasePage.LoadPage();
			BasePageView.PageIndex = 0;



			if (isFirstOpen)
			{
			@@ -320,19 +374,16 @@
			{
			Application.RunOnMainThread(() =>
			{


			if (downloadData)
			{
			DB_ResidenceData.Instance.EixtAccount();
			///初始化app数据
			Common.ApiUtlis.Ins.DownloadData();
			};



			});
			}
			}).Start();

			}

			/// <summary>
			@@ -346,12 +397,17 @@
			int result = 0;
			Application.RunOnMainThread(() =>
			{
			if (BaseView.ChildrenCount>1)
			if (BasePageView == null \|\| BasePageView.ChildrenCount<=1 )
			{
			var view = BaseView.GetChildren(BaseView.ChildrenCount - 1);
			if(view.GetType() == typeof(Loading))
			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;
			var loading = view as Loading;
			if (loading.CurStatus == false)//有一些等待界面隐藏了，但是没有移除到，需要先移除
			{
			loading.RemoveFromParent();
			@@ -362,22 +418,29 @@
			result = 1;//正在等待某些操作
			}
			}
			else
			{
			if (view != null)
			{
			if(view.Tag!=null )
			{
			if (view.Tag.ToString() != "unlockpage")
			{
			view.RemoveFromParent();
			}else
			{
			result = 2;
			}
			}else
			{
			view.RemoveFromParent();
			}
			}
			}
			}
			else
			{
			if (BasePageView.ChildrenCount > 1)
			{
			int index = BasePageView.ChildrenCount - 1;
			var view = BasePageView.GetChildren(index);
			if (view != null)
			{
			view.RemoveFromParent();
			}
			}
			else
			{
			result = 2;//无法再后退，可以执行退到桌面
			}
			result = 2;//无法再后退，可以执行退到桌面
			}
			});
			return result;