From bc8e768831cca0097a28d52a107d4edf00c3713a Mon Sep 17 00:00:00 2001 From: chenqiyang <1406175257@qq.com> Date: 星期一, 16 五月 2022 20:28:51 +0800 Subject: [PATCH] 1.导入全视通dll,增加全视通相关初始化、监听、访客、退出登录等方法 2.增加访客管理入口 3.增加全局判断是否支持全视通 4.增加自研判断 5.为全视通时隐藏通话记录界面 --- HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 44 ++++++++++++++++++++++++++++++++------------ 1 files changed, 32 insertions(+), 12 deletions(-) diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs index 49857bf..15aaa60 100644 --- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs +++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs @@ -57,6 +57,10 @@ /// </summary> public bool IsEnable = false; /// <summary> + /// 褰撳墠瑙嗛閫氳瘽鏄惁涓鸿嚜鐮� + /// </summary> + public bool IsSelfResearch = false; + /// <summary> /// 鏄惁鑷姩璺宠浆鍛煎彨椤甸潰, /// false锛氭敹鍒版帹閫佸苟涓斿凡缁忔敹鍒皊ip鍛煎彨鎵嶈烦杞懠鍙〉闈� /// true锛氬師鐢熸敹鍒板懠鍙┈涓婅烦杞懠鍙〉闈紝涓嶇瓑寰呮帹閫佽繃鏉� @@ -93,6 +97,7 @@ Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().IsAutoJumpCallView = IsAutoJumpCallView; //璁剧疆Listener鐩戝惉 mOnHDLLinphoneCallDelegate = new OnHDLLinphoneCallDelegate(this); + Console.WriteLine(UserInfo.Current.ID); Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().HdlLinphoneCallDelegate = mOnHDLLinphoneCallDelegate; #else HDLLinphoneKit.Instance.InitLinphone(Application.Activity); @@ -428,6 +433,7 @@ mHDLCallVideoInfo.DeviceName = mESVideoInfo.DeviceName; mHDLCallVideoInfo.InterphoneType = InterphoneType.HDL.ToString(); mHDLCallVideoInfo.DeviceSipAccount = mESVideoInfo.deviceSipAccount; + mHDLCallVideoInfo.spk = mESVideoInfo.spk; InitCallInfo(mHDLCallVideoInfo); //褰撳墠鍛煎彨鏉ョ數鐨勪綇瀹呭拰涔嬪墠娉ㄥ唽鐧诲綍鐨勪綇瀹呬竴鑷寸殑鎯呭喌涓� @@ -460,20 +466,30 @@ /// <param name="mESVideoInfo"></param> public void CheckCallStateAndGotoPage() { - //濡傛灉寮�鍚簡鑷姩璺宠浆鏂规锛屽垯鏃犻渶缁х画涓嬮潰澶勭悊銆佹棤闇�鎵嬪姩璺宠浆 - if (IsAutoJumpCallView) return; - //鍏堢粨鏉熸帀涔嬪墠鐨勭嚎绋� - EndCheckIncomingCallThread(); - //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂� - if (IsIncomingReceivedCallState()) { - Utlis.WriteLine("CALL 宸茬粡鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰"); - GoToHDLLinphoneIntercomActivity(); - } - else + if (mHDLCallVideoInfo.spk == "door.gate") { - //濡傛灉杩樻病鏉ョ數 寮�鍚嚎绋嬫娴� - StartCheckIncomingCallThread(); + //鑷爺鍙瀵硅 + HDLLinPhoneSDK.Instance().GotoHDLSRLinphoneIntercomVC(mHDLCallVideoInfo.DeviceName,mHDLCallVideoInfo.DeviceSipAccount); + } + else { + //鐙勮�愬厠鍙瀵硅 + //濡傛灉寮�鍚簡鑷姩璺宠浆鏂规锛屽垯鏃犻渶缁х画涓嬮潰澶勭悊銆佹棤闇�鎵嬪姩璺宠浆 + if (IsAutoJumpCallView) return; + //鍏堢粨鏉熸帀涔嬪墠鐨勭嚎绋� + EndCheckIncomingCallThread(); + //妫�娴嬫槸鍚︽潵鐢典簡濡傛灉鏄洿鎺ヨ皟鏁村懠鍙〉闈㈠鏋滀笉鏄垯寮�鍚嚎绋嬬瓑寰呭垽鏂� + if (IsIncomingReceivedCallState()) + { + Utlis.WriteLine("CALL 宸茬粡鏉ョ數浜嗐�傘�傘�傛墦寮�鍛煎彨椤甸潰"); + GoToHDLLinphoneIntercomActivity(); + } + else + { + //濡傛灉杩樻病鏉ョ數 寮�鍚嚎绋嬫娴� + StartCheckIncomingCallThread(); + } } + } @@ -813,6 +829,10 @@ /// 绫诲瀷 /// </summary> public string InterphoneType; + /// <summary> + /// spk + /// </summary> + public string spk=""; } -- Gitblit v1.8.0