From 0a11352dffeb8d5f31dd40b9728fe1abf4537f04 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 01 九月 2023 18:06:45 +0800 Subject: [PATCH] 2023年09月01日18:06:42 --- 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 e18b5ce..e704e17 100644 --- a/HDL_ON/UI/MainPage.cs +++ b/HDL_ON/UI/MainPage.cs @@ -26,7 +26,7 @@ /// <summary> /// 鐗堟湰鍙� /// </summary> - public static string VersionString = "1.9.0"; + public static string VersionString = "2.1.2"; ///// <summary> ///// 瀹㈡埛绔被鍨� ///// </summary> @@ -122,7 +122,9 @@ SPK.PanelSocket,SPK.ElectricSocket, SPK.MechanicalArm,SPK.IpCam_Imou, SPK.GroupControl, - SPK.AvMusic,SPK.MusicStandard + SPK.AvMusic, + SPK.MusicStandard, + SPK.ElectricalTvHisense }; @@ -141,6 +143,7 @@ //_RoomNotSupportFunctionList.Add(SPK.MusicStandard); //_RoomNotSupportFunctionList.Add(SPK.AvMusic); _RoomNotSupportFunctionList.Add(SPK.AirSwitch); + //_RoomNotSupportFunctionList.Add(SPK.AirSwitchP3); _RoomNotSupportFunctionList.Add(SPK.ElectricEnergy); //_RoomNotSupportFunctionList.Add(SPK.OtherCommon); _RoomNotSupportFunctionList.Add(SPK.SensorLight); @@ -162,6 +165,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(); @@ -222,36 +233,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> @@ -619,9 +630,12 @@ public static void Log(string msg) { #if DEBUG - //if (msg.Contains("鏀跺埌鏁版嵁") - // || msg.Contains("鍙戦��") - // ) + if (msg.Contains("鏀跺埌鏁版嵁") + || msg.Contains("鍙戦��") + || msg.Contains("鎺ユ敹鍒版帹閫�") + || msg.Contains("api") + + ) Console.WriteLine(msg); #endif } -- Gitblit v1.8.0