From 51f5f7a47d394163dccf2441cd04c2a19ceeda34 Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期一, 08 一月 2024 09:41:59 +0800 Subject: [PATCH] Merge branch 'Dev-Google-V2.4.3' into Google-2023-11-17-1 --- HDL_ON/Common/ApiUtlis.cs | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/HDL_ON/Common/ApiUtlis.cs b/HDL_ON/Common/ApiUtlis.cs index 094a6e3..86bdfdc 100644 --- a/HDL_ON/Common/ApiUtlis.cs +++ b/HDL_ON/Common/ApiUtlis.cs @@ -337,33 +337,33 @@ //======================鑾峰彇Sip璐﹀彿骞朵笖鍒濆鍖朣DK鍙瀵硅璁惧鍒楄〃==================== //濡傛灉妫�娴嬬嚎绋嬫病鍚姩锛屾墠缁х画涓嬮潰鎿嶄綔 鍥犱负App鏈夊彲鑳藉垰鍚姩椹笂鏀跺埌鎺ㄩ�佷簡锛岀劧鍚庢墠鎵ц鍒拌繖閲� - if (HDLLinphone.Current.CheckIncomingCallThreadIsNull()) - { + //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(); - } - } + // //褰撳墠浣忓畢鏄疕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(); + // } + //} -- Gitblit v1.8.0