From 0891d90cd0d435338cc2851fd0830cd318a17fff Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期三, 23 十二月 2020 14:25:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/WJC' into NewFilePath
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 069664f..361871c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -284,7 +284,7 @@
bodyView.AddChidren(contentView);
#region 鎴块棿椤堕儴鍒囨崲鏄剧ず鍖哄煙
- room = new Room() { name = Language.StringByID(StringId.All), sid = ""};
+ room = new Room() { roomName = Language.StringByID(StringId.All)};
//if (DB_ResidenceData.rooms.Count > 0)
//{
// room = DB_ResidenceData.rooms[0];
@@ -308,7 +308,7 @@
TextColor = CSS_Color.FirstLevelTitleColor,
TextSize = CSS_FontSize.PromptFontSize_FirstLevel,
TextAlignment = TextAlignment.CenterLeft,
- Text = room.name,
+ Text = room.roomName,
};
contentView.AddChidren(btnRoom);
@@ -353,7 +353,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++;
@@ -365,13 +365,9 @@
/// </summary>
void LoadSensorDiv(Sensor sensor,int index)
{
- if (room.sid == "" || sensor.roomIdList.Contains(room.sid))
+ 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 +418,13 @@
};
sensorView.AddChidren(btnSensorTitle);
btnSensorTitle.MouseUpEventHandler = (sender, e) => {
- var esp = new EnvironmentalSensorPage(sensor);
- MainPage.BasePageView.AddChidren(esp);
- esp.LoadPage();
- MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ return;
+ #region F3闃舵
+ //var esp = new EnvironmentalSensorPage(sensor);
+ //MainPage.BasePageView.AddChidren(esp);
+ //esp.LoadPage();
+ //MainPage.BasePageView.PageIndex = MainPage.BasePageView.ChildrenCount - 1;
+ #endregion
};
var btnInfoIcon = new Button()
@@ -470,7 +469,7 @@
};
sensorView.AddChidren(btnLevel);
- Control.ins.SendReadCommand(sensor);
+ Control.Ins.SendReadCommand(sensor);
}
}
@@ -657,10 +656,10 @@
};
dispalyView.AddChidren(contentView);
- if (DB_ResidenceData.rooms.Count < 2)
+ if (SpatialInfo.CurrentSpatial.RoomList.Count < 2)
{
}
- else if (DB_ResidenceData.rooms.Count < 3)
+ else if (SpatialInfo.CurrentSpatial.RoomList.Count < 3)
{
dispalyView = new FrameLayout()
{
@@ -675,7 +674,7 @@
contentView.Height = Application.GetRealHeight(45 * 3);
dispalyView.AddChidren(contentView);
}
- else if (DB_ResidenceData.rooms.Count < 4)
+ else if (SpatialInfo.CurrentSpatial.RoomList.Count < 4)
{
dispalyView = new FrameLayout()
{
@@ -709,12 +708,12 @@
var showListRoom = new List<Room>();
- showListRoom.Add(new Room() { name = Language.StringByID(StringId.All),sid = "" });
- showListRoom.AddRange(DB_ResidenceData.rooms);
+ showListRoom.Add(new Room() { roomName = Language.StringByID(StringId.All) });
+ showListRoom.AddRange(SpatialInfo.CurrentSpatial.RoomList);
foreach (var roomTemp in showListRoom)
{
- string roomName = roomTemp.name;
+ string roomName = roomTemp.roomName;
var btnRoomName = new Button()
{
Gravity = Gravity.CenterHorizontal,
--
Gitblit v1.8.0