From ba275a7b58e56c61820ffccc86571447b2997e52 Mon Sep 17 00:00:00 2001 From: JLChen <551775569@qq.com> Date: 星期四, 05 八月 2021 16:18:00 +0800 Subject: [PATCH] 2021-08-05 1.更新 --- HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 132 +++++++++++++++++++------------------------ 1 files changed, 58 insertions(+), 74 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs index aaa80a9..5adc74f 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs @@ -4,6 +4,7 @@ using HDL_ON.UI.CSS; using System.Collections.Generic; using HDL_ON.DAL.Server; +using HDL_ON.UI.UI2.EnvironmentalScience; namespace HDL_ON.UI { @@ -127,7 +128,7 @@ Gravity = Gravity.CenterHorizontal, Y = Application.GetRealHeight(52), Width = Application.GetRealWidth(343 - 32), - Height = Application.GetRealHeight(270), + Height = Application.GetRealWidth(270), }; diagramView.AddChidren(historyDataView); @@ -359,7 +360,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(43), - TextID = StringId.ExtremelyCold, + TextID = StringId.SlightlyCold, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -474,7 +475,7 @@ tipValuesView.AddChidren(new Button() { Width = Application.GetRealWidth(151), - Text = "70", + Text = "40%", TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -482,7 +483,7 @@ tipValuesView.AddChidren(new Button() { Width = Application.GetRealWidth(151), - Text = "40", + Text = "70%", TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -490,7 +491,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), - TextID = StringId.SensorReferenceTVOCTipLevel1, + TextID = StringId.SensorReferenceHumidityTipLevel1, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -498,7 +499,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), - TextID = StringId.SensorReferenceTVOCTipLevel2, + TextID = StringId.SensorReferenceHumidityTipLevel2, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -506,7 +507,7 @@ tipTextView.AddChidren(new Button() { Width = Application.GetRealWidth(101), - TextID = StringId.SensorReferenceTVOCTipLevel3, + TextID = StringId.SensorReferenceHumidityTipLevel3, TextAlignment = TextAlignment.Center, TextColor = CSS_Color.FirstLevelTitleColor, TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel, @@ -594,18 +595,18 @@ }; selfInfoView.AddChidren(btnSeltSensorValue); - Button btnShowData; - btnShowData = new Button() - { - X = Application.GetRealWidth(291), - Y = Application.GetRealWidth(62), - Width = Application.GetMinRealAverage(32), - Height = Application.GetMinRealAverage(32), - UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIcon.png", - SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png", - IsSelected = true, - }; - selfInfoView.AddChidren(btnShowData); + //Button btnShowData; + //btnShowData = new Button() + //{ + // X = Application.GetRealWidth(291), + // Y = Application.GetRealWidth(62), + // Width = Application.GetMinRealAverage(32), + // Height = Application.GetMinRealAverage(32), + // UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIcon.png", + // SelectedImagePath = "FunctionIcon/EnvironmentalScience/DiagramIconOn.png", + // IsSelected = true, + //}; + //selfInfoView.AddChidren(btnShowData); //btnShowData.MouseUpEventHandler = (sender, e) => { // btnShowData.IsSelected = !btnShowData.IsSelected; // if(btnShowData.IsSelected) @@ -643,7 +644,9 @@ bool initTitleButton = true; - foreach (var tempSensor in FunctionList.List.GetEnvirSensorsList()) + var tempList = FunctionList.List.GetEnvirSensorsList(); + + foreach (var tempSensor in tempList) { if (tempSensor.sid == function.sid) { @@ -674,7 +677,7 @@ #region 鍏跺畠浼犳劅鍣ㄤ俊鎭爮 FrameLayout otherInfoView = new FrameLayout() { - Gravity = Gravity.CenterVertical, + Gravity = Gravity.CenterHorizontal, Width = Application.GetRealWidth(343), Height = Application.GetRealWidth(100), BackgroundColor = CSS_Color.MainBackgroundColor, @@ -738,7 +741,11 @@ { Action backAction = () => { - btnSeltSensorName.Text = tempSensor.name; + MainPage.Log("45678i"); + Application.RunOnMainThread(() => + { + btnSeltSensorName.Text = tempSensor.name; + }); }; var infoView = new FunctionBaseInfoSetPage(tempSensor, backAction); MainPage.BasePageView.AddChidren(infoView); @@ -773,21 +780,26 @@ btnShowData1.IsSelected = !btnShowData1.IsSelected; if (btnShowData1.IsSelected) { - if (!showFunctions.Contains(function)) + if (!showFunctions.Contains(tempSensor)) { - showFunctions.Add(function); + showFunctions.Add(tempSensor); } } else { - if (showFunctions.Contains(function)) + if (showFunctions.Contains(tempSensor)) { - showFunctions.Remove(function); + showFunctions.Remove(tempSensor); } } LoadMothed_GetSensorHistoryData(); }; #endregion + + contentView.AddChidren(new Button() + { + Height = Application.GetRealHeight(12), + }); } #endregion @@ -805,12 +817,8 @@ /// <summary> /// 璇诲彇浼犳劅鍣ㄥ巻鍙叉暟鎹� /// </summary> - void LoadMothed_GetSensorHistoryData() + void LoadMothed_GetSensorHistoryData( ) { - string echartRootJsonString; - EchartsOption echartRootJson = new EchartsOption(); - var seriesList = new List<EchartSeriesItem>(); - echartRootJson.xAxis.data = new List<string>(); var loadPage = new Loading() { LodingBackgroundColor = 0x88888888, }; @@ -824,8 +832,12 @@ loadPage.Start(Language.StringByID(StringId.PleaseWait)); }); int i = 0; - - foreach (var sr in FunctionList.List.GetEnvirSensorsList()) + + var ebl = new EchartsOption_BrokenLine(); + + string yDataString = ""; + + foreach (var sr in showFunctions) { if (sr.spk != function.spk) { @@ -837,63 +849,35 @@ continue; } - var sensorType = sr.spk.Split(".")[0]; - var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,sensorType); + var sensorType = sr.spk.Split(".")[1]; + var queryType = sr.GetAttrState("spk")==null? "value": sr.GetAttrState("spk"); + var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, queryType); if (revertObj != null) { if (revertObj.Code == StateCode.SUCCESS) { var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString()); - var sItem = new EchartSeriesItem + if (i == 0) { - name = sr.GetRoomListName(), - data = new List<int>(), - lineStyle = new EchartLineStyle() + List<string> vs = new List<string>(); + foreach(var data in revertData) { - color = tipColorStringList[i], -#if __IOS__ - width = 5, -#elif __ANDROID__ - width = 2, -#endif - }, - }; - - foreach (var d in revertData) - { - echartRootJson.xAxis.data.Add(d.fieldName); - echartRootJson.yAxis.data.Add(d.fieldValue); + vs.Add(data.fieldName); + } + ebl.InitXdataText(vs); } - seriesList.Add(sItem); - } - else - { - Application.RunOnMainThread(() => - { - IMessageCommon.Current.ShowErrorInfoAlter("", true, 2, Language.StringByID(StringId.GetSensorHistoryFailed),false); - //new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GetSensorHistoryFailed), true); - }); + yDataString += ebl.InitYdataText(sr.name, revertData, tipColorStringList[i]); } } i++; } - echartRootJson.series = seriesList; - -#if __IOS__ - echartRootJson.xAxis.axisLabel.fontSize = 22; - echartRootJson.yAxis.axisLabel.fontSize = 22; -#else - echartRootJson.xAxis.axisLabel.fontSize = 8; - echartRootJson.yAxis.axisLabel.fontSize = 8; -#endif - echartRootJsonString = Newtonsoft.Json.JsonConvert.SerializeObject(echartRootJson); Application.RunOnMainThread(() => { - myEchartsView.ShowWithOptionJsonString(echartRootJsonString); + myEchartsView.ShowWithOption(ebl.InitOption()); }); } @@ -929,7 +913,7 @@ btnShowHistroyData_Day.IsSelected = false; btnShowHistroyData_Month.IsSelected = true; btnShowHistroyData_Week.IsSelected = false; - curQueryType = "week"; + curQueryType = "month"; LoadMothed_GetSensorHistoryData(); }; btnShowHistroyData_Week.MouseUpEventHandler = (sender, e) => @@ -938,7 +922,7 @@ btnShowHistroyData_Day.IsSelected = false; btnShowHistroyData_Month.IsSelected = false; btnShowHistroyData_Week.IsSelected = true; - curQueryType = "month"; + curQueryType = "week"; LoadMothed_GetSensorHistoryData(); }; -- Gitblit v1.8.0