From 9c9568e2db61dac96566f57d5312eaae53d8b386 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期四, 11 三月 2021 17:40:52 +0800
Subject: [PATCH] 2021-03-11 1.增加ON+集成丰林项目相关工程

---
 ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm b/ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm
index 8a46522..eadb201 100644
--- a/ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm
+++ b/ESVideoPhoneSDKDemo1.2/ESVideoPhoneSDKDemo/ESVideoPhoneSDKDemo/ViewController.mm
@@ -21,6 +21,7 @@
 #import <ESVideoPhoneSDk/ESVideoPhone.h>
 #import <ESVideoPhoneSDk/ESError.h>
 #import "AudioSessionHelper.h"
+#import "ESVideo.h"
 
 @interface ViewController ()<ESVideoPhoneDelegate,UITextFieldDelegate>
 
@@ -49,18 +50,21 @@
 }
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    [ESVideo.shareInstance initSDK];
     //鍒濆鍖栦腑鏂紝杩涘叆鍚庡彴鐨則ag
     _playing = NO;
     _isSpeaking = NO;
     self.isInterrupt = NO;
+    _es = ESVideo.shareInstance.es;
     _es.isInterrupt = NO;
     isBackGround = NO;
     [_speakerBtn setTitle:@"鍚瓛" forState:UIControlStateNormal];
 //    _mCallOrAccept.enabled = NO;
 //    _monitorBtn.enabled = NO;
 //    _uIDTextField.text = @"JJY000016YWECG";//@"JJY000007FSEYX" 榛樿闂ㄥ彛鏈虹殑ID
-       _uIDTextField.text = @"JJY000017XLUXX";//@"JJY000007FSEYX" 榛樿闂ㄥ彛鏈虹殑ID
+//       _uIDTextField.text = @"JJY000017XLUXX";//@"JJY000007FSEYX" 榛樿闂ㄥ彛鏈虹殑ID
+    _uIDTextField.text = @"JJY000019VPLLF";//@"JJY000019VPLLF" 榛樿闂ㄥ彛鏈虹殑ID
+    
 //           _uIDTextField.text = @"JJY000016YWECG";//@"JJY000016YWECG" 榛樿闂ㄥ彛鏈虹殑ID
     
     _uIDTextField.delegate = self;    //鈿狅笍杩欓噷蹇呴』瑕佹鏌ユ槸鍚﹀凡缁忔巿鏉冨惁鍒欎細澶辫触锛屽垵濮嬪寲瑙嗛闊抽閲囬泦
@@ -74,12 +78,18 @@
              });
          };
          //闂ㄥ彛鏈轰細鏈夎棰戠殑闀垮楂橈紝鏄浐瀹氱殑锛堟殏鏃惰繕涓嶇‘瀹氾級
-         _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame:CGRectMake(10, 100, self.view.frame.size.width-20, (self.view.frame.size.width-20)/4*3) delegate:self imagecallBack:snapImageCallback];
+//         _es = [[ESVideoPhone alloc]initESVideoPhoneWithFrame:CGRectMake(10, 100, self.view.frame.size.width-20, (self.view.frame.size.width-20)/4*3) delegate:self imagecallBack:snapImageCallback];
          if (_es) {
              //鍒ゆ柇瑙嗛娓叉煋鏄惁鍒濆鍖栨垚鍔燂紝濡傛灉澶辫触浼氳蛋ESVideoPhoneDelegate鏂规硶
              if (_es.showView) {
+//                 _es.showView.frame = CGRectMake(10, 100, self.view.frame.size.width-20, (self.view.frame.size.width-20)/4*3);
+                 ESVideo.shareInstance.snapImageCallback = snapImageCallback;
+                 _es.showView.backgroundColor = [UIColor greenColor];
                  _es.delegate = self;
                  [self.view addSubview:_es.showView];
+             }else{
+                 NSLog(@"_es.showView null");
+                 
              }
          }else{
              NSLog(@"ESVideoPhone 鍒濆鍖栧け璐�");
@@ -128,10 +138,12 @@
     [_es stopTalk];
 }
 -(void)dealloc{
+    _es.delegate = nil;
+//    _es.showView
       NSLog(@"==============dealloc1");
     [[NSNotificationCenter defaultCenter] removeObserver:self];
       NSLog(@"==============dealloc2");
-    [_es freeSubClass];
+//    [_es freeSubClass];
       NSLog(@"==============dealloc3");
 }
 

--
Gitblit v1.8.0