From 1443556e9ccb1a19ed8e6710c16c8adc4d4f4fb3 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 04 十一月 2021 14:19:55 +0800
Subject: [PATCH] 2021-11-04 1.更新SDK
---
iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m | 30 +++++++++++++-----------------
1 files changed, 13 insertions(+), 17 deletions(-)
diff --git a/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m b/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m
index bd30ccc..efa1afe 100644
--- a/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m
+++ b/iOS/Xamarin/LCSDKOnXamarin/LCSDKOnXamarin/LCOnIntercomViewController.m
@@ -89,8 +89,7 @@
//寮�濮嬪弽鍛�
[self StartReverseCall];
[self ShowCalltimeBtn:callingStr];
-// //鏆傛椂涓嶆敮鎸佸紑閿佸姛鑳�
-// [self setUnlock:NO];
+
//娉ㄥ唽寮�閿佹垚鍔熺洃鍚�
[self addOpenSuccessAction];
@@ -128,8 +127,6 @@
}
}
-
-
- (void)initTopBarView {
UIView *TopView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, APP_TOP_BAR_HEIGHT)];
TopView.backgroundColor = HEXCOLORA(0xF7F7F7,1.0);
@@ -140,7 +137,6 @@
TopView.layer.shadowOffset = CGSizeMake(0,0.5);
TopView.layer.shadowOpacity = 1;
TopView.layer.shadowRadius = 0;
-
}
- (UIButton *)backButton{
@@ -447,13 +443,13 @@
}
-- (int *)getTextWidth:(UIButton*) btn
-{
- int textWidth = 0;
- // 聽 CGSize size = [btn.titleLabel.textsizeWithFont:[UIFontboldSystemFontOfSize:15]constrainedToSize:contentMaxSizes lineBreakMode:UILineBreakModeCharacterWrap];
- // textWidth = (int)fontSize.Width;
- return textWidth;
-}
+//- (int *)getTextWidth:(UIButton*) btn
+//{
+// int textWidth = 0;
+// // 聽 CGSize size = [btn.titleLabel.textsizeWithFont:[UIFontboldSystemFontOfSize:15]constrainedToSize:contentMaxSizes lineBreakMode:UILineBreakModeCharacterWrap];
+// // textWidth = (int)fontSize.Width;
+// return textWidth;
+//}
@@ -669,7 +665,8 @@
param.psk = [[LCApiKit sharedInstance] currentPsk];
/** 7. 璁剧疆鎾斁瀵嗛挜锛岄潪蹇呬紶锛屼紶浜嗕細鎻愬崌鎷夋祦閫熷害 */
param.playToken = [[LCApiKit sharedInstance] currentDevicePlayToken];;
-
+ /** 8. 瀵硅璇锋眰绫诲瀷锛宑all鍛煎彨锛屽鏋滀笉浼狅紝榛樿涓簍alk */
+ param.talkType = @"call";//2021-10-28 鏂板
NSInteger result = [self.talker playTalk:param];
if (result != 0) {
//閿欒澶勭悊
@@ -871,12 +868,11 @@
}
- [[NSNotificationCenter defaultCenter] removeObserver:self];
}
-(void)dealloc{
NSLog(@"==============dealloc 1");
-
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
}
//#pragma mark ESVideoPhoneDelegate
@@ -1083,11 +1079,11 @@
- (void)stopPlaySystemSound{
// return;
NSLog(@"stop PlaySystemSound");
- stopRingAndVibration();
+ LCStopRingAndVibration();
}
//鍋滄鍝嶉搩鍜岄渿鍔紝绉婚櫎鍥炶皟骞跺鐞嗘帀閾冨０鍜岄渿鍔�
-void stopRingAndVibration() {
+void LCStopRingAndVibration() {
AudioServicesRemoveSystemSoundCompletion(kSystemSoundID_Vibrate);
// AudioServicesRemoveSystemSoundCompletion(sound);
AudioServicesDisposeSystemSoundID(kSystemSoundID_Vibrate);
--
Gitblit v1.8.0