From a1b0ab7044100daaa7e0f1da2d2ca45e38098963 Mon Sep 17 00:00:00 2001
From: 陈嘉乐 <cjl@hdlchina.com.cn>
Date: 星期一, 29 三月 2021 09:13:25 +0800
Subject: [PATCH] 2021-3-29-2
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 198 +++++++++++++------------------------------------
1 files changed, 52 insertions(+), 146 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
index 95a0d55..29a41b3 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs
@@ -21,13 +21,14 @@
MyEchartsViewOn myEchartsView;
- Sensor sensor;
+ Sensor sensorTemp = new Sensor();
- List<Sensor> showSensors;
+ Function function;
+ List<Function> showFunctions;
/// <summary>
/// 褰撳墠鏌ヨ绫诲瀷
/// </summary>
- QueryType curQueryType = QueryType.NowDay;
+ string curQueryType = "hour";
List<uint> tipColorList = new List<uint>()
{
@@ -39,12 +40,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 +66,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 +139,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,9 +164,9 @@
};
diagramView.AddChidren(tipTextView);
- switch (sensor.functionType)
+ switch (function.spk)
{
- case FunctionType.PM25:
+ case SPK.SensorPm25:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
@@ -223,7 +224,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- //case FunctionType.PM25:
+ //case SPK.SensorPm25:
//_intervalValue.Add("0 ~ 35");
//_intervalValue.Add("36 ~ 75");
//_intervalValue.Add("76 ~ 115");
@@ -233,7 +234,7 @@
//_levelTextList.Add(StringId.MildPollution);
//_levelTextList.Add(StringId.HeavyPollution);
//break;
- case FunctionType.CO2:
+ case SPK.SensorCO2:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
@@ -291,7 +292,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- case FunctionType.Temp:
+ case SPK.SensorTemperature:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(50),
@@ -411,7 +412,7 @@
//_levelTextList.Add(StringId.);
//_levelTextList.Add(StringId.ExtremeHeat);
break;
- case FunctionType.TVOC:
+ case SPK.SensorTVOC:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(101),
@@ -469,7 +470,7 @@
TextSize = CSS_FontSize.PromptFontSize_SecondaryLevel,
});
break;
- case FunctionType.Humidity:
+ case SPK.SensorHumidity:
tipValuesView.AddChidren(new Button()
{
Width = Application.GetRealWidth(151),
@@ -552,7 +553,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 +567,7 @@
TextColor = CSS_Color.PromptingColor1,
TextAlignment = TextAlignment.CenterLeft,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
- Text = sensor.GetRoomListName()
+ Text = function.GetRoomListName()
};
selfInfoView.AddChidren(btnFromFoorAndRoom);
@@ -628,9 +629,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 +643,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.functionType != sensor.functionType)
+ if (tempSensor.spk != function.spk)
{
continue;
}
@@ -705,7 +706,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 +773,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 +791,7 @@
}
#endregion
- new TopViewDiv(bodyView, Language.StringByID(sensor.functionTypeNameId)).LoadTopView();
+ new TopViewDiv(bodyView, Language.StringByID(sensorTemp.GetFunctionTypeNameId(function.spk))).LoadTopView();
LoadMothed_GetSensorHistoryData();
LoadEvent_ChangeSensorHistoryShowType();
@@ -801,14 +802,6 @@
//------------
public partial class EnvironmentalSensorPage
{
- public enum QueryType
- {
- NowDay = 0,//褰撳ぉ
- NowMonth = 1,//鎸囧畾鏈�
- NowYear = 2,//浠婂勾
- LatelySevenDay = 3//鏈�杩戜竷澶�
- }
-
/// <summary>
/// 璇诲彇浼犳劅鍣ㄥ巻鍙叉暟鎹�
/// </summary>
@@ -830,89 +823,28 @@
Application.RunOnMainThread(() => {
loadPage.Start(Language.StringByID(StringId.PleaseWait));
});
- var curMonth = 0;
- if(curQueryType == QueryType.NowMonth)
- {
- curMonth = DateTime.Now.Month;
- }
int i = 0;
-
-//#if DEBUG
-// var sItem = new EchartSeriesItem
-// {
-// name = sensor.GetRoomListName(),
-// data = new List<int>(),
-// lineStyle = new EchartLineStyle()
-// {
-// color = tipColorStringList[i],
-//#if __IOS__
-// width = 5,
-//#elif __ANDROID__
-// width = 2,
-//#endif
-// },
-// };
-// Random random = new Random();
-// double level = 0.0;
-// int countddd = 24;
-// for (int j = 0; j < countddd; j++)
-// {
-// switch (sensor.functionType)
-// {
-// case FunctionType.PM25:
-// level = Math.Round(random.NextDouble() * 130, 0);
-// break;
-// case FunctionType.CO2:
-// level = Math.Round(random.NextDouble() * 6000, 0);
-// break;
-// case FunctionType.Temp:
-// level = Math.Round(random.NextDouble() * 40, 0);
-// break;
-// case FunctionType.TVOC:
-// level = Math.Round(random.NextDouble() * 10, 1);
-// break;
-// case FunctionType.Humidity:
-// level = Math.Round(random.NextDouble() * 100, 0);
-// break;
-// }
-// sItem.data.Add((int)level);
-// }
-// seriesList.Add(sItem);
-// 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);
-// });
-//#endif
-
- foreach (var sr in FunctionList.List.sensorsEnvironmentalScience)
+
+ foreach (var sr in FunctionList.List.GetEnvirSensorsList())
{
- if (sr.functionType != sensor.functionType)
+ 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 revertObj = new HttpServerRequest().GetSensorHistory(sr.bus.SubnetID, sr.bus.DeviceID,
- 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus.LoopId, curMonth,
- DB_ResidenceData.Instance.residenceGatewayMAC);
+
+ var sensorType = sr.spk.Split(".")[0];
+ var revertObj = new HttpServerRequest().GetSensorHistory(curQueryType, sr.deviceId,sensorType);
if (revertObj != null)
{
- if (revertObj.StateCode == StateCode.SUCCESS)
+ if (revertObj.Code == StateCode.SUCCESS)
{
- var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<SensorPushHistoryRes>>(revertObj.ResponseData.ToString());
+ var revertData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<EnvironmentalSensorHistor>>(revertObj.Data.ToString());
var sItem = new EchartSeriesItem
{
@@ -929,34 +861,10 @@
},
};
- int ass = 0;
- for (int j = 0; j < revertData.Count; j++)
+ foreach (var d in revertData)
{
- if (curQueryType == QueryType.NowMonth && revertData[j].CreatedOnUtc.Day > DateTime.Now.Day)
- {
- continue;
- }
- if (revertData[j].TargetValue.ToString() != "NaN")
- {
- ass = Convert.ToInt32(revertData[j].TargetValue);
- }
- else
- {
- ass = 0;
- }
- sItem.data.Add(ass);
- switch (curQueryType)
- {
- case QueryType.NowDay:
- echartRootJson.xAxis.data.Add(revertData[j].CreatedOnUtc.Hour.ToString());
- break;
- case QueryType.LatelySevenDay:
- echartRootJson.xAxis.data.Add(System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.GetDayName(revertData[j].CreatedOnUtc.DayOfWeek));
- break;
- case QueryType.NowMonth:
- echartRootJson.xAxis.data.Add(revertData[j].CreatedOnUtc.Day.ToString());
- break;
- }
+ echartRootJson.xAxis.data.Add(d.fieldName);
+ echartRootJson.yAxis.data.Add(d.fieldValue);
}
seriesList.Add(sItem);
}
@@ -964,7 +872,8 @@
{
Application.RunOnMainThread(() =>
{
- new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GetSensorHistoryFailed), true);
+ IMessageCommon.Current.ShowErrorInfoAlter("", true, 2, Language.StringByID(StringId.GetSensorHistoryFailed),false);
+ //new PublicAssmebly().TipMsgAutoClose(Language.StringByID(StringId.GetSensorHistoryFailed), true);
});
}
}
@@ -1010,7 +919,7 @@
btnShowHistroyData_Day.IsSelected = true;
btnShowHistroyData_Month.IsSelected = false;
btnShowHistroyData_Week.IsSelected = false;
- curQueryType = QueryType.NowDay;
+ curQueryType = "hour";
LoadMothed_GetSensorHistoryData();
};
@@ -1020,7 +929,7 @@
btnShowHistroyData_Day.IsSelected = false;
btnShowHistroyData_Month.IsSelected = true;
btnShowHistroyData_Week.IsSelected = false;
- curQueryType = QueryType.NowMonth;
+ curQueryType = "week";
LoadMothed_GetSensorHistoryData();
};
btnShowHistroyData_Week.MouseUpEventHandler = (sender, e) =>
@@ -1029,7 +938,7 @@
btnShowHistroyData_Day.IsSelected = false;
btnShowHistroyData_Month.IsSelected = false;
btnShowHistroyData_Week.IsSelected = true;
- curQueryType = QueryType.LatelySevenDay;
+ curQueryType = "month";
LoadMothed_GetSensorHistoryData();
};
@@ -1041,17 +950,14 @@
}
}
- public class SensorPushHistoryRes
+ public class EnvironmentalSensorHistor
{
+ /// <summary>
+ /// </summary>
+ public string fieldName { get; set; }
/// <summary>
- /// 瀹為檯鐩爣鍊�
/// </summary>
- public float TargetValue { get; set; }
-
- /// <summary>
- /// 鏌ヨ鐨勬椂闂撮泦缇�
- /// </summary>
- public DateTime CreatedOnUtc { get; set; }
+ public string fieldValue { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.8.0