From 728ceead4ea3f18abcb6f70772e64e4549f9dcac Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 02 四月 2021 17:06:31 +0800
Subject: [PATCH] 2021-04-02 1.ZigBee 丰林同样更新SDK。

---
 xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m |  138 ++++++++++++++++++++++++++-------------------
 1 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
index bf1c7be..80e5020 100644
--- a/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
+++ b/xamarin/ESVideoPhoneSDKXamarin/ESVideoPhoneSDKXamarin/ESvideoVideoIntercomViewController.m
@@ -11,7 +11,7 @@
 #import <AVFoundation/AVFoundation.h>
 #import <ESVideoPhoneSDk/ESVideoPhone.h>
 #import <ESVideoPhoneSDk/ESError.h>
-#import "AudioSessionHelper.h"
+//#import "AudioSessionHelper.h"
 #import <Photos/Photos.h>
 #import <AudioToolbox/AudioToolbox.h>
 #import "ESVideo.h"
@@ -20,7 +20,7 @@
 
 @interface ESvideoVideoIntercomViewController ()<ESVideoPhoneDelegate>
 
-@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
+//@property (nonatomic,strong) AudioSessionHelper    *sessionHelper;
 @property (nonatomic,strong) ESVideoPhone          *es;
 @property (nonatomic,assign) BOOL                  playing;
 @property (nonatomic,assign) BOOL                  isInterrupt;
@@ -137,7 +137,7 @@
     UIView *TopView =  [[UIView alloc] initWithFrame:CGRectMake(0, 0, self.view.frame.size.width, APP_TOP_BAR_HEIGHT)];
     TopView.backgroundColor = HEXCOLORA(0xF9F9F9,1.0);
     //    [TopView addSubview:self.backButton];
-    [TopView addSubview:self.moreButton];
+//    [TopView addSubview:self.moreButton];
     [self.view addSubview:TopView];
     TopView.layer.shadowColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.25].CGColor;
     TopView.layer.shadowOffset = CGSizeMake(0,0.5);
@@ -199,7 +199,7 @@
         _centerView.backgroundColor = UIColor.whiteColor;
         [self setRadiusWithView:_centerView];
         
-        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, 20, APP_SCREEN_WIDTH-160, 24)];
+        _topUILabel= [[UILabel alloc] initWithFrame:CGRectMake(80, GetRealHeight(20), APP_SCREEN_WIDTH-160, GetRealHeight(24))];
         _topUILabel.font = [UIFont fontWithName:APP_UIFont_BOLD size:15.0];
         _topUILabel.textColor = HEXCOLORA(0x333333, 1.0);
         _topUILabel.text = @"浜屾纭鏈�";
@@ -248,9 +248,9 @@
 
 - (UIView *)homeView{
     if (_homeView == nil) {
-        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, 268, APP_SCREEN_WIDTH, 36)];
+        _homeView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(268), APP_SCREEN_WIDTH, GetRealHeight(36))];
         _homeView.backgroundColor = HEXCOLORA(0x232323, 1.0);
-        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(20, 4, 28, 28)];
+        UIImageView *mUIImageView= [[UIImageView alloc] initWithFrame:CGRectMake(GetRealWidth(20), GetRealHeight(4), GetRealHeight(28), GetRealHeight(28))];
         mUIImageView.image = [UIImage imageNamed:@"ic_esvideo_home"];
         [mUIImageView setContentMode:UIViewContentModeScaleAspectFit];
         [_homeView addSubview:mUIImageView];
