From acc8caee31c4be90bd38d1af18136b0e84f6fe94 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期五, 27 九月 2024 14:01:19 +0800
Subject: [PATCH] Merge branch 'feature/v2.7_迭代' into feature/V2.7_Google
---
HDL_ON/UI/MainPage.cs | 64 +++----------------------------
1 files changed, 7 insertions(+), 57 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index f9fb909..5e03b01 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.6.0";
+ public static string VersionString = "2.7.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -115,7 +115,7 @@
public static List<string> SceneSupportFunctionList = new List<string> {
SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB,
SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,SPK.CurtainDream,
- SPK.AcIr,SPK.AcStandard,SPK.HvacAC,
+ SPK.AcIr,SPK.AcStandard,SPK.HvacAC,SPK.HvacAcPanel,
SPK.FloorHeatStandard,SPK.HvacFloorHeat,SPK.HvacFloorHeatPanel,
SPK.AirFreshStandard,SPK.HvacAirFresh,
SPK.AirSwitch,
@@ -170,51 +170,29 @@
BaseView = Application.MainPage;
Application.MainPage.BackgroundColor = CSS_Color.MainBackgroundColor;
- //Application.MainPage.BackgroundColor = 0xFFFF0000;// CSS_Color.MainBackgroundColor;
- //BaseView = new FrameLayout()
- //{
- // Y = Application.GetRealHeight(20),
- // Width = Application.GetRealWidth(376),
- // Height = Application.GetRealHeight(667),
- //};
- //Application.MainPage.AddChidren(BaseView);
Language.UpdateLanguage();
- //#region 娴嬭瘯
- //var ddd = new UI.test.TestDialog();
- //ddd.InitView();
- //return;
- //#endregion
if (string.IsNullOrEmpty(OnAppConfig.Instance.LastLoginUserId))
{
- GoLoginPage();
+ GoLoginPage(UserInfo.Current);
}
else
{
//鍒ゆ柇闇�涓嶉渶瑕佺櫥褰曪紝鏈夋病鏈夌櫥褰曪紝鎴栬�呯櫥褰曟槸鍚﹁繃鏈燂紝
- if (UserInfo.Current == null || !UserInfo.Current.IsLogin)
+ 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();
-
GoUserPage(false, true);
}
}
}
catch (Exception ex)
{
- Log("root erorr : " + ex.Message);
+ Log("Error", "root erorr : " + ex.StackTrace);
}
finally
{
@@ -238,36 +216,6 @@
}
-//#if __ANDROID__
-// new System.Threading.Thread(async () =>
-// {
-// int i = 10;
-// while (i < 10) {
-// try
-// {
-// var location_android = await HDL_ON_Android.LocationUtils.GetCurrentLocationAsync();
-// if (location_android != null)
-// {
-// MainPage.cityInfo.lat = location_android.Latitude.ToString();
-// MainPage.cityInfo.lon = location_android.Longitude.ToString();
-// new HDL_ON.DAL.Server.HttpServerRequest().GetCityWeatherInfo(MainPage.cityInfo.lon.Replace(",", "."), MainPage.cityInfo.lat.ToString().Replace(",", "."));
-// i = 100;
-// Application.RunOnMainThread(() => {
-// HomePage.LoadEvent_RefreshAir();
-// });
-// }
-// else
-// {
-// i++;
-// }
-// } catch (Exception ex)
-// {
-// Log($"缁忕含搴﹁幏鍙栧紓甯�: {ex.Message}");
-// }
-// }
-// })
-// { IsBackground = true }.Start();
-//#endif
}
/// <summary>
@@ -283,6 +231,8 @@
}
}
catch { }
+ OnAppConfig.Instance.LastLoginUserId = "";
+ UserInfo.Current.ClearUserInfo();
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
--
Gitblit v1.8.0