From ea285ffe71284f5499e870f89c65b710d2d6a79c Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期一, 27 六月 2022 10:54:32 +0800
Subject: [PATCH] Merge branch 'wxr0114' of http://59.41.255.150:6688/r/~wxr/OnPro into wxr0114
---
HDL_ON/Common/ApiUtlis.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index 181c03b..544f3d8 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);
}
--
Gitblit v1.8.0