~wxr/HDL_APP_Project.git

			@@ -26,11 +26,11 @@
			/// <summary>
			/// 版本号
			/// </summary>
			public static string VersionString = "1.0.0924";
			/// <summary>
			/// 客户端类型
			/// </summary>
			public static string ClientType = APIClientType.HDL_ON_PRO.ToString();
			public static string VersionString = "1.1.0119";
			///// <summary>
			///// 客户端类型
			///// </summary>
			//public static string ClientType = APIClientType.HDL_ON_PRO.ToString();

			/// <summary>
			///
			@@ -45,9 +45,14 @@
			/// </summary>
			public static bool NoLoginMode = false;
			/// <summary>
			/// 远程模式
			/// 网络连接状态
			/// 0:无网络
			/// </summary>
			public static bool IsRemote = false;
			public static int InternetStatus = 2;
			/// <summary>
			/// 是否进入后台
			/// </summary>
			public static bool IsEnterBackground = false;

			///// <summary>
			///// 公司代码
			@@ -86,50 +91,38 @@
			BaseView = Application.MainPage;
			Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;

			//BusSocket.Start();
			//CommonPage.InitReceiveEvent();

			//LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("UserInfo_File")));
			//判断需不需要登录，有没有登录，或者登录是否过期，
			if (UserInfo.Current == null \|\| !UserInfo.Current.IsLogin)

			//#region 测试
			//var ddd = new UI.test.TestDialog();
			//ddd.InitView();
			//return;
			//#endregion

			if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
			{
			GoLoginPage(UserInfo.Current);
			GoLoginPage();
			}
			else
			{
			//UdpSocket._BusSocket.Start();
			//if (Entity.DB_ResidenceData.residenceData.GatewayType == 1)
			//{
			// BusSocket.Start();
			// CommonPage.InitReceiveEvent();
			// Control.ReadGatewayIPAddress();
			//}
			//else
			//{
			// BusSocket.Start();
			// CommonPage.InitReceiveEvent();
			//}
			//判断需不需要登录，有没有登录，或者登录是否过期，
			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();

			new System.Threading.Thread(() =>
			{
			var pm =new DAL.Server.HttpServerRequest();
			pm.GetUserInfo();//刷新个人信息
			})
			{ IsBackground = true }.Start();
			new System.Threading.Thread(() =>
			{
			var pm = new DAL.Server.HttpServerRequest();
			pm.GetHomePager();//刷新住宅信息
			})
			{ IsBackground = true }.Start();
			GoUserPage();
			//启动密码验证
			new AppUnlockPage().LoadPage();
			//读取音乐信息
			UI.Music.A31MusicModel.ReadMusicStates();
			#if DEBUG
			//new HDL_ON.DAL.Net.TcpListener().OpenServer(8586);
			#endif
			GoUserPage(false,true);
			}
			}
			}
			catch (Exception ex)
			@@ -160,37 +153,143 @@
			/// <summary>
			/// 进入主页
			/// </summary>
			public static void GoUserPage()
			/// <param name="isFirstOpen">如果是第一次启动检测校验密码</param>
			/// <param name="pageShowEvent">主页显示之后触发的事件(没有住宅的话,则不会触发)</param>
			public static void GoUserPage(bool downloadData , bool isFirstOpen = false, Action pageShowEvent = null)
			{
			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();
			}
			//加载Loading效果
			var waitPage = new Loading();
			BaseView.AddChidren(waitPage);
			waitPage.Start(Language.StringByID(StringId.PleaseWait));

			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);
			//当没有住宅时,不能让它往下走
			if (UserInfo.Current.regionList.Count == 0)
			{
			waitPage.Hide();
			var addResidencePage = new BindingResidencePage();
			BaseView.AddChidren(addResidencePage);
			addResidencePage.LoadView();
			return;
			}

			//跳转页面----
			var userPage = new UserPage();
			BasePageView.AddChidren(userPage);
			userPage.LoadPage();
			BasePageView.PageIndex = 0;
			new System.Threading.Thread(() =>
			{
			try
			{
			Entity.FunctionList.List.Clear();
			Entity.SpatialInfo.CurrentSpatial.Clear();
			///等待获取住宅信息
			Application.RunOnMainThread(() =>
			{
			waitPage.Hide();
			waitPage.RemoveFromParent();
			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);

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

			if (isFirstOpen)
			{
			//启动密码验证
			new AppUnlockPage().LoadPage(isFirstOpen);
			}
			//主页加载完成,回调事件
			pageShowEvent?.Invoke();
			pageShowEvent = null;
			});
			}
			catch (Exception ex)
			{
			MainPage.Log($"GoUserPage : {ex.Message}");
			}finally
			{
			Application.RunOnMainThread(() =>
			{
			if (downloadData)
			{
			///初始化app数据
			Common.ApiUtlis.Ins.DownloadData();
			};
			});
			}
			}).Start();
			}

			/// <summary>
			/// 后退事件
			/// 0:后退
			/// 1:有等待界面
			/// 2:无法再后退，可以执行退到桌面
			/// </summary>
			public static int LoadEvent_BackAction()
			{
			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;//正在等待某些操作
			}
			}
			}
			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>
			/// 自定义日志输出
			@@ -204,4 +303,5 @@


			}

			}