From e247662a35dec4815041ff857015539a495c3205 Mon Sep 17 00:00:00 2001 From: hxb <hxb@hdlchina.com.cn> Date: 星期四, 15 九月 2022 16:20:19 +0800 Subject: [PATCH] 完善的光伏功能 --- HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 79 ++++++++++++++++++++++++++++----------- 1 files changed, 57 insertions(+), 22 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs index 1ee95b0..b125a74 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs @@ -1,9 +1,11 @@ 锘縰sing System; using System.Collections.Generic; using HDL_ON.DAL.Server; +using HDL_ON.DriverLayer; using HDL_ON.Entity; using HDL_ON.UI; using HDL_ON.UI.CSS; +using Newtonsoft.Json.Linq; using Shared; namespace HDL_ON.UI @@ -734,7 +736,7 @@ } - if(functionCount == 0) + if (functionCount == 0) { continue; } @@ -933,7 +935,8 @@ break; case ShowFunction.DoorLock: btnName.TextID = StringId.DoorLock; - btnFunctionViewBg.MouseUpEventHandler = (sende, e) => { + btnFunctionViewBg.MouseUpEventHandler = (sende, e) => + { var form = new DoorLockListPage(); form.AddForm(FunctionList.List.GetDoorLockList()); }; @@ -963,7 +966,8 @@ case ShowFunction.EnergyMonitoring: #region 鑳芥簮鐩戞祴 btnName.TextID = StringId.EnergyMonitoring; - btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { + btnFunctionViewBg.MouseUpEventHandler = (sender, e) => + { var skipView = new EnergyMainPage(); MainPage.BasePageView.AddChidren(skipView); skipView.LoadPage(); @@ -1054,7 +1058,7 @@ } //鐣岄潰璺宠浆--闊充箰璺宠浆鑷繁鐨勭晫闈�--鐜璺宠浆鑷繁鐨勭晫闈� if (item != ShowFunction.Music && item != ShowFunction.Environmental && item != ShowFunction.SecurityMonitoring && item != ShowFunction.DoorLock - && ShowFunction.EnergyMonitoring!= item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item) + && ShowFunction.EnergyMonitoring != item && ShowFunction.VideoIntercom != item && ShowFunction.SecurityCenter != item) { btnFunctionViewBg.MouseUpEventHandler = (sender, e) => { @@ -1066,22 +1070,22 @@ } index++; } - + bool debugFlag = false; - #if DEBUG +#if DEBUG debugFlag = true; - #endif +#endif //鍏変紡鏁版嵁 - if (FunctionList.List.InverterList.Count > 0|| debugFlag) + if (FunctionList.List.InverterList.Count > 0 || debugFlag) { FrameLayout inverterListView = new FrameLayout() { Height = Application.GetRealHeight(223), Radius = (uint)Application.GetRealWidth(6), BackgroundColor = CSS_Color.MainBackgroundColor, - Tag = "inverterList_View", + Tag = "inverterList_View", Y = index % 2 == 1 ? lastY2 : lastY1 }; if (index % 2 == 1) @@ -1200,9 +1204,10 @@ var clickButton = new Button(); inverterListView.AddChidren(clickButton); - clickButton.MouseUpEventHandler = (sender2, e2) => { + clickButton.MouseUpEventHandler = (sender2, e2) => + { var h5BasePage = new FrameLayout(); - + #if __Android__ //閫傞厤瀹夊崜娌夋蹈寮忓鑸爮 h5BasePage.Y = Application.GetRealHeight(16); @@ -1210,26 +1215,56 @@ #endif MainPage.BasePageView.AddChidren(h5BasePage); MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1; - - h5BasePage.AddChidren(Inverter.Ins.H5Page); - Inverter.Ins.ShowWebviewFormUrl($"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}"); - Inverter.Ins.H5Page.JSToNativeAction = (pairs) => { - MainPage.Log("xxxx"); + h5BasePage.AddChidren(Inverter.Ins.H5Page);//000 + string url = $"h5/index.html?homeId={DB_ResidenceData.Instance.CurrentRegion.id}&token={UserInfo.Current.AccessToken}&refresh_token={UserInfo.Current.RefreshToken}&url={HttpUtil.GlobalRequestHttpsHost}"; + Inverter.Ins.ShowWebviewFormUrl(url); + Inverter.Ins.H5Page.JSToNativeAction = (dictionary) => + { + JObject jObj = JObject.Parse(Newtonsoft.Json.JsonConvert.SerializeObject(dictionary)); + + if (!jObj.ContainsKey("method") || !jObj.ContainsKey("data")) + { + return; + } + if (jObj["method"].ToString() == "control" && jObj["data"].Type == JTokenType.Object) + {//鎺у埗 + var data = JObject.FromObject(jObj["data"]); + + if (!data.ContainsKey("sid") || !data.ContainsKey("on_off")) + { + return; + } + var function = new Function(); + function.sid = data["sid"].ToString(); + var inObj = FunctionList.List.InverterList.Find((obj) => obj.sid == function.sid); + if (inObj == null) + { + return; + } + function.deviceId = inObj.deviceId; + //function.spk = inObj.spk; + + var status = new Dictionary<string, string>() { ["on_off"] = data["on_off"].ToString() }; + Control.Ins.SendWriteCommand(function, status); + } + else if (jObj["method"].ToString() == "back") + { + Application.RunOnMainThread(() => + { + Inverter.Ins.H5Page.RemoveFromParent(); + }); + } }; - Inverter.Ins.H5Page.CallJS(""); - //Inverter.Ins.H5Page.DidFinishAction = () => { - - //}; }; index++; } - s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight+ Application.GetRealWidth(40); + s1View.Height = s2View.Height = functionContentView.Height = functionContentViewHeight + Application.GetRealWidth(40); -#endregion + #endregion } #region 鍒囨崲妤煎眰 -- Gitblit v1.8.0