From a722e767f98042d5ef6259d2dde7854c925e4167 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期一, 17 五月 2021 11:50:02 +0800
Subject: [PATCH] 2021-05-17 1.备份
---
iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m | 57 ++++++++++++++++++++-------------------------------------
1 files changed, 20 insertions(+), 37 deletions(-)
diff --git a/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m b/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m
index 8942409..30221f9 100644
--- a/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m
+++ b/iOS/Xamarin/LCOnDemo/LCOnDemo/LCSDK/LCOnIntercomViewController.m
@@ -53,11 +53,8 @@
@implementation LCOnIntercomViewController{
- BOOL isAccessAudio;
- BOOL isAccessVideo;
+
BOOL isBackGround;
- BOOL iSVideoNotDetermined;
- BOOL iSAudioNotDetermined;
BOOL isAnswer;//鏄惁宸茬粡鐐瑰嚮鎺ュ惉杩囦簡
NSString * tipStr;
@@ -92,8 +89,7 @@
//寮�濮嬪弽鍛�
[self StartReverseCall];
[self ShowCalltimeBtn:callingStr];
-// //鏆傛椂涓嶆敮鎸佸紑閿佸姛鑳�
-// [self setUnlock:NO];
+
//娉ㄥ唽寮�閿佹垚鍔熺洃鍚�
[self addOpenSuccessAction];
@@ -131,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);
@@ -143,7 +137,6 @@
TopView.layer.shadowOffset = CGSizeMake(0,0.5);
TopView.layer.shadowOpacity = 1;
TopView.layer.shadowRadius = 0;
-
}
- (UIButton *)backButton{
@@ -450,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;
+//}
@@ -702,7 +695,7 @@
- (void)onPlayerResult:(NSString*)code Type:(NSInteger)type Index:(NSInteger)index {
// play
WEAKSELF_AT(self);
- NSLog(@"LIVE_PLAY-CODE:%@,TYPE:%ld", code, type);
+ NSLog(@"LIVE_PLAY-CODE:%@,TYPE:%ld", code, (long)type);
//鏄惁宸茬粡寮圭獥杩�
if(isShowErrorAlert) return;;
@@ -859,24 +852,11 @@
[super viewWillDisappear:animated];
[self stopPlaySystemSound];
//闃叉鐢ㄦ埛涓嶆寜鎸傛柇锛屾垨鑰呬笉绛夋敹鍒板鏂圭殑鎸傛柇锛岀偣鍑昏繑鍥炴寜閽��
+ //1.鏆傚仠SDK鐩稿叧鎾斁
[self stopPlay];
-
- // if(_es){
- // [_es onHangup];
- // [_es onStopCapture];
- // [_es stopTalk];
- //
- // _es.delegate = nil;
- // ESVideo.shareInstance.snapImageCallback = nil;
- //
- //
- // }
- // [_es freeSubClass];
-}
--(void)dealloc{
- [[NSNotificationCenter defaultCenter] removeObserver:self];
- // [_es freeSubClass];
-
+ //2.Delegate閲婃斁
+ self.mLCCallDelegate = nil;
+ //3.瀹氭椂鍣ㄩ噴鏀�
if(_openDoorTimer){
dispatch_source_cancel(_openDoorTimer);
_openDoorTimer = nil; // OK
@@ -886,9 +866,12 @@
_countdownTimer = nil; // OK
}
- NSLog(@"==============dealloc");
-
-
+
+}
+
+-(void)dealloc{
+ NSLog(@"==============dealloc 1");
+ [[NSNotificationCenter defaultCenter] removeObserver:self];
}
//#pragma mark ESVideoPhoneDelegate
--
Gitblit v1.8.0