iOS 更新 7.6.9355

tencentyun · Aug 21, 2020 · a6d94c8 · a6d94c8
1 parent 4d288d1
commit a6d94c8
Show file tree

Hide file tree

Showing 15 changed files with 170 additions and 3,289 deletions.
diff --git a/iOS/Demo/Podfile.lock b/iOS/Demo/Podfile.lock
@@ -15,24 +15,8 @@ PODS:
   - AFNetworking/UIKit (4.0.0):
     - AFNetworking/NSURLSession
   - Alamofire (4.9.1)
-  - BlocksKit (2.2.5):
-    - BlocksKit/All (= 2.2.5)
-  - BlocksKit/All (2.2.5):
-    - BlocksKit/Core
-    - BlocksKit/DynamicDelegate
-    - BlocksKit/MessageUI
-    - BlocksKit/UIKit
-  - BlocksKit/Core (2.2.5)
-  - BlocksKit/DynamicDelegate (2.2.5)
-  - BlocksKit/MessageUI (2.2.5):
-    - BlocksKit/Core
-    - BlocksKit/DynamicDelegate
-  - BlocksKit/UIKit (2.2.5):
-    - BlocksKit/Core
-    - BlocksKit/DynamicDelegate
   - Bugly (2.5.2)
   - CWStatusBarNotification (2.3.5)
-  - HandyJSON (5.0.1)
   - Masonry (1.1.0)
   - Material (3.1.8):
     - Material/Core (= 3.1.8)
@@ -73,17 +57,14 @@ PODS:
     - AFNetworking
     - Masonry
     - SDWebImage
-  - SwiftyJSON (4.3.0)
   - Toast-Swift (5.0.1)
-  - TXIMSDK_iOS (4.8.50)
+  - TXIMSDK_iOS (4.9.1)
 
 DEPENDENCIES:
   - AFNetworking
   - Alamofire
-  - BlocksKit (~> 2.2.5)
   - Bugly
   - CWStatusBarNotification (~> 2.3.5)
-  - HandyJSON (~> 5.0.1)
   - Masonry
   - Material
   - MBProgressHUD (~> 1.2.0)
@@ -98,18 +79,15 @@ DEPENDENCIES:
   - SuperPlayer/Player (from `./TXLiteAVDemo/SuperPlayerKit/SuperPlayer.podspec`)
   - SuperPlayer/Professional (from `./TXLiteAVDemo/SuperPlayerKit/SuperPlayer.podspec`)
   - SuperPlayer/UGC (from `./TXLiteAVDemo/SuperPlayerKit/SuperPlayer.podspec`)
-  - SwiftyJSON (~> 4.0)
   - Toast-Swift
-  - TXIMSDK_iOS (= 4.8.50)
+  - TXIMSDK_iOS (= 4.9.1)
 
 SPEC REPOS:
   trunk:
     - AFNetworking
     - Alamofire
-    - BlocksKit
     - Bugly
     - CWStatusBarNotification
-    - HandyJSON
     - Masonry
     - Material
     - MBProgressHUD
@@ -122,7 +100,6 @@ SPEC REPOS:
     - RxSwift
     - SDWebImage
     - SnapKit
-    - SwiftyJSON
     - Toast-Swift
     - TXIMSDK_iOS
 
@@ -133,10 +110,8 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   AFNetworking: d9fdf484a3c723ec3c558a41cc5754c7e845ee77
   Alamofire: 85e8a02c69d6020a0d734f6054870d7ecb75cf18
-  BlocksKit: 7f422b971407001178d181a43b99014ea2591fe6
   Bugly: dbac48b55ad469a97cc4321045cd50df8f63d44f
   CWStatusBarNotification: 3d2738b25c3207f60cc50201388d3c96182545ff
-  HandyJSON: d45b8415c501e3affc59ca9762c1197ff0feb646
   Masonry: 678fab65091a9290e40e2832a55e7ab731aad201
   Material: a2a3f400a3b549d53ef89e56c58c4535b29db387
   MBProgressHUD: 3ee5efcc380f6a79a7cc9b363dd669c5e1ae7406
@@ -150,10 +125,9 @@ SPEC CHECKSUMS:
   SDWebImage: 7edb9c3ea661e77a66661f7f044de8c1b55d1120
   SnapKit: fe8a619752f3f27075cc9a90244d75c6c3f27e2a
   SuperPlayer: 3f49af712410a59c42c2c9bfcacd33e3a0e3e5ab
