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/ApiUtlis.cs | 85 ------------------------------------------
1 files changed, 0 insertions(+), 85 deletions(-)
diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs
index edc5d3a..8ae0cfb 100644
--- a/HDL_ON/Common/ApiUtlis.cs
+++ b/HDL_ON/Common/ApiUtlis.cs
@@ -373,7 +373,6 @@
//}
//======================鑾峰彇鍙瀵硅璁惧鍒楄〃====================
- bool isInterphoneType_HDL = false;//鏄惁涓篐DLLinphone鍙瀵硅
bool isInterphoneType_FREEVIEW = false;//鏄惁涓哄叏瑙嗛�氬彲瑙嗗璁�
var videoInfo = VideoSend.GetVideoInfoList();
if (videoInfo.Code == StateCode.SUCCESS)
@@ -389,91 +388,7 @@
{
UI.UI2.PersonalCenter.PirDevice.PirSend.LcSubAccessToken = video.subAccountToken;
}
- else if (video.interphoneType == InterphoneType.HDL.ToString())
- {
- isInterphoneType_HDL = true;
- DB_ResidenceData.Instance.SupportFacePass = true;
- DB_ResidenceData.Instance.SaveResidenceData();
- DB_ResidenceData.Instance.SupportFVDevice = true;
- }
- else if (video.interphoneType == InterphoneType.FREEVIEW.ToString())
- {
-#if __IOS__
- try
- {
- FunctionList.List.videoIntercom.Remove(video);
- --i;
- }catch(Exception ex)
- {
- MainPage.Log($"ios 鍏ㄨ閫氬紓甯� : {ex.Message}");
- }
-
-#else
- //涓哄叏瑙嗛�氬彲瑙嗗璁�
- DB_ResidenceData.Instance.SupportFacePass = true;
- Entity.DB_ResidenceData.Instance.SupportVisitorManage = true;
- Entity.DB_ResidenceData.Instance.SupportFVDevice = true;
- isInterphoneType_FREEVIEW = true;
-#endif
- }
}
- }
-
-
- //======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃====================
- //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲�
- if (HDLLinphone.Current.CheckIncomingCallThreadIsNull())
- {
-
- //褰撳墠浣忓畢鏄疕DL鍙瀵硅绫诲瀷鐨勮澶�
- if (isInterphoneType_HDL)
- {
- //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
- HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
- callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- callVideoInfo.InterphoneType = InterphoneType.HDL.ToString();
- HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
- }
- else if (isInterphoneType_FREEVIEW)
- {
- //HDLLinphone鍙瀵硅,鑾峰彇Sip璐﹀彿骞跺垵濮嬪寲SDK
- HDLCallVideoInfo callVideoInfo = new HDLCallVideoInfo();
- callVideoInfo.HomeId = DB_ResidenceData.Instance.CurrentRegion.id;
- callVideoInfo.InterphoneType = InterphoneType.FREEVIEW.ToString();
- HDLLinphone.Current.GetHDLSipInfoAndInitSDK(callVideoInfo);
- }
- else
- {
- Utlis.WriteLine("褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅,閫�鍑虹櫥褰曟墍鏈夎处鍙�");
- //褰撳墠浣忓畢涓嶆敮鎸丠DL鍙瀵硅
- HDLLinphone.Current.LogoutAllAccount();
- }
- }
-
-
-
- //======================鐧诲綍鍏ㄨ閫�====================
- if (isInterphoneType_FREEVIEW)
- {
-
-#if __IOS__
- //string systemVersion = UIKit.UIDevice.CurrentDevice.SystemVersion;
- //string errorVersion = "16.2.0";
- //if (systemVersion.CompareTo(errorVersion) < 0)///鍏ㄨ閫氫笉鍏煎ios16浠ヤ笂鐨勭郴缁燂紝涓嶈鍔犺浇杩欎釜鍏�
- //{
- // List<VisitorTempPassword> dataList = new List<VisitorTempPassword>();
- // Dictionary<string, object> dictionary = new Dictionary<string, object>();
- // dictionary.Add("homeId", Entity.DB_ResidenceData.Instance.CurrentRegion.id);
- // var requestJson = HttpUtil.GetSignRequestJson(dictionary);
- // ResponsePackNew pack = HttpUtil.RequestHttpsPost(NewAPI.Api_Post_GetExtMemberInfo, requestJson);
- // if (pack != null)
- // {
- // var data = JsonConvert.DeserializeObject<FreeviewMemberInfo>(pack.Data.ToString());
- // //鐧诲綍鍏ㄨ閫�
- // Shared.IOS.HDLFVSDK.Video.Init("", data.extUserId, DB_ResidenceData.Instance.CurrentRegion.id, "78FF1E4D-FC0A-4E71-9B79-0448E4460BD7", "T0001", "120.77.53.170:9700", "120.77.53.170:21664");
- // }
- //}
-#endif
}
}
--
Gitblit v1.8.0