From 2d5cd35af7437ad4015d38594d8c721dc6166b11 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期二, 29 八月 2023 09:22:38 +0800 Subject: [PATCH] Merge branch 'wjc' of http://59.41.255.150:6688/r/~wxr/OnPro into wjc --- HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 65 +++++++++++++++++++++----------- 1 files changed, 43 insertions(+), 22 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs index 4e8ddcf..265338d 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs @@ -12,6 +12,9 @@ namespace HDL_ON.UI { + /// <summary> + /// 鍒嗙被鐣岄潰 + /// </summary> public partial class ClassificationPage : FrameLayout { @@ -711,8 +714,12 @@ break; case ShowFunction.Electric: #region 鐢靛櫒 + functionCount = FunctionList.List.GetElectricals().Count; functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count; +#if DEBUG + functionCount = 1; +#endif #endregion break; case ShowFunction.EnergyMonitoring: @@ -755,10 +762,6 @@ break; case ShowFunction.SecurityCenter: functionCount = FunctionList.List.securities.Count; - //if (DB_ResidenceData.Instance.GatewayType == 1) - //{ - // functionCount = 1; - //} break; case ShowFunction.Acst: functionCount = FunctionList.List.GetAcstParentList().Count; @@ -766,10 +769,9 @@ break; case ShowFunction.VideoDoorLock: functionCount = FunctionList.List.GetVideoDoorLockList().Count; -#if DEBUG - //functionCount = 1; -#endif - functionOnCount = 1; + functionOnCount = FunctionList.List.GetAcstParentList().FindAll((obj) => obj.GetAttrState("status").ToString() == "open" + || obj.GetAttrState("status").ToString() == "normal_open").Count; + break; case ShowFunction.Aks: functionCount = FunctionList.List.GetVideoControlsList().Count; @@ -833,10 +835,17 @@ IsMoreLines = true, }; functionView.AddChidren(btnName); - - if (item != ShowFunction.Environmental && item != ShowFunction.Sensor && item != ShowFunction.VideoIntercom - && item != ShowFunction.SecurityMonitoring && item != ShowFunction.FreshAir && item != ShowFunction.Music - && item != ShowFunction.EnergyMonitoring && item != ShowFunction.SecurityCenter + //鍘绘帀鍔熻兘澶栭潰寮�鍏充釜鏁�; + if (item != ShowFunction.Aks + && item != ShowFunction.VideoDoorLock + && item != ShowFunction.Environmental + && item != ShowFunction.Sensor + && item != ShowFunction.VideoIntercom + && item != ShowFunction.SecurityMonitoring + && item != ShowFunction.FreshAir + && item != ShowFunction.Music + && item != ShowFunction.EnergyMonitoring + && item != ShowFunction.SecurityCenter && item != ShowFunction.Acst && item != ShowFunction.IpCam && functionCount != 0) { @@ -1062,13 +1071,15 @@ case ShowFunction.EnergyMonitoring: #region 鑳芥簮鐩戞祴 btnName.TextID = StringId.EnergyMonitoring; - btnFunctionViewBg.MouseUpEventHandler = (sender, e) => - { - var skipView = new EnergyMainPage(); - MainPage.BasePageView.AddChidren(skipView); - skipView.LoadPage(); - MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - }; + functionPageTitleId = StringId.EnergyMonitoring; + + //btnFunctionViewBg.MouseUpEventHandler = (sender, e) => + //{ + // var skipView = new EnergyMainPage(); + // MainPage.BasePageView.AddChidren(skipView); + // skipView.LoadPage(); + // MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; + //}; #endregion break; case ShowFunction.Environmental: @@ -1230,7 +1241,7 @@ && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock - && ShowFunction.EnergyMonitoring != item + //&& ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item && ShowFunction.Series != item @@ -1311,7 +1322,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") { @@ -1468,9 +1479,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