-  SwiftyJSON: 6faa0040f8b59dead0ee07436cbf76b73c08fd08
   Toast-Swift: 9b6a70f28b3bf0b96c40d46c0c4b9d6639846711
-  TXIMSDK_iOS: ae26f78e028e01beed47127ea6bde03c11156208
+  TXIMSDK_iOS: 587e25fa8b42c9f228bb9065084270fa6990190f
 
-PODFILE CHECKSUM: bc7ae6341f637f2058f4840c1a67f65ac52d02ea
+PODFILE CHECKSUM: 0b906c44c4bdbbd9e56cc31a85da3944c818ae5c
 
-COCOAPODS: 1.9.1
+COCOAPODS: 1.9.3
diff --git a/iOS/Demo/ReplaykitUpload/Info.plist b/iOS/Demo/ReplaykitUpload/Info.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.5.424</string>
+	<string>7.6.504</string>
 	<key>CFBundleVersion</key>
-	<string>424</string>
+	<string>504</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/iOS/Demo/ReplaykitUpload/SampleHandler.m b/iOS/Demo/ReplaykitUpload/SampleHandler.m
@@ -230,8 +230,8 @@ - (void)handleReplayKit2RotateChangeNotification:(NSNotification*)noti
 
 - (void)handleReplayKit2ResolutionChangeNotification:(NSNotification*)noti
 {
-    NSString *s_resolution = [self _getConfigForKey:kReplayKit2ResolutionKey fromConfig:noti.userInfo];
-    if (s_resolution.length == 0) {
+    NSString *resolution = [self _getConfigForKey:kReplayKit2ResolutionKey fromConfig:noti.userInfo];
+    if (resolution.length == 0) {
         return;
     }
 //    [self sendLocalNotificationToHostAppWithTitle:@"腾讯云录屏推流" msg:s_resolution userInfo:nil];
@@ -245,6 +245,7 @@ - (void)handleReplayKit2ResolutionChangeNotification:(NSNotification*)noti
 //
 //    }
 //    return;
+    s_resolution = resolution;
     [self setCustomRotationAndResolution:s_landScape?kReplayKit2Lanscape:kReplayKit2Portrait resolution:s_resolution];
 }
 

diff --git a/iOS/Demo/ReplaykitUpload/TRTCInfo.plist b/iOS/Demo/ReplaykitUpload/TRTCInfo.plist
@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.5.424</string>
+	<string>7.6.504</string>
 	<key>CFBundleVersion</key>
-	<string>424</string>
+	<string>504</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

diff --git a/iOS/Demo/TXLiteAVDemo.xcodeproj/project.pbxproj b/iOS/Demo/TXLiteAVDemo.xcodeproj/project.pbxproj
diff --git a/iOS/Demo/TXLiteAVDemo/App/AppCommon/Catetory/HUDHelper.h b/iOS/Demo/TXLiteAVDemo/App/AppCommon/Catetory/HUDHelper.h
@@ -19,11 +19,8 @@ typedef void (^CommonVoidBlock)(void);
 + (HUDHelper *)sharedInstance;
 
 + (void)alert:(NSString *)msg;
-+ (void)alert:(NSString *)msg action:(CommonVoidBlock)action;
 + (void)alert:(NSString *)msg cancel:(NSString *)cancel;
-+ (void)alert:(NSString *)msg cancel:(NSString *)cancel action:(CommonVoidBlock)action;
 + (void)alertTitle:(NSString *)title message:(NSString *)msg cancel:(NSString *)cancel;
-+ (void)alertTitle:(NSString *)title message:(NSString *)msg cancel:(NSString *)cancel action:(CommonVoidBlock)action;
 
 // 网络请求
 - (MBProgressHUD *)loading;

diff --git a/iOS/Demo/TXLiteAVDemo/App/AppCommon/Catetory/HUDHelper.m b/iOS/Demo/TXLiteAVDemo/App/AppCommon/Catetory/HUDHelper.m
@@ -8,7 +8,6 @@
 
 #import "HUDHelper.h"
 #import "NSString+Common.h"
-#import <BlocksKit/UIAlertView+BlocksKit.h>
 #import "TXLiteAVDemo-Swift.h"
 
 @implementation HUDHelper
@@ -32,35 +31,18 @@ + (void)alert:(NSString *)msg
 {
     [HUDHelper alert:msg cancel:@"确定"];
 }
-+ (void)alert:(NSString *)msg action:(CommonVoidBlock)action
-{
-    [HUDHelper alert:msg cancel:@"确定" action:action];
-}
+
 + (void)alert:(NSString *)msg cancel:(NSString *)cancel
 {
     [HUDHelper alertTitle:@"提示" message:msg cancel:cancel];
 }
-+ (void)alert:(NSString *)msg cancel:(NSString *)cancel action:(CommonVoidBlock)action
-{
-    [HUDHelper alertTitle:@"提示" message:msg cancel:cancel action:action];
-}
+
 + (void)alertTitle:(NSString *)title message:(NSString *)msg cancel:(NSString *)cancel
 {
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:title message:msg delegate:nil cancelButtonTitle:cancel otherButtonTitles:nil, nil];
     [alert show];
 }
 
