From 6d73bf6e816570291865674bef8bce8972e4de3f Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 01 十二月 2021 16:32:57 +0800
Subject: [PATCH] 2021-12-01-01
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 86 ++++++++++++++++++++++++++++--------------
1 files changed, 57 insertions(+), 29 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 0460482..de2bdaa 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -26,6 +26,7 @@
Function function;
List<Function> showFunctions;
+ List<Function> sensorList;
/// <summary>
/// 褰撳墠鏌ヨ绫诲瀷
/// </summary>
@@ -45,6 +46,17 @@
{
bodyView = this;
function = ss;
+ showFunctions = new List<Function>();
+ showFunctions.Add(ss);
+ sensorList = FunctionList.List.GetEnvirSensorsList();
+ }
+
+
+ public EnvironmentalSensorPage(Function ss,List<Function> functions)
+ {
+ bodyView = this;
+ function = ss;
+ sensorList = functions;
showFunctions = new List<Function>();
showFunctions.Add(ss);
}
@@ -118,7 +130,7 @@
TextColor = CSS_Color.PromptingColor2,
SelectedTextColor = CSS_Color.MainColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = DateTime.Now.Month.ToString() + Language.StringByID(StringId.month),
+ Text = Language.StringByID(StringId.month),//DateTime.Now.Month.ToString() +
};
showDataTypeView.AddChidren(btnShowHistroyData_Month);
#endregion
@@ -128,7 +140,7 @@
Gravity = Gravity.CenterHorizontal,
Y = Application.GetRealHeight(52),
Width = Application.GetRealWidth(343 - 32),
- Height = Application.GetRealHeight(270),
+ Height = Application.GetRealWidth(270),
};
diagramView.AddChidren(historyDataView);
@@ -360,7 +372,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,
@@ -475,7 +487,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,
@@ -483,7 +495,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,
@@ -491,7 +503,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,
@@ -499,7 +511,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,
@@ -507,7 +519,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,
@@ -595,18 +607,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)
@@ -644,7 +656,8 @@
bool initTitleButton = true;
- foreach (var tempSensor in FunctionList.List.GetEnvirSensorsList())
+
+ foreach (var tempSensor in sensorList)
{
if (tempSensor.sid == function.sid)
{
@@ -675,7 +688,7 @@
#region 鍏跺畠浼犳劅鍣ㄤ俊鎭爮
FrameLayout otherInfoView = new FrameLayout()
{
- Gravity = Gravity.CenterVertical,
+ Gravity = Gravity.CenterHorizontal,
Width = Application.GetRealWidth(343),
Height = Application.GetRealWidth(100),
BackgroundColor = CSS_Color.MainBackgroundColor,
@@ -739,7 +752,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);
@@ -774,21 +791,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
@@ -826,7 +848,7 @@
string yDataString = "";
- foreach (var sr in FunctionList.List.GetEnvirSensorsList())
+ foreach (var sr in showFunctions)
{
if (sr.spk != function.spk)
{
@@ -839,7 +861,13 @@
}
var sensorType = sr.spk.Split(".")[1];
- var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,"value");
+ var queryType = sr.GetAttrState("spk").ToString();
+ if(queryType == "0")
+ {
+ queryType = "value";
+ }
+
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId, queryType);
if (revertObj != null)
{
if (revertObj.Code == StateCode.SUCCESS)
--
Gitblit v1.8.0