From 24068547ed1396034f56c7bd34ecbd2891f00653 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期一, 10 五月 2021 17:39:28 +0800
Subject: [PATCH] 代码优化
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 119 ++++++++++++++++++++++-------------------------------------
1 files changed, 45 insertions(+), 74 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 594196b..0ddb270 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
{
@@ -21,9 +22,10 @@
MyEchartsViewOn myEchartsView;
- Sensor sensor;
+ Sensor sensorTemp = new Sensor();
- List<Sensor> showSensors;
+ Function function;
+ List<Function> showFunctions;
/// <summary>
/// 褰撳墠鏌ヨ绫诲瀷
/// </summary>
@@ -39,12 +41,12 @@
"#80AEFF","#FFD154","#FF9D54","#FE6A6A","#B183C3","#ADE764",
};
- public EnvironmentalSensorPage(Sensor ss)
+ public EnvironmentalSensorPage(Function ss)
{
bodyView = this;
- sensor = ss;
- showSensors = new List<Sensor>();
- showSensors.Add(ss);
+ function = ss;
+ showFunctions = new List<Function>();
+ showFunctions.Add(ss);
}
public void LoadPage()
@@ -65,7 +67,7 @@
{
Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(420),
+ Height = Application.GetRealWidth(420),
BackgroundColor = CSS_Color.MainBackgroundColor,
Radius = (uint)Application.GetRealWidth(12),
BorderColor = 0x00000000,
@@ -138,7 +140,7 @@
HorizontalScrolViewLayout tipValuesView = new HorizontalScrolViewLayout()
{
Gravity = Gravity.CenterHorizontal,
- Y = Application.GetRealHeight(348),
+ Y = Application.GetRealWidth(348),
Width = Application.GetRealWidth(303),
Height = Application.GetRealHeight(30),
};
@@ -163,7 +165,7 @@
};
diagramView.AddChidren(tipTextView);
- switch (sensor.spk)
+ switch (function.spk)
{
case SPK.SensorPm25:
tipValuesView.AddChidren(new Button()
@@ -552,7 +554,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = sensor.name,
+ Text = function.name,
IsBold = true,
};
selfInfoView.AddChidren(btnSeltSensorName);
@@ -566,7 +568,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = sensor.GetRoomListName()
+ Text = function.GetRoomListName()
};
selfInfoView.AddChidren(btnFromFoorAndRoom);
@@ -628,9 +630,9 @@
{
Action backAction = () =>
{
- btnSeltSensorName.Text = sensor.name;
+ btnSeltSensorName.Text = function.name;
};
- var infoView = new FunctionBaseInfoSetPage(sensor, backAction);
+ var infoView = new FunctionBaseInfoSetPage(function, backAction);
MainPage.BasePageView.AddChidren(infoView);
infoView.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
@@ -642,13 +644,13 @@
bool initTitleButton = true;
- foreach (var tempSensor in FunctionList.List.sensorsEnvironmentalScience)
+ foreach (var tempSensor in FunctionList.List.GetEnvirSensorsList())
{
- if (tempSensor.sid == sensor.sid)
+ if (tempSensor.sid == function.sid)
{
continue;
}
- if (tempSensor.spk != sensor.spk)
+ if (tempSensor.spk != function.spk)
{
continue;
}
@@ -705,7 +707,7 @@
TextAlignment = TextAlignment.CenterLeft,
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.TextFontSize,
- Text = sensor.name,
+ Text = function.name,
IsBold = true,
};
otherInfoView.AddChidren(btnSensorName);
@@ -772,16 +774,16 @@
btnShowData1.IsSelected = !btnShowData1.IsSelected;
if (btnShowData1.IsSelected)
{
- if (!showSensors.Contains(sensor))
+ if (!showFunctions.Contains(function))
{
- showSensors.Add(sensor);
+ showFunctions.Add(function);
}
}
else
{
- if (showSensors.Contains(sensor))
+ if (showFunctions.Contains(function))
{
- showSensors.Remove(sensor);
+ showFunctions.Remove(function);
}
}
LoadMothed_GetSensorHistoryData();
@@ -790,7 +792,7 @@
}
#endregion
- new TopViewDiv(bodyView, Language.StringByID(sensor.functionTypeNameId)).LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(sensorTemp.GetFunctionTypeNameId(function.spk))).LoadTopView();
LoadMothed_GetSensorHistoryData();
LoadEvent_ChangeSensorHistoryShowType();
@@ -804,12 +806,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,
};
@@ -823,75 +821,51 @@
loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
int i = 0;
-
- foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
+
+ var ebl = new EchartsOption_BrokenLine();
+
+ string yDataString = "";
+
+ foreach (var sr in FunctionList.List.GetEnvirSensorsList())
{
- if (sr.spk != sensor.spk)
+ if (sr.spk != function.spk)
{
continue;
}
- if (showSensors.Find((obj) => obj.sid == sr.sid) == null)
+ if (showFunctions.Find((obj) => obj.sid == sr.sid) == null)
{
i++;
continue;
}
- var sensorType = sr.spk.Split(".")[0];
+ var sensorType = sr.spk.Split(".")[1];
var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,sensorType);
-
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.InitXdata(vs);
}
- seriesList.Add(sItem);
- }
- else
- {
- Application.RunOnMainThread(() =>
- {
- new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GetSensorHistoryFailed), true);
- });
+ yDataString += ebl.GetYdata(sr.name, revertData, tipColorStringList[i]);
}
}
i++;
}
- echartRootJson.series = seriesList;
+ ebl.InitYdataString(yDataString);
-
-#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.optionString);
});
}
@@ -927,7 +901,7 @@
btnShowHistroyData_Day.IsSelected = false;
btnShowHistroyData_Month.IsSelected = true;
btnShowHistroyData_Week.IsSelected = false;
- curQueryType = "week";
+ curQueryType = "month";
LoadMothed_GetSensorHistoryData();
};
btnShowHistroyData_Week.MouseUpEventHandler = (sender, e) =>
@@ -936,16 +910,13 @@
btnShowHistroyData_Day.IsSelected = false;
btnShowHistroyData_Month.IsSelected = false;
btnShowHistroyData_Week.IsSelected = true;
- curQueryType = "month";
+ curQueryType = "week";
LoadMothed_GetSensorHistoryData();
};
}
- void LoadEvent_SwitchOtherRoomSensorData()
- {
- }
}
public class EnvironmentalSensorHistor
--
Gitblit v1.8.0