From 591a89a0980fbeba06770018d5e7ae580927861a Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期二, 09 三月 2021 10:12:30 +0800
Subject: [PATCH] 扫地机器人舍弃掉耗材管理，随机清扫，静音模式
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 1e3b744..cbd8d7e 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -285,10 +285,6 @@
#region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
room = new Room() { roomName = Language.StringByID(StringId.All)};
- //if (DB_ResidenceData.rooms.Count > 0)
- //{
- // room = DB_ResidenceData.rooms[0];
- //}
btnFoorDownIcon = new Button()
{
Width = Application.GetMinRealAverage(16),
@@ -353,7 +349,7 @@
{
sensorListView.RemoveAll();
int index = 0;
- foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ foreach (var sensor in FunctionList.List.sensorsEnvironmentalScience)
{
LoadSensorDiv(sensor, index);
index++;
@@ -368,10 +364,6 @@
if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
{
var sensorTag = sensor.sid;
- if (sensor.bus_Data != null)
- {
- sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.loopId;
- }
FrameLayout sensorView = new FrameLayout()
{
Width = Application.GetRealWidth(148),
@@ -422,10 +414,12 @@
};
sensorView.AddChidren(btnSensorTitle);
btnSensorTitle.MouseUpEventHandler = (sender, e) => {
+ #region
var esp = new EnvironmentalSensorPage(sensor);
MainPage.BasePageView.AddChidren(esp);
esp.LoadPage();
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ #endregion
};
var btnInfoIcon = new Button()
@@ -512,21 +506,21 @@
};
infoView.AddChidren(btnTitle);
- switch (sensor.functionType)
+ switch (sensor.spk)
{
- case FunctionType.PM25:
+ case SPK.SensorPm25:
btnTitle.Text = "PM2.5(ug/m虏)";
break;
- case FunctionType.Temp:
+ case SPK.SensorTemperature:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
- case FunctionType.TVOC:
+ case SPK.SensorTVOC:
btnTitle.Text = "TVOC(PPM)";
break;
- case FunctionType.CO2:
+ case SPK.SensorCO2:
btnTitle.Text = "CO2(PPM)";
break;
- case FunctionType.Humidity:
+ case SPK.SensorHumidity:
btnTitle.Text = Language.StringByID(StringId.Humidity) + "(%)";
break;
}
--
Gitblit v1.8.0