-+ (void)alertTitle:(NSString *)title message:(NSString *)msg cancel:(NSString *)cancel action:(CommonVoidBlock)action
-{
-    UIAlertView *alert = [UIAlertView bk_showAlertViewWithTitle:title message:msg cancelButtonTitle:cancel otherButtonTitles:nil handler:^(UIAlertView *alertView, NSInteger buttonIndex) {
-        if (action)
-        {
-            action();
-        }
-    }];
-    [alert show];
-}
-
 - (MBProgressHUD *)loading
 {
     return [self loading:nil];

diff --git a/iOS/Demo/TXLiteAVDemo/App/AppCommon/CommonUtils/TCUtil.h b/iOS/Demo/TXLiteAVDemo/App/AppCommon/CommonUtils/TCUtil.h
@@ -4,9 +4,8 @@
  * Function: 实用函数
  */
 
-#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
 #import "TCLog.h"
-#import <BlocksKit/UIAlertView+BlocksKit.h>
 
 
 #define IPHONE_X \

diff --git a/iOS/Demo/TXLiteAVDemo/App/AppDelegate.m b/iOS/Demo/TXLiteAVDemo/App/AppDelegate.m
@@ -9,6 +9,7 @@
 #import "AppDelegate.h"
 #import <Bugly/Bugly.h>
 
+
 #ifdef ENABLE_TRTC
 #ifdef ENABLE_PLAY
 #import "TRTCCloud.h"
@@ -51,7 +52,6 @@
 #import "TXLaunchMoviePlayProtocol.h"
 #endif
 
-
 #define BUGLY_APP_ID @"0"
 
 NSString *helpUrlDb[] = {
@@ -247,7 +247,7 @@ - (NSDictionary *)getParamsFromURL:(NSString *)queryStr {
 
 #pragma mark - 扫码拉起APP播放视频
 - (void)playVideoFromLaunchInfo:(NSDictionary *)launchInfo {
-    #if defined(PLAYER) || defined(PROFESSIONAL) || defined(ENTERPRISE)
+#if defined(PLAYER) || defined(PROFESSIONAL) || defined(ENTERPRISE)
     __weak UINavigationController *rootVC = (UINavigationController *)self.window.rootViewController;
     if (launchInfo && [rootVC isKindOfClass:[UINavigationController class]]) {
         if ([self findClass:NSClassFromString(@"LoginViewController") InNav:rootVC]) {
@@ -275,7 +275,7 @@ - (void)playVideoFromLaunchInfo:(NSDictionary *)launchInfo {
             }
         }
     }
-    #endif
+#endif
 }
 
 - (UIViewController *)findVCWith:(Class)aclass InNav:(UINavigationController *)nav {

diff --git a/iOS/Demo/TXLiteAVDemo/App/Info.plist b/iOS/Demo/TXLiteAVDemo/App/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.5.424</string>
+	<string>7.6.504</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>424</string>
+	<string>504</string>
 	<key>IMSDKCrashReporterEnable</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/iOS/Demo/TXLiteAVDemo/App/Main/MainViewController.m b/iOS/Demo/TXLiteAVDemo/App/Main/MainViewController.m
@@ -79,8 +79,7 @@ @interface MainViewController ()<
 @property (nonatomic) NSMutableArray* logFilesArray;
 
 #ifdef ENABLE_TRTC
-@property (nonatomic, strong) VideoSelectContactViewController *videoCallVC;
-@property (nonatomic, strong) AudioSelectContactViewController *audioCallVC;
+@property (nonatomic, strong) TRTCCallingContactViewController *videoCallVC;
 @property (nonatomic, strong) TRTCLiveRoom *liveRoom;
 @property (nonatomic, strong) TRTCVoiceRoom *voiceRoom;
 #endif
@@ -106,15 +105,11 @@ - (void)viewDidLoad {
 #endif
 
 #ifdef ENABLE_TRTC
-    _videoCallVC = [[VideoSelectContactViewController alloc] init];
-    _audioCallVC = [[AudioSelectContactViewController alloc] init];
+    _videoCallVC = [[TRTCCallingContactViewController alloc] init];
     _voiceRoom = [TRTCVoiceRoom sharedInstance];
-    [[TRTCVideoCall shared] setup];
-    [TRTCVideoCall shared].delegate = _videoCallVC;
+    [[TRTCCalling shareInstance] addDelegate:_videoCallVC];
 
-    [[TRTCAudioCall shared] setup];
-    [TRTCAudioCall shared].delegate = _audioCallVC;
-
+
 #endif
 
     [self initCellInfos];
@@ -133,13 +128,6 @@ -(void)viewDidAppear:(BOOL)animated {
 #endif
 }
 
-- (void)dealloc {
-#ifdef ENABLE_TRTC
-    [[TRTCVideoCall shared] destroy];
-    [[TRTCAudioCall shared] destroy];
-#endif
-}
-
 - (IBAction)logout:(id)sender {
     #if !defined(UGC) && !defined(PLAYER)
     UIAlertController *alert = [UIAlertController alertControllerWithTitle:@"确定要退出登录吗？" message:nil preferredStyle:UIAlertControllerStyleAlert];
@@ -335,10 +323,14 @@ - (void)initCellInfos
         [subCells addObject:scellInfo];
         scellInfo = [CellInfo cellInfoWithTitle:@"语音通话"
                    controllerCreationBlock:^UIViewController * _Nonnull{
-            return weakSelf.audioCallVC;
+            weakSelf.videoCallVC.title = @"语音通话";
+            weakSelf.videoCallVC.callType = CallType_Audio;
+            return weakSelf.videoCallVC;
         }];
         [subCells addObject:scellInfo];
         scellInfo = [CellInfo cellInfoWithTitle:@"视频通话" controllerCreationBlock:^UIViewController * _Nonnull{
+            weakSelf.videoCallVC.title = @"视频通话";
+            weakSelf.videoCallVC.callType = CallType_Video;
             return weakSelf.videoCallVC;
         }];
         [subCells addObject:scellInfo];
@@ -660,19 +652,14 @@ - (void)setupIMOnDidAppear {
 
     if (![[[V2TIMManager sharedInstance] getLoginUser] isEqual:userID]) {
         [[ProfileManager shared] IMLoginWithUserSig:userSig success:^{
-            [[TRTCAudioCall shared] loginWithSdkAppID:SDKAPPID user:userID userSig:userSig success:^{
-            } failed:^(NSInteger code, NSString *error) {
-
-            }];
-
-            [[TRTCVideoCall shared] loginWithSdkAppID:SDKAPPID user:userID userSig:userSig success:^{
-            } failed:^(NSInteger code, NSString *error) {
-
+            [[TRTCCalling shareInstance] login:SDKAPPID user:userID userSig:userSig success:^{
+                NSLog(@"Calling login success.");
+            } failed:^(int code, NSString * _Nonnull des) {
+                NSLog(@"Calling login failed.");
             }];
             [[TRTCMeeting sharedInstance] login:SDKAPPID userId:userID userSig:userSig callback:^(NSInteger code, NSString *message) {
 
             }];
-
         } failed:^(NSString * error) {
 
         }];

diff --git a/iOS/Demo/TXLiteAVDemo/App/TRTC-Appstore-Info.plist b/iOS/Demo/TXLiteAVDemo/App/TRTC-Appstore-Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.5.424</string>
+	<string>7.6.504</string>
 	<key>CFBundleSignature</key>
 	<string>BNDL</string>
 	<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>424</string>
+	<string>504</string>
 	<key>IMSDKCrashReporterEnable</key>
 	<false/>
 	<key>LSRequiresIPhoneOS</key>

diff --git a/iOS/Demo/TXLiteAVDemo/App/TXLiteAVDemo-Bridging-Header.h b/iOS/Demo/TXLiteAVDemo/App/TXLiteAVDemo-Bridging-Header.h
@@ -20,6 +20,7 @@
 #import "TRTCVoiceRoomDef.h"
 #import "TRTCVoiceRoom.h"
 #import "TRTCLiveRoom.h"
+#import "TRTCCalling.h"
 #endif
 
 #import "AppDelegate.h"