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 | 41 ++++++++++++++++++++++++++++-------------
1 files changed, 28 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 7b2716a..4841582 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -21,8 +21,14 @@
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>
/// 鍏徃浠ｇ爜
@@ -85,12 +91,19 @@
})
{ IsBackground = true }.Start();
GoUserPage();
- AppUnlockPage.LoadPage();
+ //鍚姩瀵嗙爜楠岃瘉
+ new AppUnlockPage().LoadPage();
+ //璇诲彇闊充箰淇℃伅
+ UI.Music.A31MusicModel.ReadMusicStates();
+
}
}
catch (Exception ex)
{
Log("root erorr : " + ex.Message);
+ }
+ finally
+ {
}
}
@@ -100,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);
@@ -119,8 +132,15 @@
BasePageView.PageChange += (sender, e) => {
if (e < BasePageView.ChildrenCount - 1)
{
- BasePageView.RemoveAt(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;
@@ -129,18 +149,13 @@
BasePageView.ScrollEnabled = false;
};
BaseView.AddChidren(BasePageView);
-
+
//璺宠浆椤甸潰----
- var userPage = new UI.UserPage();
+ var userPage = new UserPage();
BasePageView.AddChidren(userPage);
userPage.LoadPage();
- BasePageView.PageChange += (sender, e) =>
- {
- while (e < BasePageView.ChildrenCount - 1)
- {
- BasePageView.GetChildren(BasePageView.ChildrenCount - 1).RemoveFromParent();
- }
- };
+ BasePageView.PageIndex = 0;
+
}
/// <summary>
--
Gitblit v1.8.0