From 02498f7744e6fdc413e518f96b25f3635540dc6b Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 15 十一月 2022 11:27:38 +0800
Subject: [PATCH] 金茂科技系统更新
---
HDL_ON/Common/HDLCommon.cs | 63 +++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 88ca761..b7df610 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,24 +99,25 @@
{
UpdateType = appVersionRes.isEnforce ? 2 : 1,
NewVersion = appVersionRes.version,
- NewVersionUrl = appVersionRes.androidUrl
+ NewVersionUrl = appVersionRes.packageUrl
};
#if __IOS__
mForceUpdateInfo.NewVersionUrl = appVersionRes.iosUrl;
#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(() =>
{
@@ -301,9 +302,23 @@
else if (jpushMessageInfo.messageType.Contains(PushMessageType.HDL_INTERPHONE.ToString()))
{
if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-
+
//瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
+ try
+ {
+ var pushTime = json["pushTime"];
+ if (!string.IsNullOrEmpty(pushTime.ToString()))
+ {
+ var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
+ if (pushDateTime.AddSeconds(30) < DateTime.Now)
+ {
+ return;
+ }
+ }
+ }
+ catch { }
+
//1.瑙嗗璁插巶瀹剁被鍨�
string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
@@ -330,7 +345,6 @@
}
else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
{
-
//HDL Linphone 鐙勮�愬厠
eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
eSVideoInfo.callId = json["callId"].ToString();
@@ -341,7 +355,22 @@
//ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
//鎵撳紑鍛煎彨椤甸潰
- HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo);
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.HDL.ToString());
+ return;
+ }
+ else if (interphoneTypeEnum == InterphoneType.FREEVIEW.ToString())
+ {
+ //鍏ㄨ閫� Linphone 鐙勮�愬厠
+ eSVideoInfo.HomeId = jpushMessageInfo.HomeId;
+ eSVideoInfo.callId = json["callId"].ToString();
+ eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
+ eSVideoInfo.DeviceName = json["deviceName"].ToString();
+ eSVideoInfo.deviceSipAccount = json["deviceSipAccount"].ToString();
+ eSVideoInfo.spk = json["spk"].ToString();
+
+ //ShowAlert("鐙勮�愬厠闂ㄥ彛鏈哄懠鍙�");
+ //鎵撳紑鍛煎彨椤甸潰
+ HDLLinphone.Current.ShowESVideoIntercom(eSVideoInfo, InterphoneType.FREEVIEW.ToString());
return;
}
--
Gitblit v1.8.0