From c00da77d00a479fa5d022346a6d9075f90a5c087 Mon Sep 17 00:00:00 2001 From: wxr <wxr@hdlchina.com.cn> Date: 星期六, 14 九月 2024 10:05:34 +0800 Subject: [PATCH] 退出登录时间调整,新风,音乐 --- HDL_ON/UI/MainPage.cs | 137 +++++++++++++++++++++++++++------------------ 1 files changed, 82 insertions(+), 55 deletions(-) diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs index e18b5ce..96dbd6a 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.5.1"; ///// <summary> ///// 瀹㈡埛绔被鍨� ///// </summary> @@ -116,13 +116,17 @@ SPK.LightCCT,SPK.LightDimming,SPK.LightSwitch,SPK.LightRGB, SPK.CurtainRoller,SPK.CurtainSwitch,SPK.CurtainTrietex,SPK.CurtainDream, SPK.AcIr,SPK.AcStandard,SPK.HvacAC, - SPK.FloorHeatStandard,SPK.HvacFloorHeat, + SPK.FloorHeatStandard,SPK.HvacFloorHeat,SPK.HvacFloorHeatPanel, SPK.AirFreshStandard,SPK.HvacAirFresh, SPK.AirSwitch, 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,14 @@ //_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.OtherCommon); _RoomNotSupportFunctionList.Add(SPK.SensorLight); + _RoomNotSupportFunctionList.Add(SPK.AcstParent); + _RoomNotSupportFunctionList.Add(SPK.AcstSub); + _RoomNotSupportFunctionList.Add(SPK.WaterHeaterJinmao); + _RoomNotSupportFunctionList.Add(SPK.InverterJinmao); _RoomNotSupportFunctionList.AddRange(SPK.EnvironDeviceSpkList()); //_RoomNotSupportFunctionList.AddRange(SPK.ArmSensorSpkList()); } @@ -162,6 +171,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(); @@ -198,7 +215,7 @@ } catch (Exception ex) { - Log("root erorr : " + ex.Message); + Log("Error", "root erorr : " + ex.StackTrace); } finally { @@ -222,36 +239,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> @@ -479,11 +496,11 @@ UserBasePage.LoadPage(); BasePageView.PageIndex = 0; - if (isFirstOpen) - { - //鍚姩瀵嗙爜楠岃瘉 - new AppUnlockPage().LoadPage(isFirstOpen); - } + //if (isFirstOpen) + //{ + // //鍚姩瀵嗙爜楠岃瘉 + // new AppUnlockPage().LoadPage(isFirstOpen); + //} //涓婚〉鍔犺浇瀹屾垚,鍥炶皟浜嬩欢 pageShowEvent?.Invoke(); pageShowEvent = null; @@ -508,18 +525,18 @@ }).Start(); - try - { -#if __ANDROID__ - Com.Chteam.Agent.BuglyAgentHelper.SetUserId(UserInfo.Current.AccountString); -#else - Bugly.Bugly.SetUserIdentifier(UserInfo.Current.AccountString); -#endif - } - catch (Exception ex) - { - MainPage.Log("Bugly error"); - } +// try +// { +//#if __ANDROID__ +// //Com.Chteam.Agent.BuglyAgentHelper.SetUserId(UserInfo.Current.AccountString); +//#else +// //Bugly.Bugly.SetUserIdentifier(UserInfo.Current.AccountString); +//#endif +// } +// catch (Exception ex) +// { +// MainPage.Log("Bugly error"); +// } } /// <summary> @@ -619,9 +636,11 @@ public static void Log(string msg) { #if DEBUG - //if (msg.Contains("鏀跺埌鏁版嵁") - // || msg.Contains("鍙戦��") - // ) + if (msg.Contains("鏀跺埌") + //|| msg.Contains("鍙戦��") + //|| msg.Contains("鎺ユ敹") + || true + ) Console.WriteLine(msg); #endif } @@ -635,6 +654,14 @@ #if DEBUG Console.WriteLine($"{tag}-->{msg}"); #endif + if (tag == "error") + { + new System.Threading.Thread(async () => + { + await Common.AliyunLog.AliyunLogClient.PostLogs("鑷畾涔塃rror鏃ュ織", msg); + }) + { IsBackground = true }.Start(); + } } -- Gitblit v1.8.0