Release RongCloud CallKit SDK 2.8.14

rongcloud · Jul 19, 2017 · 1374aa3 · 1374aa3
1 parent 172301b
commit 1374aa3
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 4 deletions.
diff --git a/ios-rongcallkit/RongCallKit/Controller/RCCallBaseViewController.m b/ios-rongcallkit/RongCallKit/Controller/RCCallBaseViewController.m
@@ -12,13 +12,16 @@
 #import "RCCallKitUtility.h"
 #import "RCloudImageView.h"
 #import <AVFoundation/AVFoundation.h>
+#import <CoreTelephony/CTCallCenter.h>
+#import <CoreTelephony/CTCall.h>
 
 @interface RCCallBaseViewController ()
 
 @property(nonatomic, strong) NSTimer *activeTimer;
 @property(nonatomic, strong) AVAudioPlayer *audioPlayer;
 @property(nonatomic, assign) BOOL needPlayingAlertAfterForeground;
 @property(nonatomic, assign) BOOL needPlayingRingAfterForeground;
+@property(nonatomic, strong) CTCallCenter *callCenter;
 
 @end
 
@@ -140,6 +143,8 @@ - (void)viewDidLoad {
          selector:@selector(onOrientationChanged:)
              name:UIApplicationDidChangeStatusBarOrientationNotification
            object:nil];
+
+  [self registerTelephonyEvent];
 
   //    UIVisualEffect *blurEffect = [UIBlurEffect
   //    effectWithStyle:UIBlurEffectStyleDark];
@@ -156,7 +161,7 @@ - (void)onOrientationChanged:(NSNotification *)notification {
 }
 - (void)viewWillAppear:(BOOL)animated {
   [super viewWillAppear:animated];
-
+    
   if (self.callSession.callStatus == RCCallActive) {
     [self updateActiveTimer];
     [self startActiveTimer];
@@ -165,6 +170,7 @@ - (void)viewWillAppear:(BOOL)animated {
         @"VoIPCallWaitingForRemoteAccept", @"RongCloudKit", nil);
   } else if (self.callSession.callStatus == RCCallIncoming ||
              self.callSession.callStatus == RCCallRinging) {
+      [self shouldRingForIncomingCall];
     if (self.callSession.mediaType == RCCallMediaAudio) {
       self.tipsLabel.text = NSLocalizedStringFromTable(@"VoIPAudioCallIncoming",
                                                        @"RongCloudKit", nil);
@@ -208,11 +214,12 @@ - (UIButton *)minimizeButton {
 - (void)minimizeButtonClicked {
   [self didTapMinimizeButton];
 
+  Class selfClass = [self class];
   [RCCallFloatingBoard
       startCallFloatingBoard:self.callSession
             withTouchedBlock:^(RCCallSession *callSession) {
               [[RCCall sharedRCCall]
-                  presentCallViewController:[[[self class] alloc] initWithActiveCall:callSession]];
+                  presentCallViewController:[[selfClass alloc] initWithActiveCall:callSession]];
             }];
   [self stopActiveTimer];
   [[RCCall sharedRCCall] dismissCallViewController:self];
@@ -1286,6 +1293,17 @@ - (void)networkTxQuality:(RCCallQuality)txQuality rxQuality:(RCCallQuality)rxQua
 //  NSLog(@"networkTxQuality, %d, %d", txQuality, rxQuality);
 }
 
+#pragma mark - telephony
+- (void)registerTelephonyEvent {
+  self.callCenter = [[CTCallCenter alloc] init];
+  __weak __typeof(self) weakSelf = self;
+  self.callCenter.callEventHandler = ^(CTCall *call) {
+    if ([call.callState isEqualToString:CTCallStateConnected]) {
+      [weakSelf.callSession hangup];
+    }
+  };
+}
+
 #pragma mark - outside callback
 - (void)callWillConnect {
 }

diff --git a/ios-rongcallkit/RongCallKit/Info.plist b/ios-rongcallkit/RongCallKit/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.8.13</string>
+	<string>2.8.14</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

diff --git a/ios-rongcallkit/RongCallKit/Utility/RCCallFloatingBoard.m b/ios-rongcallkit/RongCallKit/Utility/RCCallFloatingBoard.m
@@ -9,11 +9,14 @@
 #import "RCCallFloatingBoard.h"
 #import "RCCallKitUtility.h"
 #import <UIKit/UIKit.h>
+#import <CoreTelephony/CTCallCenter.h>
+#import <CoreTelephony/CTCall.h>
 
 @interface RCCallFloatingBoard () <RCCallSessionDelegate>
 
 @property(nonatomic, strong) NSTimer *activeTimer;
 @property(nonatomic, copy) void (^touchedBlock)(RCCallSession *callSession);
+@property(nonatomic, strong) CTCallCenter *callCenter;
 
 @end
 
@@ -49,13 +52,24 @@ - (void)initBoard {
   [self updateActiveTimer];
   [self startActiveTimer];
   [self updateBoard];
+  [self registerTelephonyEvent];
   [[NSNotificationCenter defaultCenter]
       addObserver:self
          selector:@selector(onOrientationChanged:)
              name:UIApplicationDidChangeStatusBarOrientationNotification
            object:nil];
 }
 
+- (void)registerTelephonyEvent {
+  self.callCenter = [[CTCallCenter alloc] init];
+  __weak __typeof(self) weakSelf = self;
+  self.callCenter.callEventHandler = ^(CTCall *call) {
+    if ([call.callState isEqualToString:CTCallStateConnected]) {
+      [weakSelf.callSession hangup];
+    }
+  };
+}
+
 - (void)onOrientationChanged:(NSNotification *)notification {
   [self updateBoard];
 }

diff --git a/ios-rongcallkit/framework/RongCallLib.framework/Info.plist b/ios-rongcallkit/framework/RongCallLib.framework/Info.plist
diff --git a/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib b/ios-rongcallkit/framework/RongCallLib.framework/RongCallLib
diff --git a/ios-rongcallkit/framework/RongIMKit.framework/Info.plist b/ios-rongcallkit/framework/RongIMKit.framework/Info.plist
diff --git a/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit b/ios-rongcallkit/framework/RongIMKit.framework/RongIMKit
diff --git a/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h b/ios-rongcallkit/framework/RongIMLib.framework/Headers/RCCustomerServiceConfig.h
@@ -52,6 +52,7 @@
 
 @property(nonatomic) int userTipTime;
 @property(nonatomic, strong) NSString *userTipWord;
+
 /*!
  * 评价时机
  */
-Original file line number
+Diff line change
@@ Expand Up / @@ -52,6 +52,7 @@ @@
     @property(nonatomic) int userTipTime;
     @property(nonatomic, strong) NSString *userTipWord;
     /*!
      * 评价时机
      */
@@ Expand Down @@