From e89fc7322f0199a9d46ec70ae850ab1a41b0fe3e Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 19 十二月 2020 13:12:41 +0800
Subject: [PATCH] 2020-12-19 1.1.iOS和Android 获取天气失败问题，修复调整处理。 2.Android增加网络监听事件，和iOS封装统一监听处理接口。
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
old mode 100644
new mode 100755
index 1e3b744..659d396
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
@@ -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++;
@@ -368,9 +368,9 @@
if (room.roomId == "" || sensor.roomIds.Contains(room.roomId))
{
var sensorTag = sensor.sid;
- if (sensor.bus_Data != null)
+ if (sensor.bus != null)
{
- sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.loopId;
+ sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus.SubnetID + "_" + sensor.bus.DeviceID + "_" + sensor.bus.LoopId;
}
FrameLayout sensorView = new FrameLayout()
{
--
Gitblit v1.8.0