From d90c55272f597acd0e946493896b7977293cf84d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 09 三月 2023 09:10:31 +0800
Subject: [PATCH] 人脸管理菜单
---
HDL_ON/Common/HDLCommon.cs | 42 ++++++++++++++++++++++++------------------
1 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 1a42157..7aa1087 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -91,7 +91,7 @@
{
if (revertObj.Data != null)
{
- var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionRes>(revertObj.Data.ToString());
+ var appVersionRes = Newtonsoft.Json.JsonConvert.DeserializeObject<AppVersionResNew>(revertObj.Data.ToString());
if (appVersionRes != null)
{
@@ -99,29 +99,33 @@
{
UpdateType = appVersionRes.isEnforce ? 2 : 1,
NewVersion = appVersionRes.version,
- NewVersionUrl = appVersionRes.androidUrl
+ NewVersionUrl = appVersionRes.packageUrl
};
#if __IOS__
- mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
+ mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl;
#endif
//瑙ｆ瀽鏇存柊鍐呭璇︽儏
- var reasonStrJson = GetReasonStrJson(appVersionRes.updateDescription);
- if (reasonStrJson != null)
- {
- if (Language.CurrentLanguage == "Chinese")
- {
- mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
- }
- else
- {
- mForceUpdateInfo.ReasonStr = reasonStrJson.English;
- }
- }
+ //var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
+ //if (reasonStrJson != null)
+ //{
+ // if (Language.CurrentLanguage == "Chinese")
+ // {
+ // mForceUpdateInfo.ReasonStr = reasonStrJson.Chinese;
+ // }
+ // else
+ // {
+ // mForceUpdateInfo.ReasonStr = reasonStrJson.English;
+ // }
+ //}
+ mForceUpdateInfo.ReasonStr = appVersionRes.remark;
- Application.RunOnMainThread(() =>
+ if (appVersionRes.version != MainPage.VersionString)
{
- ShowForceUpdateDialog(mForceUpdateInfo);
- });
+ Application.RunOnMainThread(() =>
+ {
+ ShowForceUpdateDialog(mForceUpdateInfo);
+ });
+ }
}
}
}
@@ -621,6 +625,7 @@
public void UpdateInternetStatus(int internetStatus, bool IsEnterBackground = false)
{
MainPage.Log($"缃戠粶鐘舵�佸彉鍖栵紝褰撳墠缃戠粶:{internetStatus} 鏄惁鍚庡彴:{IsEnterBackground.ToString()}");
+ MainPage.LinkHdlMqttCount = 0;
//缃戠粶鐘舵�佸彉鍖� 閲嶇疆缃戝叧鐘舵�侀噸鏂版悳绱�
Control.Ins.GatewayOnline_Cloud = false;
Control.Ins.GatewayOnline_Local = false;
@@ -630,6 +635,7 @@
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
MainPage.InternetStatus = 0;
+ DAL.Mqtt.MqttClient.InitState();
}
else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
{
--
Gitblit v1.8.0