@@ -261,7 +261,7 @@
 
 - (UILabel *)homeUILabel{
     if (_homeUILabel == nil) {
-        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(52, 8, APP_SCREEN_WIDTH - 100, 20)];
+        _homeUILabel = [[UILabel alloc] initWithFrame:CGRectMake(GetRealWidth(52), 0, APP_SCREEN_WIDTH - GetRealWidth(100), _homeView.frame.size.height)];
         _homeUILabel.font = [UIFont fontWithName:APP_UIFont size:12.0];
         _homeUILabel.textColor = [UIColor whiteColor];
         _homeUILabel.text = @"1鏍�203";
@@ -272,7 +272,7 @@
 
 - (UIView *)unlockView{
     if (_unlockView == nil) {
-        _unlockView = [[UIView alloc] initWithFrame:CGRectMake(0, 304, APP_SCREEN_WIDTH, 48)];
+        _unlockView = [[UIView alloc] initWithFrame:CGRectMake(0, GetRealHeight(304), APP_SCREEN_WIDTH, GetRealHeight(48))];
         _unlockView.backgroundColor = HEXCOLORA(0x232323, 1.0);
         _unlockView.layer.backgroundColor = [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0].CGColor;
         _unlockView.layer.shadowColor = [UIColor colorWithRed:204/255.0 green:204/255.0 blue:204/255.0 alpha:0.4].CGColor;
@@ -285,7 +285,7 @@
 
 - (UIButton *)screenshotImgBtn{
     if (_screenshotImgBtn == nil) {
-        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(65, 6, 36, 36)];
+        _screenshotImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(65), GetRealHeight(6), GetRealHeight(36), GetRealHeight(36))];
         [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_unselect"] forState:UIControlStateNormal];
         //        [_screenshotImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_takephoto_select"] forState:UIControlStateSelected];
         [_screenshotImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
@@ -310,7 +310,7 @@
 
 - (UIButton *)unlockImgBtn{
     if (_unlockImgBtn == nil) {
-        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(274, 6, 36, 36)];
+        _unlockImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_CONTENT_WIDTH-GetRealWidth(65)-GetRealHeight(36), GetRealHeight(6), GetRealHeight(36), GetRealHeight(36))];
         [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_unselect"] forState:UIControlStateNormal];
         //        [_unlockImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_unlock_select"] forState:UIControlStateSelected];
         [_unlockImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
@@ -338,7 +338,7 @@
 #pragma 鎸傛柇鍜屽紑閿�
 - (UIButton *)hangUpImgBtn{
     if (_hangUpImgBtn == nil) {
-        _hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(54, 448, 58, 58)];
+        _hangUpImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(GetRealWidth(54), GetRealHeight(448), GetRealHeight(58), GetRealHeight(58))];
         [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_hangup"] forState:UIControlStateNormal];
         //        [_hangUpImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_hangup"] forState:UIControlStateSelected];
         [_hangUpImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
@@ -354,20 +354,22 @@
 
 - (UIButton *)hangUpTextBtn{
     if (_hangUpTextBtn == nil) {
-        _hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(33, 514, 100, 21)];
+        _hangUpTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(33, 514, GetRealWidth(100), GetRealHeight(21))];
         [_hangUpTextBtn setTitle:@"鎷掔粷" forState:UIControlStateNormal];
         _hangUpTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
         _hangUpTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];
         [_hangUpTextBtn setTitleColor:TextColor forState:UIControlStateNormal];
         [_hangUpTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];
         [_hangUpTextBtn addTarget:self action:@selector(screenshotAction) forControlEvents:UIControlEventTouchUpInside];
+        _hangUpTextBtn.center = CGPointMake(_hangUpImgBtn.center.x, GetRealHeight(525));
+        
     }
     return _hangUpTextBtn;
 }
 
 - (UIButton *)answerImgBtn{
     if (_answerImgBtn == nil) {
-        _answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(263, 448, 58, 58)];
+        _answerImgBtn = [[UIButton alloc] initWithFrame:CGRectMake(APP_CONTENT_WIDTH-GetRealWidth(54)-GetRealHeight(58), GetRealHeight(448), GetRealHeight(58), GetRealHeight(58))];
         [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_answer"] forState:UIControlStateNormal];
         //        [_answerImgBtn setImage:[UIImage imageNamed:@"ic_esvideo_answer"] forState:UIControlStateSelected];
         [_answerImgBtn.imageView setContentMode:UIViewContentModeScaleAspectFit];
@@ -389,8 +391,11 @@
     _answerTextBtn.hidden = YES;
     
     //鎸傛柇鎸夐挳绉诲姩涓棿
-    _hangUpImgBtn.frame = CGRectMake(159, 448, 58, 58);
-    _hangUpTextBtn.frame = CGRectMake(138, 514, 100, 21);
+    //    _hangUpImgBtn.frame = CGRectMake(159, 448, 58, 58);
+    //    _hangUpTextBtn.frame = CGRectMake(138, 514, 100, 21);
+    _hangUpImgBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, _hangUpImgBtn.center.y);
+    _hangUpTextBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, _hangUpTextBtn.center.y);
+    
     [_hangUpTextBtn setTitle:hangUpStr forState:UIControlStateNormal];
     //寮�濮嬭鏃�
     _callTimeout = 0;
@@ -405,7 +410,7 @@
 
 - (UIButton *)answerTextBtn{
     if (_answerTextBtn == nil) {
-        _answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 514, 100, 21)];
+        _answerTextBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 514, GetRealWidth(100), GetRealHeight(21))];
         [_answerTextBtn setTitle:@"鎺ュ惉" forState:UIControlStateNormal];
         _answerTextBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:15.0];
         _answerTextBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
@@ -414,21 +419,22 @@
         [_answerTextBtn setTitleColor:[UIColor lightGrayColor] forState:UIControlStateDisabled];
         [_answerTextBtn setTitleColor:TextSelectColor forState:UIControlStateSelected];
         [_answerTextBtn addTarget:self action:@selector(unlockAction) forControlEvents:UIControlEventTouchUpInside];
+        _answerTextBtn.center = CGPointMake(_answerImgBtn.center.x, GetRealHeight(525));
     }
     return _answerTextBtn;
 }
 
 - (UIButton *)calltimeBtn{
     if (_calltimeBtn == nil) {
-        _calltimeBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, 382, 100, 30)];
+        _calltimeBtn = [[UIButton alloc] initWithFrame:CGRectMake(242, GetRealHeight(382), GetRealWidth(100), GetRealHeight(30))];
         _calltimeBtn.backgroundColor = HEXCOLORA(0x000000, 0.4);
         [_calltimeBtn setTitle:@"00:00" forState:UIControlStateNormal];
         _calltimeBtn.titleLabel.font = [UIFont fontWithName:APP_UIFont size:14.0];
         _calltimeBtn.titleLabel.textAlignment = NSTextAlignmentCenter;
         [_calltimeBtn setTitleColor:[UIColor whiteColor] forState:UIControlStateNormal];
