From 6a99d9bf65aa5878cb409945ed2bdbdcb916d047 Mon Sep 17 00:00:00 2001
From: chenqiyang <1406175257@qq.com>
Date: 星期五, 02 九月 2022 14:56:40 +0800
Subject: [PATCH] 更新linphone sdk
---
HDLLinPhoneSDK（OC）/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m | 40 ++++++++++++++++++++++++----------------
1 files changed, 24 insertions(+), 16 deletions(-)
diff --git "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m" "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m"
index 2b91526..90fba0f 100644
--- "a/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m"
+++ "b/HDLLinPhoneSDK\357\274\210OC\357\274\211/HDLLinPhoneSDK/HDLLinphoneIntercomVC.m"
@@ -357,7 +357,15 @@
[self stopPlaySystemSound];
// [[HDLCallManager instance] acceptCallByCallID:self.CallId hasVideo:self.hasVideo];
- [[HDLLinphoneManager instance] acceptCall];
+ [HDLLinphoneManager.instance enableMicro:true];
+ if (self.deviceType==HDLLPType_HDLSR) {
+ NSLog(@"鍙嶅懠");
+ [HDLLinphoneManager.instance startCall:self.userName];
+ }else{
+ NSLog(@"鎺ュ惉");
+ [[HDLLinphoneManager instance] acceptCall];
+
+ }
/// 寮�鍚璁�
// [self startTalk];
@@ -475,9 +483,9 @@
/** 寮�鍚�掕鏃� */
- (void)startCountdown {
- if (_callTimeout > 100) {
- return;
- }
+// if (_callTimeout > 100) {
+// return;
+// }
_callTimeout = 0;
// GCD瀹氭椂鍣�
dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
@@ -488,24 +496,24 @@
dispatch_source_set_event_handler(_countdownTimer, ^{
WEAKSELF_AT
- if(weakSelf_AT.callTimeout >= 100 ){// 璁℃椂缁撴潫
- // 鍏抽棴瀹氭椂鍣�
- dispatch_source_cancel(weakSelf_AT.countdownTimer);
-
- dispatch_async(dispatch_get_main_queue(), ^{
- NSLog(@"瓒呮椂");
- [weakSelf_AT backAction];
-
- });
-
- }else{// 璁℃椂涓�
+// if(weakSelf_AT.callTimeout >= 100 ){// 璁℃椂缁撴潫
+// // 鍏抽棴瀹氭椂鍣�
+// dispatch_source_cancel(weakSelf_AT.countdownTimer);
+//
+// dispatch_async(dispatch_get_main_queue(), ^{
+// NSLog(@"瓒呮椂");
+// [weakSelf_AT backAction];
+//
+// });
+//
+// }else{// 璁℃椂涓�
weakSelf_AT.callTimeout++;
dispatch_async(dispatch_get_main_queue(), ^{
[weakSelf_AT ShowTime:weakSelf_AT.callTimeout];
});
- }
+// }
});
// 寮�鍚畾鏃跺櫒
--
Gitblit v1.8.0