From 884a8ce78b6d198a5878e85fc30cb85177e59826 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期二, 08 八月 2023 10:04:36 +0800 Subject: [PATCH] 三相空开验收 --- HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs index c75fe65..1007679 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs @@ -1290,7 +1290,7 @@ int count = 0; foreach (var temp in FunctionList.List.InverterList()) { - if (temp.online) + if (temp.isOnline()) { if (temp.trait_on_off.state.ToString() == "on") { @@ -1447,9 +1447,19 @@ { lz = "en"; } - string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}&weather={MainPage.cityInfo.weather}"; + string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={OnAppConfig.Instance.RequestHttpsHost}&language={lz}"; Inverter.Ins.ShowWebviewFormUrl(url); + new System.Threading.Thread(() => + { + System.Threading.Thread.Sleep(2000); + Application.RunOnMainThread(() => + { + var status = new Dictionary<string, object> { ["method"] = "weather", ["data"] = MainPage.cityInfo.weather }; + Inverter.Ins.H5Page.CallJS($"nativeToJs(\'{Newtonsoft.Json.JsonConvert.SerializeObject(status)}\')"); + }); + }) + { IsBackground = true }.Start(); Inverter.Ins.H5Page.JSToNativeAction = (dictionary) => { #if __IOS__ -- Gitblit v1.8.0