-        _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);
         _calltimeBtn.hidden = YES;
         _calltimeBtn.layer.cornerRadius = 15;
+        _calltimeBtn.center = CGPointMake(APP_CONTENT_WIDTH/2, GetRealHeight(397));
     }
     return _calltimeBtn;
 }
@@ -457,11 +463,11 @@
 {
     [_calltimeBtn setTitle:mesStr forState:UIControlStateNormal];
     if(isTime){
-        _calltimeBtn.frame = CGRectMake(0, 0, 80, 30);
+        _calltimeBtn.frame = CGRectMake(0, 0, GetRealWidth(80), GetRealHeight(30));
     }else{
-        _calltimeBtn.frame = CGRectMake(0, 0, 115, 30);
+        _calltimeBtn.frame = CGRectMake(0, 0, GetRealWidth(115), GetRealHeight(30));
     }
-    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, 397);
+    _calltimeBtn.center = CGPointMake(APP_SCREEN_WIDTH/2, GetRealHeight(397));
 }
 
 
@@ -603,7 +609,7 @@
             });
         };
         //闂ㄥ彛鏈轰細鏈夎棰戠殑闀垮楂橈紝鏄浐瀹氱殑锛堟殏鏃惰繕涓嶇‘瀹氾級
-//        _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame:CGRectMake(0, 57, APP_SCREEN_WIDTH, 211) delegate:self imagecallBack:snapImageCallback];
+        //        _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame:CGRectMake(0, 57, APP_SCREEN_WIDTH, 211) delegate:self imagecallBack:snapImageCallback];
         if (_es) {
             //鍒ゆ柇瑙嗛娓叉煋鏄惁鍒濆鍖栨垚鍔燂紝濡傛灉澶辫触浼氳蛋ESVideoPhoneDelegate鏂规硶
             if (_es.showView) {
@@ -626,15 +632,15 @@
         return;
     }
     //鍒濆鍖栬棰戦噰闆咰apture
-    [self requestAccessForAVMediaType:AVMediaTypeVideo];
-    if (isAccessVideo) {
-        if(![_es initVideoCaptureSession]){
-            NSLog(@"VideoCaptureSession 鍒濆鍖栧け璐�");
-        }
-    }
-    //鍒濆鍖朅udioSession
-    _sessionHelper = [[AudioSessionHelper alloc]init];
-    [_sessionHelper setAudioSession];
+//    [self requestAccessForAVMediaType:AVMediaTypeVideo];
+//    if (isAccessVideo) {
+//        if(![_es initVideoCaptureSession]){
+//            NSLog(@"VideoCaptureSession 鍒濆鍖栧け璐�");
+//        }
+//    }
+//    //鍒濆鍖朅udioSession
+//    _sessionHelper = [[AudioSessionHelper alloc]init];
+//    [_sessionHelper setAudioSession];
     //娣诲姞杩涘叆鍚庡彴锛屼腑鏂瓑閫氱煡
     [self addObservers];
     
@@ -714,7 +720,11 @@
     //鍦╲iewDidLoad涓� 璋冪敤requestAccessForAVMediaType: 鏄负浜嗚妭绾﹀垵濮嬪寲鐨勬椂闂�
     //鍦╲iewDidAppear涓皟鐢╮equestAccessForAVMediaType: 鏄负浜嗗脊鍑烘彁绀烘墦寮�鏉冮檺鐨凙lert
     //娴嬭瘯鐨勬椂鍊欏彂鐜板涓嬫儏鍐碉細濡傛灉鍙妸鎺堟潈鏂规硶鏀惧埌ViewDidAppear鏂规硶涓鐞嗭紝濡傛灉娌℃湁鎺堟潈鍦ㄥ垵濮嬪寲閲囬泦鍣ㄦ椂浼氬け璐ャ�傚悓鏍稟lertView浼氬洜涓篤iew娌℃湁didLoad鑰屽鑷磒resent涓嶅嚭鏉�
-    if (!isAccessVideo || !isAccessAudio) {
+//    if (!isAccessVideo || !isAccessAudio) {
+//        [self requestAccessForAVMedia];
+//    }
+//
+    if (!isAccessAudio) {
         [self requestAccessForAVMedia];
     }
 }
@@ -737,7 +747,7 @@
         
         
     }
