isCallIn

artimenring-iOS/Artimenring/Classes/Data/VideoManager+juphoon.m

@@ -179,7 +179,7 @@
     NSDictionary *dic = @{kCallIetmKey:item};
     [[NSNotificationCenter defaultCenter] postNotificationName:NOTIFICATION_JUPHOON object:nil userInfo:dic];
     if (self.mJuphoonCall.callItems.count == 1) {
-        [self showInCallVC:VIDEO_TYPE_JUPHOON isIncomming:item.direction == JCCallDirectionIn];
+        [self showInCallVC:VIDEO_TYPE_JUPHOON isCallIn:item.direction == JCCallDirectionIn];
     }
 }
 

artimenring-iOS/Artimenring/Classes/Data/VideoManager+view.h

@@ -12,7 +12,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface VideoManager (view)
 
-- (void)showInCallVC:(NSInteger)type isIncomming:(BOOL)isIncomming;
+- (void)showInCallVC:(NSInteger)type isCallIn:(BOOL)isCallIn;
 - (void)removeInCallVC;
 
 @end

artimenring-iOS/Artimenring/Classes/Data/VideoManager+view.m

@@ -10,14 +10,14 @@
 
 @implementation VideoManager (view)
 
-- (void)showInCallVC:(NSInteger)type isIncomming:(BOOL)isIncomming {
+- (void)showInCallVC:(NSInteger)type isCallIn:(BOOL)isCallIn {
     if (self.mInCallVC)
         return;
     NSLog(@"VideoManager: showInCallVC");
     UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"Main" bundle:nil];
     self.mInCallVC = [storyboard instantiateViewControllerWithIdentifier:@"InCallVC"];
     self.mInCallVC.mVideoType = type;
-    self.mInCallVC.isIncomming = isIncomming;
+    self.mInCallVC.isCallIn = isCallIn;
     [self.mInCallVC setHidesBottomBarWhenPushed:YES];
     [EUtil pushViewController:self.mInCallVC animated:YES];
 }

artimenring-iOS/Artimenring/Classes/Data/VideoManager.h

@@ -45,7 +45,7 @@ NS_ASSUME_NONNULL_BEGIN
 - (void)clear;
 
 - (void)videoCallOut:(NSString*)uid ticket:(NSString*)ticket;
-- (void)videoEnd:(BOOL)isIncomming isSendMessage:(BOOL)isSendMessage;
+- (void)videoEnd:(BOOL)isCallIn isSendMessage:(BOOL)isSendMessage;
 - (void)videoAnswer;
 - (void)switchCamera;
 

artimenring-iOS/Artimenring/Classes/Data/VideoManager.m

@@ -57,7 +57,7 @@
     if (model.videoType == VIDEO_TYPE_JUPHOON) {
         [self loginJuphoon];
     } else if (model.videoType == VIDEO_TYPE_AGORA) {
-        [self showInCallVC:model.videoType isIncomming:YES];
+        [self showInCallVC:model.videoType isCallIn:YES];
     }
 }
 
@@ -91,15 +91,15 @@
         [self requestVideo:uid ticket:ticket dial:1 callback:^(BOOL isOK, NSString *token) {
             if (isOK && token.length > 0) {
                 self.mToken = token;
-                [weak_self showInCallVC:model.videoType isIncomming:NO];
+                [weak_self showInCallVC:model.videoType isCallIn:NO];
                 [weak_self startTimeoutTimer];
             }
         }];
     }
 }
 
-- (void)videoEnd:(BOOL)isIncomming isSendMessage:(BOOL)isSendMessage {
-    HDNormalLog(([NSString stringWithFormat:@"VideoManager: videoEnd:%d", isIncomming]));
+- (void)videoEnd:(BOOL)isCallIn isSendMessage:(BOOL)isSendMessage {
+    HDNormalLog(([NSString stringWithFormat:@"VideoManager: videoEnd:%d", isCallIn]));
     //发消息
     if (isSendMessage) {
         [self requestVideo:self.uid ticket:self.mTicket dial:-1 callback:^(BOOL isOK, NSString *token) {

artimenring-iOS/Artimenring/Classes/ViewController/Call/SKInCallViewController.h

@@ -54,7 +54,7 @@
 @property(nonatomic, assign) NSInteger mTimecost;
 
 @property (nonatomic, assign) VIDEO_TYPE mVideoType;
-@property (nonatomic, assign) BOOL isIncomming;
+@property (nonatomic, assign) BOOL isCallIn;
 
 - (void)initCallView;
 - (void)initAnswerView;

artimenring-iOS/Artimenring/Classes/ViewController/Call/SKInCallViewController.m

@@ -42,12 +42,12 @@
         [self initJuphoon];
     } else if (self.mVideoType == VIDEO_TYPE_AGORA) {
         [self initAgora];
-        if (self.isIncomming) {
+        if (self.isCallIn) {
             [self initAnswerView];
         } else {
             [self initCallView];
         }
-        if (!self.isIncomming) {
+        if (!self.isCallIn) {
             [[VideoManager shared] videoAnswer];
         }
     }