From 54c202bd4867092fca2bc6f96bec0cfd1056a46a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 06 十一月 2023 11:24:20 +0800
Subject: [PATCH] 2023年11月06日11:23:46
---
HDL_ON/UI/MainPage.cs | 84 ++++++++++++++++++++++++-----------------
1 files changed, 49 insertions(+), 35 deletions(-)
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 44a2e3a..6f0454c 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -26,7 +26,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "2.0.0";
+ public static string VersionString = "2.3.0";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
@@ -122,7 +122,11 @@
SPK.PanelSocket,SPK.ElectricSocket,
SPK.MechanicalArm,SPK.IpCam_Imou,
SPK.GroupControl,
- SPK.AvMusic,SPK.MusicStandard
+ SPK.AvMusic,
+ SPK.MusicStandard,
+ SPK.ElectricalTvHisense,
+ SPK.OtherCommon,
+
};
@@ -141,9 +145,9 @@
//_RoomNotSupportFunctionList.Add(SPK.MusicStandard);
//_RoomNotSupportFunctionList.Add(SPK.AvMusic);
_RoomNotSupportFunctionList.Add(SPK.AirSwitch);
- _RoomNotSupportFunctionList.Add(SPK.AirSwitchP3);
+ //_RoomNotSupportFunctionList.Add(SPK.AirSwitchP3);
_RoomNotSupportFunctionList.Add(SPK.ElectricEnergy);
- //_RoomNotSupportFunctionList.Add(SPK.OtherCommon);
+ _RoomNotSupportFunctionList.Add(SPK.OtherCommon);
_RoomNotSupportFunctionList.Add(SPK.SensorLight);
_RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList());
//_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList());
@@ -163,6 +167,14 @@
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();
@@ -223,36 +235,36 @@
}
-#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
+//#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>
@@ -623,7 +635,9 @@
if (msg.Contains("鏀跺埌鏁版嵁")
|| msg.Contains("鍙戦��")
|| msg.Contains("鎺ユ敹鍒版帹閫�")
-
+ || msg.Contains("api")
+ || msg.Contains("璇诲彇鍔熻兘鐘舵��")
+ || true
)
Console.WriteLine(msg);
#endif
--
Gitblit v1.8.0