From 17355977e81bb1f93862b5201424f60af9d093cf Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 05 十二月 2020 16:21:44 +0800
Subject: [PATCH] 2020-12-05 1.增加苹果推送处理。2.暂时通过推送实现，增加挤下线功能。
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSciencePage.cs
index 24d0579..de99368 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
{
@@ -364,12 +365,12 @@
/// </summary>
void LoadSensorDiv(Sensor sensor,int index)
{
- if (room.sid == "" || sensor.roomIdList.Contains(room.sid))
+ if (room.sid == "" || sensor.roomIds.Contains(room.sid))
{
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;
+ sensorTag = ((int)sensor.functionType % 256) + "_" + sensor.bus_Data.SubnetID + "_" + sensor.bus_Data.DeviceID + "_" + sensor.bus_Data.loopId;
}
FrameLayout sensorView = new FrameLayout()
{
@@ -469,8 +470,7 @@
};
sensorView.AddChidren(btnLevel);
- //Control.Send(CommandType_A.read, sensor);
- Control.SendReadCommand(sensor);
+ Control.Ins.SendReadCommand(sensor);
}
}
--
Gitblit v1.8.0