From a19e58425e44c8a83c3d1b23de292659c38a6b1e Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 05 六月 2023 14:09:20 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' into wjc
---
HDL_ON/UI/MainPage.cs | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 75da649..4f1d9af 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.7.3";
+ public static string VersionString = "1.8.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -136,11 +136,11 @@
{
_RoomNotSupportFunctionList = new List<string>();
_RoomNotSupportFunctionList.Add(SPK.EnergyStandard);
- _RoomNotSupportFunctionList.Add(SPK.MusicStandard);
- _RoomNotSupportFunctionList.Add(SPK.AvMusic);
+ //_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
+ //_RoomNotSupportFunctionList.Add(SPK.AvMusic);
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
- _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+ //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
_RoomNotSupportFunctionList.Add(SPK.SensorLight);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
@@ -204,6 +204,52 @@
// Application.HideSoftInput();
//});
}
+
+ try
+ {
+ CommonClass.excptionAction = (obj) =>
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Stan.HdlMessageLogic.Current.ShowAppProgramIsError(obj);
+ });
+ };
+ }
+ catch (Exception ex)
+ {
+
+ }
+
+#if __ANDROID__
+ new System.Threading.Thread(async () =>
+ {
+ int i = 0;
+ 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>
--
Gitblit v1.8.0