From 611786df5108dca0bdcff03834cc285cba4b8e61 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期二, 13 十月 2020 16:48:43 +0800
Subject: [PATCH] 2020-10-13-1
---
HDL_ON/UI/MainPage.cs | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 14 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 2595cca..4841582 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -1,5 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
+using HDL_ON.DAL;
+using HDL_ON.UI;
using HDL_ON.UI.CSS;
using Shared;
@@ -18,12 +20,41 @@
public static string VersionString = "1.0103";
+ public static Entity.CityInfo cityInfo = new Entity.CityInfo();
+ /// <summary>
+ /// 澶╂皵鍒锋柊action
+ /// </summary>
+ public static Action RefreshAir;
+ /// <summary>
+ /// 鏈湴妯″紡
+ /// </summary>
+ public static bool LocalMode = false;
+
/// <summary>
/// 鍏徃浠ｇ爜
/// 棰勭暀绗笁鏂瑰畾鍒舵爣璁�
/// 0:HDL
/// </summary>
public static int Company = 0;
+
+ /// <summary>
+ /// 鏄惁鍏ㄩ潰灞忔墜鏈�
+ /// </summary>
+ public static bool Increase
+ {
+ get
+ {
+#if __IOS__
+ if (Application.PhoneType>10)
+ {
+ return true;
+ }
+ return false;
+#else
+ return false;
+#endif
+ }
+ }
public static void Show()
@@ -33,14 +64,13 @@
Application.DesignWidth = 375;
Application.DesignHeight = 667;
- //BusSocket.Start(6000);
- //CommonPage.InitHttpListener();
+ BusSocket.Start(6000);
+ CommonPage.InitReceiveEvent();
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
-
- LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(MyIO.FileUtils.ReadFile("Register_File")));
+ LoginUser = Newtonsoft.Json.JsonConvert.DeserializeObject<UserInfo>(System.Text.Encoding.UTF8.GetString(FileUtils.ReadFile("Register_File")));
//鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
if (LoginUser == null || !LoginUser.IsLogin)
{
@@ -48,12 +78,32 @@
}
else
{
+ 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();
+
}
}
catch (Exception ex)
{
- MainPage.Log("root erorr : " + ex.Message);
+ Log("root erorr : " + ex.Message);
+ }
+ finally
+ {
}
}
@@ -63,7 +113,7 @@
public static void GoLoginPage(string account ="")
{
BaseView.RemoveAll();
-
+ BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
BaseView.AddChidren(fisrtView);
@@ -77,20 +127,35 @@
{
BaseView.RemoveAll();
BasePageView = new PageLayout();
- BaseView.AddChidren(BasePageView);
-
- //璺宠浆椤甸潰----
- var userPage = new UI.UserPage();
- BasePageView.AddChidren(userPage);
- userPage.LoadPage();
-
-
+ BasePageView.ScrollEnabled = false;
+ BasePageView.IsShowPoint = false;
BasePageView.PageChange += (sender, e) => {
+ if (e < BasePageView.ChildrenCount - 1)
+ {
+ MainPage.BasePageView.GetChildren(MainPage.BasePageView.ChildrenCount - 1).RemoveFromParent();
+ //BasePageView.RemoveAt(BasePageView.ChildrenCount - 1);
+ }
+
while (e < BasePageView.ChildrenCount - 1)
{
BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
}
+ //MainPage.Log($"MainPage.BasePageView.PageIndex : { MainPage.BasePageView.PageIndex} \r MainPage.BasePageView.ChildrenCount : {MainPage.BasePageView.ChildrenCount}");
};
+ BasePageView.MouseDownEventHandler += (sender, e) => {
+ BasePageView.ScrollEnabled = true;
+ };
+ BasePageView.MouseUpEventHandler += (sender, e) => {
+ BasePageView.ScrollEnabled = false;
+ };
+ BaseView.AddChidren(BasePageView);
+
+ //璺宠浆椤甸潰----
+ var userPage = new UserPage();
+ BasePageView.AddChidren(userPage);
+ userPage.LoadPage();
+ BasePageView.PageIndex = 0;
+
}
/// <summary>
--
Gitblit v1.8.0