From 388ece21a0c608c2571775137a89ad32ca0cedd8 Mon Sep 17 00:00:00 2001 From: 陈嘉乐 <cjl@hdlchina.com.cn> Date: 星期一, 11 一月 2021 14:35:23 +0800 Subject: [PATCH] 2021-1-11-2 --- HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs index 15307dc..95a0d55 100644 --- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs +++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/EnvironmentalSensorPage.cs @@ -828,7 +828,7 @@ try { Application.RunOnMainThread(() => { - loadPage.Start("Loading..."); + loadPage.Start(Language.StringByID(StringId.PleaseWait)); }); var curMonth = 0; if(curQueryType == QueryType.NowMonth) @@ -904,8 +904,8 @@ i++; continue; } - var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus_Data.SubnetID, sr.bus_Data.DeviceID, - 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus_Data.loopId, curMonth, + var revertObj = new HttpServerRequest().GetSensorHistory(sr.bus.SubnetID, sr.bus.DeviceID, + 5, (int)(sr.functionType) % 256, (int)curQueryType, sr.bus.LoopId, curMonth, DB_ResidenceData.Instance.residenceGatewayMAC); if (revertObj != null) -- Gitblit v1.8.0