-//    [_es freeSubClass];
+    //    [_es freeSubClass];
 }
 -(void)dealloc{
     [[NSNotificationCenter defaultCenter] removeObserver:self];
@@ -779,7 +789,7 @@
         
         //           [_mCallOrAccept setTitle:@"閫氳瘽涓�..." forState:UIControlStateNormal];
     }else if([phoneEventStr  isEqual:@"EVT_HangUp"]){
-         [self showUIAlertViewWithBack:@"宸叉寕鏂�"];
+        [self showUIAlertViewWithBack:@"宸叉寕鏂�"];
         //           [_mCallOrAccept setTitle:@"鍙嶅懠" forState:UIControlStateNormal];
     }else if([phoneEventStr  isEqual:@"EVT_P2POnlineStatusChanged"]){
         //EVT_P2PStarted(p2p鍒濆鍖朞K锛屽彲浠ヨ繛鎺�),EVT_P2POnlineStatusChangedonline=1
@@ -954,13 +964,16 @@
     NSString *result = nil;
     //鍚瓛鐘舵�� 鎻掕�冲鍚庢嫈鎺夊悗鎭㈠鍒伴粯璁よ缃�
     if (sender == nil) {
-        result = [_sessionHelper speaker:NO];
+//        result = [_sessionHelper speaker:NO];
+        [_es resetAudioCaptureIsSpeak:NO];
     }else{
         if(!_isSpeaking){
-            result = [_sessionHelper speaker:YES];
+//            result = [_sessionHelper speaker:YES];
+            [_es resetAudioCaptureIsSpeak:YES];
             _isSpeaking = YES;
         }else{
-            result = [_sessionHelper speaker:NO];
+//            result = [_sessionHelper speaker:NO];
+            [_es resetAudioCaptureIsSpeak:NO];
             _isSpeaking = NO;
         }
     }
@@ -1015,30 +1028,37 @@
     
     // 杩欓噷鏄�冭檻鍒扮敤鎴锋病鏈夋巿鏉冿紝涔嬪悗閫氳繃AlertAction璺宠浆鍒拌缃〉闈㈡巿鏉冨悗鍐嶅洖鍒癆PP鏃跺仛鐨勯噸鏂版娴�
     //璺宠浆鍒拌缃〉闈紝鎺堟潈鍚庤繑鍥為〉闈紝缁х画鍒濆鍖栭噰闆嗗櫒
-    if (isAccessAudio && isAccessVideo) {
-        return;
-    }
-    if (isAccessVideo && !isAccessAudio) {
+    if(!isAccessAudio){
         [self requestAccessForAVMediaType:AVMediaTypeAudio];
         if (isAccessAudio) {
             [_es initAudioCaptureSession];
         }
-    }else if (!isAccessVideo && isAccessAudio){
-        [self requestAccessForAVMediaType:AVMediaTypeVideo];
-        if (isAccessVideo) {
-            [_es initVideoCaptureSession];
-        }
-        
-    }else if (!isAccessVideo && !isAccessAudio){
-        [self requestAccessForAVMediaType:AVMediaTypeAudio];
-        [self requestAccessForAVMediaType:AVMediaTypeVideo];
-        if (isAccessAudio) {
-            [_es initAudioCaptureSession];
-        }
-        if (isAccessVideo) {
-            [_es initVideoCaptureSession];
-        }
     }
+    
+//    if (isAccessAudio && isAccessVideo) {
+//        return;
+//    }
+//    if (isAccessVideo && !isAccessAudio) {
+//        [self requestAccessForAVMediaType:AVMediaTypeAudio];
+//        if (isAccessAudio) {
+//            [_es initAudioCaptureSession];
+//        }
+//    }else if (!isAccessVideo && isAccessAudio){
+////        [self requestAccessForAVMediaType:AVMediaTypeVideo];
+////        if (isAccessVideo) {
+////            [_es initVideoCaptureSession];
+////        }
+//
+//    }else if (!isAccessVideo && !isAccessAudio){
+//        [self requestAccessForAVMediaType:AVMediaTypeAudio];
+////        [self requestAccessForAVMediaType:AVMediaTypeVideo];
+//        if (isAccessAudio) {
+//            [_es initAudioCaptureSession];
+//        }
+////        if (isAccessVideo) {
+////            [_es initVideoCaptureSession];
+////        }
+//    }
 }
 - (void)willEnterBackground:(NSNotification *)notification {
     isBackGround = YES;
@@ -1049,9 +1069,9 @@
     if (!isAccessAudio) {
         [self requestAccessForAVMediaType:AVMediaTypeAudio];
     }
-    if (!isAccessVideo) {
-        [self requestAccessForAVMediaType:AVMediaTypeVideo];
-    }
+//    if (!isAccessVideo) {
+//        [self requestAccessForAVMediaType:AVMediaTypeVideo];
+//    }
     if (!iSAudioNotDetermined && iSVideoNotDetermined){
         [self creatAlertViewWith:@"鎺堟潈璇锋眰" message:@"楹﹀厠椋庢病鏈夋巿鏉�,璇峰湪璁剧疆涓紑鍚潈闄�,鍚﹀垯灏嗗奖鍝嶉�氳鍔熻兘銆�" cancel:@"纭畾"];
     }else if(iSAudioNotDetermined && !iSVideoNotDetermined){

--
Gitblit v1.8.0