From 04c9e08d5069c986c918fa2e98b22dd85921effd Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期五, 02 九月 2022 15:48:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/hxb' into Dev-Wxr
---
HDL_ON/Common/ApiUtlis.cs | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 181c03b..10b28ef 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -159,7 +159,8 @@
endTime = DateTime.Now.AddSeconds(5);
MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
- var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
+ MainPage.Log($"sid鍒楄〃鑾峰彇===="+ deviceResult.Data.ToString());
+ var deviceList = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
{
deviceList = new DevcieApiPack();
@@ -171,7 +172,7 @@
var deviceResult2 = Ins.HttpRequest.GetDeviceList("30", Convert.ToInt32(deviceList.pageNo) + 1 + "");
if (deviceResult2.Code == StateCode.SUCCESS)
{
- var deviceList2 = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
+ var deviceList2 = Newtonsoft.Json.JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
deviceList.pageNo = deviceList2.pageNo;
deviceList.list.AddRange(deviceList2.list);
}
@@ -432,6 +433,37 @@
}
})
{ IsBackground = true }.Start();
+
+
+
+
+ //涓嬭浇鍏変紡鏁版嵁
+ new System.Threading.Thread(() => {
+ try
+ {
+ HttpServerRequest http = new HttpServerRequest();
+ var packData = http.GetInverterList();
+ if (packData != null)
+ {
+ if (packData.Code == StateCode.SUCCESS)
+ {
+ var inverterList = JsonConvert.DeserializeObject<List<InverterInfo>>(packData.Data.ToString());
+ if (inverterList!= null)
+ {
+ FunctionList.List.InverterList = inverterList;
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ MainPage.Log($"璇诲彇鍏変紡鏁版嵁寮傚父:{ex.Message}");
+ }
+
+ }) { IsBackground = true }.Start();
+
+
+
}
/// <summary>
@@ -479,6 +511,7 @@
FileUtlis.Files.DeleteFile(file);
}
}
+ FunctionList.List.securities.Clear();
foreach (var function in infoList)
{
function.SaveFile();
--
Gitblit v1.8.0