commit 87776a893546e1a503b679172aa68055fd634f7b
author tkchin@webrtc.org <tkchin@webrtc.org> Tue Dec 09 19:32:35 2014 +0000
committer tkchin@webrtc.org <tkchin@webrtc.org> Tue Dec 09 19:32:35 2014 +0000
tree 40773e6a5f238108adfdf731314a9d8548be69e7
parent 0babb4a4e68f60a2862c98bafe4f9a748d077fff

iAppRTCDemo: WebSocket based signaling.

Updates the iOS code to use the new signaling model. Removes old Channel API
code. Note that this no longer logs messages to UI. UI update forthcoming.

BUG=
R=glaznev@webrtc.org, jiayl@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/35369004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7852 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m

diff --git a/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m b/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m
index d8d9714..3d60ee7 100644
--- a/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m
+++ b/talk/examples/objc/AppRTCDemo/ios/APPRTCViewController.m
@@ -32,38 +32,28 @@
 #import "APPRTCViewController.h"
 
 #import <AVFoundation/AVFoundation.h>
-#import "APPRTCConnectionManager.h"
+#import "ARDAppClient.h"
 #import "RTCEAGLVideoView.h"
 #import "RTCVideoTrack.h"
 
 // Padding space for local video view with its parent.
 static CGFloat const kLocalViewPadding = 20;
 
-@interface APPRTCViewController ()
-<APPRTCConnectionManagerDelegate, APPRTCLogger, RTCEAGLVideoViewDelegate>
+@interface APPRTCViewController () <ARDAppClientDelegate,
+    RTCEAGLVideoViewDelegate>
 @property(nonatomic, assign) UIInterfaceOrientation statusBarOrientation;
 @property(nonatomic, strong) RTCEAGLVideoView* localVideoView;
 @property(nonatomic, strong) RTCEAGLVideoView* remoteVideoView;
 @end
 
 @implementation APPRTCViewController {
-  APPRTCConnectionManager* _connectionManager;
+  ARDAppClient *_client;
   RTCVideoTrack* _localVideoTrack;
   RTCVideoTrack* _remoteVideoTrack;
   CGSize _localVideoSize;
   CGSize _remoteVideoSize;
 }
 
-- (instancetype)initWithNibName:(NSString*)nibName
-                         bundle:(NSBundle*)bundle {
-  if (self = [super initWithNibName:nibName bundle:bundle]) {
-    _connectionManager =
-        [[APPRTCConnectionManager alloc] initWithDelegate:self
-                                                   logger:self];
-  }
-  return self;
-}
-
 - (void)viewDidLoad {
   [super viewDidLoad];
 
@@ -96,48 +86,46 @@
 }
 
 - (void)applicationWillResignActive:(UIApplication*)application {
-  [self logMessage:@"Application lost focus, connection broken."];
   [self disconnect];
 }
 
-#pragma mark - APPRTCConnectionManagerDelegate
+#pragma mark - ARDAppClientDelegate
 
-- (void)connectionManager:(APPRTCConnectionManager*)manager
-    didReceiveLocalVideoTrack:(RTCVideoTrack*)localVideoTrack {
+- (void)appClient:(ARDAppClient *)client
+    didChangeState:(ARDAppClientState)state {
+  switch (state) {
+    case kARDAppClientStateConnected:
+      NSLog(@"Client connected.");
+      break;
+    case kARDAppClientStateConnecting:
+      NSLog(@"Client connecting.");
+      break;
+    case kARDAppClientStateDisconnected:
+      NSLog(@"Client disconnected.");
+      [self resetUI];
+      break;
+  }
+}
+
+- (void)appClient:(ARDAppClient *)client
+    didReceiveLocalVideoTrack:(RTCVideoTrack *)localVideoTrack {
   _localVideoTrack = localVideoTrack;
   [_localVideoTrack addRenderer:self.localVideoView];
   self.localVideoView.hidden = NO;
 }
 
-- (void)connectionManager:(APPRTCConnectionManager*)manager
-    didReceiveRemoteVideoTrack:(RTCVideoTrack*)remoteVideoTrack {
+- (void)appClient:(ARDAppClient *)client
+    didReceiveRemoteVideoTrack:(RTCVideoTrack *)remoteVideoTrack {
   _remoteVideoTrack = remoteVideoTrack;
   [_remoteVideoTrack addRenderer:self.remoteVideoView];
 }
 
-- (void)connectionManagerDidReceiveHangup:(APPRTCConnectionManager*)manager {
-  [self showAlertWithMessage:@"Remote hung up."];
+- (void)appClient:(ARDAppClient *)client
+         didError:(NSError *)error {
+  [self showAlertWithMessage:[NSString stringWithFormat:@"%@", error]];
   [self disconnect];
 }
 
-- (void)connectionManager:(APPRTCConnectionManager*)manager
-      didErrorWithMessage:(NSString*)message {
-  [self showAlertWithMessage:message];
-  [self disconnect];
-}
-
-#pragma mark - APPRTCLogger
-
-- (void)logMessage:(NSString*)message {
-  dispatch_async(dispatch_get_main_queue(), ^{
-    NSString* output =
-        [NSString stringWithFormat:@"%@\n%@", self.logView.text, message];
-    self.logView.text = output;
-    [self.logView
-        scrollRangeToVisible:NSMakeRange([self.logView.text length], 0)];
-  });
-}
-
 #pragma mark - RTCEAGLVideoViewDelegate
 
 - (void)videoView:(RTCEAGLVideoView*)videoView
@@ -162,9 +150,10 @@
   textField.hidden = YES;
   self.instructionsView.hidden = YES;
   self.logView.hidden = NO;
-  NSString* url =
-      [NSString stringWithFormat:@"https://apprtc.appspot.com/?r=%@", room];
-  [_connectionManager connectToRoomWithURL:[NSURL URLWithString:url]];
+  [_client disconnect];
+  // TODO(tkchin): support reusing the same client object.
+  _client = [[ARDAppClient alloc] initWithDelegate:self];
+  [_client connectToRoomWithId:room options:nil];
   [self setupCaptureSession];
 }
 
@@ -179,7 +168,7 @@
 
 - (void)disconnect {
   [self resetUI];
-  [_connectionManager disconnect];
+  [_client disconnect];
 }
 
 - (void)showAlertWithMessage:(NSString*)message {