From 489d3bd60ad7dc2fecb398b09cf4c52df16f0fc2 Mon Sep 17 00:00:00 2001
From: Davin <591807572@qq.com>
Date: 星期三, 26 七月 2023 15:55:30 +0800
Subject: [PATCH] Merge branch 'Dev-Branch' of http://59.41.255.150:6688/r/~wxr/OnPro into Dev-Branch
---
HDL_ON/Common/ApiUtlis.cs | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index e0a8a6a..e6f4a51 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -104,6 +104,11 @@
code = Ins.HttpRequest.RefreshToken();
if (code != StateCode.SUCCESS)
{
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
MainPage.Log($"鍒锋柊token澶辫触");
return;
}
@@ -112,6 +117,11 @@
code = Ins.HttpRequest.GetHomePager();
if (code != StateCode.SUCCESS)
{
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
MainPage.Log($"鍒锋柊浣忓畢淇℃伅澶辫触");
return;
}
@@ -120,6 +130,11 @@
code = Ins.HttpRequest.GetUserInfo();
if (code != StateCode.SUCCESS)
{
+ if (waitPage != null)
+ {
+ waitPage.RemoveFromParent();
+ waitPage = null;
+ }
MainPage.Log($"鍒锋柊涓汉淇℃伅澶辫触");
return;
}
@@ -178,7 +193,7 @@
FunctionList.List.ClearDatas();
//MainPage.Log($"============璁惧============寮�濮�" + FunctionList.List.Functions.Count);
//MainPage.Log($"璇诲彇璁惧淇℃伅鎴愬姛");
- //MainPage.Log($"sid鍒楄〃鑾峰彇====" + deviceResult.Data.ToString());
+ MainPage.Log($"sid鍒楄〃鑾峰彇====" + deviceResult.Data.ToString());
var deviceList = JsonConvert.DeserializeObject<DevcieApiPack>(deviceResult.Data.ToString());
if (deviceList == null)
{
--
Gitblit v1.8.0