From c5cb6840bd986bbd71a9ebc232bbf44ed0e1fc3d Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期四, 23 五月 2024 17:43:11 +0800
Subject: [PATCH] jpush更新完成
---
HDL_ON/Common/HDLCommon.cs | 105 ----------------------------------------------------
1 files changed, 0 insertions(+), 105 deletions(-)
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index a981693..f8f204d 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -280,109 +280,6 @@
//鎶ヨ鎺ㄩ�佸脊绐楁彁绀�
ShowAlarmPushMessage(jpushMessageInfo, true);
}
- else if (jpushMessageInfo.messageType == (PushMessageType.FLCall.ToString()))
- {
- if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-
- ESVideoInfo eSVideoInfo = GetESOnVideoJson(jpushMessageInfo.expantContent);
-
- if (eSVideoInfo == null) return;
-
- if (string.IsNullOrEmpty(eSVideoInfo.uuid)) return;
-
- if (eSVideoInfo.uuid.Contains(","))
- {
- var uuid = eSVideoInfo.uuid.Split(',');
- eSVideoInfo.ESVideoUUID = uuid[0];
- }
- else
- {
- eSVideoInfo.ESVideoUUID = eSVideoInfo.uuid;
- }
-
- ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, InterphoneType.FLVI.ToString());
-
- }
- else if (jpushMessageInfo.messageType == (PushMessageType.HDL_INTERPHONE.ToString()))
- {
-
- if (string.IsNullOrEmpty(jpushMessageInfo.expantContent)) return;
-
- //瀛楁鍏煎闂锛屽彧鑳界洿鎺ュ彇鍊间簡
- var json = Newtonsoft.Json.Linq.JObject.Parse(jpushMessageInfo.expantContent);
-
-
- //1.瑙嗗璁插巶瀹剁被鍨�
- string interphoneTypeEnum = json["interphoneTypeEnum"].ToString();
- if (string.IsNullOrEmpty(interphoneTypeEnum)) return;
- ESVideoInfo eSVideoInfo = new ESVideoInfo();// GetESOnVideoJson(jpushMessageInfo.expantContent);
- //2.鏍规嵁鍙瀵硅鍘傚绫诲瀷锛屽鐞嗕笉鍚岀殑鏁版嵁
- if (interphoneTypeEnum == InterphoneType.IMOUVISIAL.ToString())
- {
- //澶у崕涔愭
- eSVideoInfo.callId = json["callId"].ToString();
- //eSVideoInfo.Lc_AccessToken = UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken;//json["subAccountToken"].ToString();//
- eSVideoInfo.Lc_AccessToken = json["subAccountToken"].ToString();//2021-05-13 鐩墠浜戠杩樻病鎷垮埌Lc_AccessToken锛岀洰鍓嶆病鍔炴硶姝ｅ父浣跨敤
- eSVideoInfo.Lc_DeviceId = json["deviceId"].ToString();
- eSVideoInfo.Lc_Location = OnAppConfig.Instance.RequestHttpsHost.Contains("China") ? 0 : 1;
- eSVideoInfo.Lc_PlayToken = json["token"].ToString();
- //eSVideoInfo.Lc_Psk = json["cname"].ToString();
- eSVideoInfo.Lc_Psk = json["psk"].ToString();//2021-10-15 PSK瀛楁涓嶈兘鍙朿name
- }
-
- else if (interphoneTypeEnum == InterphoneType.HDL.ToString())
- {
- try
- {
- var pushTime = json["pushTime"];
- if (pushTime == null)
- {
- return;
- }
- if (!string.IsNullOrEmpty(pushTime.ToString()))
- {
- var pushDateTime = Utlis.UnixToDateTimeMS(Convert.ToInt64(pushTime));
- if (pushDateTime.AddSeconds(30) < DateTime.Now)
- {
- return;
- }
- }
- }
- catch { }
- //HDL 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.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;
- }
-
- //3.鎵撳紑鍛煎彨椤甸潰
- if (eSVideoInfo == null) return;
- ESOnVideo.Current.ShowESvideoVideoIntercom(eSVideoInfo, interphoneTypeEnum);
-
- }
else if (jpushMessageInfo.messageType == (PushMessageType.Prompt.ToString()))
{
ShowAlarmPushMessage(jpushMessageInfo, false);
@@ -487,8 +384,6 @@
UserInfo.Current.SaveUserInfo();
DB_ResidenceData.Instance.EixtAccount();
MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
- //4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
- HDLLinphone.Current.LogoutAllAccount();
MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
--
Gitblit v1.8.0