From a715181089be0d31cd737a5367ffd02690b9d77f Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 12 十一月 2020 13:36:01 +0800
Subject: [PATCH] 20201112
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 98 +++++++++++++++++++++++++------------------------
1 files changed, 50 insertions(+), 48 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index a390242..069664f 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -3,6 +3,7 @@
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using System.Collections.Generic;
+using HDL_ON.DriverLayer;
namespace HDL_ON.UI
{
@@ -283,11 +284,11 @@
bodyView.AddChidren(contentView);
#region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
- room = new Room();
- if (DB_ResidenceData.residenceData.rooms.Count > 0)
- {
- room = DB_ResidenceData.residenceData.rooms[0];
- }
+ room = new Room() { name = Language.StringByID(StringId.All), sid = ""};
+ //if (DB_ResidenceData.rooms.Count > 0)
+ //{
+ // room = DB_ResidenceData.rooms[0];
+ //}
btnFoorDownIcon = new Button()
{
Width = Application.GetMinRealAverage(16),
@@ -331,16 +332,10 @@
};
contentView.AddChidren(sensorListView);
- int index = 0;
- foreach(var sensor in DB_ResidenceData.residenceData.functionList.sensorsEnvironmentalScience)
- {
- if ( sensor.functionType == FunctionType.WindPower)
- {
- continue;
- }
- LoadSensorDiv(sensor, index);
- index++;
- }
+ LoadSenesorList();
+
+ LoadEventList();
+
#endregion
@@ -350,12 +345,27 @@
new TopViewDiv(bodyView, Language.StringByID(StringId.EnvironmentalScience)).LoadTopView();
}
+
+ /// <summary>
+ /// 鍔犺浇浼犳劅鍣ㄥ垪琛�
+ /// </summary>
+ void LoadSenesorList()
+ {
+ sensorListView.RemoveAll();
+ int index = 0;
+ foreach (var sensor in DB_ResidenceData.functionList.sensorsEnvironmentalScience)
+ {
+ LoadSensorDiv(sensor, index);
+ index++;
+ }
+ }
+
/// <summary>
/// 鍔犺浇浼犳劅鍣ㄥ垪琛�
/// </summary>
void LoadSensorDiv(Sensor sensor,int index)
{
- if (sensor.roomIdList.Contains(room.sid))
+ if (room.sid == "" || sensor.roomIdList.Contains(room.sid))
{
var sensorTag = sensor.sid;
if (sensor.bus_Data != null)
@@ -418,21 +428,18 @@
MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
};
- if ( sensor.functionType != FunctionType.WindPower)
+ var btnInfoIcon = new Button()
{
- var btnInfoIcon = new Button()
- {
- X = Application.GetRealWidth(120),
- Width = Application.GetRealWidth(28),
- Height = Application.GetRealWidth(28),
- UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/TipInfoIcon.png",
- };
- sensorView.AddChidren(btnInfoIcon);
- btnInfoIcon.MouseUpEventHandler = (sender, e) =>
- {
- LoadInfo(sensor);
- };
- }
+ X = Application.GetRealWidth(120),
+ Width = Application.GetRealWidth(28),
+ Height = Application.GetRealWidth(28),
+ UnSelectedImagePath = "FunctionIcon/EnvironmentalScience/TipInfoIcon.png",
+ };
+ sensorView.AddChidren(btnInfoIcon);
+ btnInfoIcon.MouseUpEventHandler = (sender, e) =>
+ {
+ LoadInfo(sensor);
+ };
var btnSensorValues = new Button()
{
@@ -463,8 +470,7 @@
};
sensorView.AddChidren(btnLevel);
- //Control.Send(CommandType_A.read, sensor);
- Control.SendReadCommand(sensor);
+ Control.ins.SendReadCommand(sensor);
}
}
@@ -508,17 +514,9 @@
switch (sensor.functionType)
{
- case FunctionType.PM10:
- btnTitle.Text = "PM1.0(ug/m虏)";
- break;
case FunctionType.PM25:
btnTitle.Text = "PM2.5(ug/m虏)";
break;
- case FunctionType.WindPower:
-
- break;
- //case FunctionType.Noise:
- // break;
case FunctionType.Temp:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
break;
@@ -642,7 +640,7 @@
var dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(110),
BackgroundImagePath = "PersonalCenter/HomeList1bg.png",
@@ -659,15 +657,15 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.residenceData.rooms.Count < 2)
+ if (DB_ResidenceData.rooms.Count < 2)
{
}
- else if (DB_ResidenceData.residenceData.rooms.Count < 3)
+ else if (DB_ResidenceData.rooms.Count < 3)
{
dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(155),
BackgroundImagePath = "PersonalCenter/HomeList2bg.png",
@@ -677,12 +675,12 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.residenceData.rooms.Count < 4)
+ else if (DB_ResidenceData.rooms.Count < 4)
{
dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(200),
BackgroundImagePath = "PersonalCenter/HomeList3bg.png",
@@ -697,7 +695,7 @@
dispalyView = new FrameLayout()
{
X = Application.GetRealWidth(10),
- Y = Application.GetRealHeight(100),
+ Y = Application.GetRealHeight(266),
Width = Application.GetRealWidth(160),
Height = Application.GetRealHeight(245),
BackgroundImagePath = "PersonalCenter/HomeList4bg.png",
@@ -710,8 +708,11 @@
}
+ var showListRoom = new List<Room>();
+ showListRoom.Add(new Room() { name = Language.StringByID(StringId.All),sid = "" });
+ showListRoom.AddRange(DB_ResidenceData.rooms);
- foreach (var roomTemp in DB_ResidenceData.residenceData.rooms)
+ foreach (var roomTemp in showListRoom)
{
string roomName = roomTemp.name;
var btnRoomName = new Button()
@@ -735,6 +736,7 @@
dialog.Close();
btnRoom.Text = roomName;
room = roomTemp;
+ LoadSenesorList();
};
}
--
Gitblit v1.8.0