From eace7a4d75c0bea498253f524906c6ce326b80f2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 14 三月 2023 11:33:03 +0800
Subject: [PATCH] 2023年03月14日11:32:57
---
HDL_ON/Common/HDLCommon.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index b7df610..0ef7dc5 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -102,7 +102,7 @@
NewVersionUrl = appVersionRes.packageUrl
};
#if __IOS__
- mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
+ mForceUpdateInfo.NewVersionUrl = appVersionRes.packageUrl;
#endif
//瑙ｆ瀽鏇存柊鍐呭璇︽儏
//var reasonStrJson = GetReasonStrJson(appVersionRes.remark);
@@ -119,10 +119,13 @@
//}
mForceUpdateInfo.ReasonStr = appVersionRes.remark;
- Application.RunOnMainThread(() =>
+ if (appVersionRes.version != MainPage.VersionString)
{
- ShowForceUpdateDialog(mForceUpdateInfo);
- });
+ Application.RunOnMainThread(() =>
+ {
+ ShowForceUpdateDialog(mForceUpdateInfo);
+ });
+ }
}
}
}
@@ -301,6 +304,7 @@
}
else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
{
+
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
@@ -382,6 +386,11 @@
else if (jpushMessageInfo.messageType.Contains(PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
+ }
+ else if (jpushMessageInfo.messageType.Contains(PushMessageType.DOOR_BELL.ToString()))
+ {
+ /////瑙嗛闂ㄩ攣
+ HDL_ON.UI.UI2.FuntionControlView.VideoDoorLock.CommonMethod.Current.SkipRTVActivity();
}
}
}
@@ -622,6 +631,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;
@@ -631,6 +641,7 @@
if (internetStatus == 0)//娌℃湁缃戠粶杩炴帴 0
{
MainPage.InternetStatus = 0;
+ DAL.Mqtt.MqttClient.InitState();
}
else if (internetStatus == 1)//3,4G鐨勭綉缁滆繛鎺� 1
{
--
Gitblit v1.8.0