iOS 更新9.3

tencentyun · Nov 5, 2021 · 22b04a4 · 22b04a4
1 parent 6527129
commit 22b04a4
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 8 deletions.
diff --git a/iOS/TRTC-API-Example-OC/App/Info.plist b/iOS/TRTC-API-Example-OC/App/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleShortVersionString</key>
 	<string>1.0</string>
 	<key>CFBundleVersion</key>
-	<string>1302</string>
+	<string>1409</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

diff --git a/iOS/TRTC-API-Example-OC/App/PCH/TRTC-API-Example-OC-PrefixHeader.pch b/iOS/TRTC-API-Example-OC/App/PCH/TRTC-API-Example-OC-PrefixHeader.pch
@@ -13,7 +13,7 @@
 #import "GenerateTestUserSig.h"
 #import "NSString+Common.h"
 #import "UIViewController+AlertViewController.h"
-#import <TXLiteAVSDK_TRTC/TRTCCloudDelegate.h>
+@import TXLiteAVSDK_TRTC;
 
 
 #endif /* TRTC_API_Example_OC_PrefixHeader_pch */
diff --git a/iOS/TRTC-API-Example-OC/TRTC-API-Example-OC.xcodeproj/project.pbxproj b/iOS/TRTC-API-Example-OC/TRTC-API-Example-OC.xcodeproj/project.pbxproj
@@ -7,14 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		0E241895CFF53845F3E21AF1 /* TXLiteAVSDK_TRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33CA596735CB2A149D77601D /* TXLiteAVSDK_TRTC.framework */; };
 		17A5BD8626CBABBC007E91B1 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 17A5BD8326CBABBC007E91B1 /* README.md */; };
 		17A5BE0726CBCC21007E91B1 /* TRTC-API-Example-OC-PrefixHeader.pch in Sources */ = {isa = PBXBuildFile; fileRef = 477EC9F12626F77E007AAC4F /* TRTC-API-Example-OC-PrefixHeader.pch */; };
 		17A5C13F26CCF723007E91B1 /* ThirdBeautyBytedViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A5C13926CCF722007E91B1 /* ThirdBeautyBytedViewController.m */; };
 		17A5C14026CCF723007E91B1 /* ThirdBeautyBytedViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17A5C13A26CCF723007E91B1 /* ThirdBeautyBytedViewController.xib */; };
 		17A5C14226CCF723007E91B1 /* ThirdBeautyEntranceViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 17A5C13C26CCF723007E91B1 /* ThirdBeautyEntranceViewController.m */; };
 		17A5C14326CCF723007E91B1 /* ThirdBeautyEntranceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17A5C13E26CCF723007E91B1 /* ThirdBeautyEntranceViewController.xib */; };
-		210791D339EFE14046EEB572 /* TXLiteAVSDK_TRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33CA596735CB2A149D77601D /* TXLiteAVSDK_TRTC.framework */; };
+		2FCDA1C3833FAB202395CCBA /* TXLiteAVSDK_TRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BF6BE3939A2001D38AD68CA /* TXLiteAVSDK_TRTC.framework */; };
 		40D550EE26A6AEEE00FE9F13 /* libsqlite3.0.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 40D550ED26A6AED600FE9F13 /* libsqlite3.0.tbd */; };
 		40D550F026A6AEFB00FE9F13 /* AssetsLibrary.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 40D550EF26A6AEFA00FE9F13 /* AssetsLibrary.framework */; };
 		4723A7BF26315F920094AC81 /* OpenGLES.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4723A7BE26315F920094AC81 /* OpenGLES.framework */; };
@@ -117,6 +116,8 @@
 		889445E8262866DC00193FAD /* ScreenAudienceViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 889445E6262866DC00193FAD /* ScreenAudienceViewController.xib */; };
 		88A2C846267062FF006FC026 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47ECB98B2626868400201FCB /* Accelerate.framework */; };
 		88A2C84726706305006FC026 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 47ECB9882626867C00201FCB /* libc++.tbd */; };
+		A1D1D27B90E50600C25EC6FF /* TXLiteAVSDK_TRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9BF6BE3939A2001D38AD68CA /* TXLiteAVSDK_TRTC.framework */; };
+		C65F31572729388F00D9FB93 /* TXLiteAVSDK_TRTC.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 17A5C13426CCF54A007E91B1 /* TXLiteAVSDK_TRTC.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -163,7 +164,6 @@
 		17A5C13C26CCF723007E91B1 /* ThirdBeautyEntranceViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ThirdBeautyEntranceViewController.m; sourceTree = "<group>"; };
 		17A5C13D26CCF723007E91B1 /* ThirdBeautyBytedViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThirdBeautyBytedViewController.h; sourceTree = "<group>"; };
 		17A5C13E26CCF723007E91B1 /* ThirdBeautyEntranceViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = ThirdBeautyEntranceViewController.xib; sourceTree = "<group>"; };
-		33CA596735CB2A149D77601D /* TXLiteAVSDK_TRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_TRTC.framework; path = ../SDK/TXLiteAVSDK_TRTC.framework; sourceTree = "<group>"; };
 		40D550ED26A6AED600FE9F13 /* libsqlite3.0.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libsqlite3.0.tbd; path = usr/lib/libsqlite3.0.tbd; sourceTree = SDKROOT; };
 		40D550EF26A6AEFA00FE9F13 /* AssetsLibrary.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AssetsLibrary.framework; path = System/Library/Frameworks/AssetsLibrary.framework; sourceTree = SDKROOT; };
 		4723A7BE26315F920094AC81 /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
@@ -320,6 +320,7 @@
 		889445E4262866DC00193FAD /* ScreenAudienceViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ScreenAudienceViewController.h; sourceTree = "<group>"; };
 		889445E5262866DC00193FAD /* ScreenAudienceViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ScreenAudienceViewController.m; sourceTree = "<group>"; };
 		889445E6262866DC00193FAD /* ScreenAudienceViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = ScreenAudienceViewController.xib; sourceTree = "<group>"; };
+		9BF6BE3939A2001D38AD68CA /* TXLiteAVSDK_TRTC.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TXLiteAVSDK_TRTC.framework; path = ../SDK/TXLiteAVSDK_TRTC.framework; sourceTree = "<group>"; };
 		C99BF07371D8A29601F2FC64 /* Pods_TXReplayKit_Screen.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TXReplayKit_Screen.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		C9B2CC51BDD884255109D5F7 /* Pods_TRTC_API_Example_OC.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_TRTC_API_Example_OC.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 /* End PBXFileReference section */
@@ -335,10 +336,11 @@
 				4723A7BF26315F920094AC81 /* OpenGLES.framework in Frameworks */,
 				47ECB98C2626868400201FCB /* Accelerate.framework in Frameworks */,
 				4723A7C026315F9C0094AC81 /* Accelerate.framework in Frameworks */,
+				C65F31572729388F00D9FB93 /* TXLiteAVSDK_TRTC.framework in Frameworks */,
 				47ECB98E2626868E00201FCB /* libresolv.tbd in Frameworks */,
 				4723A7C526315FB10094AC81 /* libc++.tbd in Frameworks */,
 				4723A7C226315FA30094AC81 /* CoreMedia.framework in Frameworks */,
-				0E241895CFF53845F3E21AF1 /* TXLiteAVSDK_TRTC.framework in Frameworks */,
+				2FCDA1C3833FAB202395CCBA /* TXLiteAVSDK_TRTC.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -350,7 +352,7 @@
 				88A2C846267062FF006FC026 /* Accelerate.framework in Frameworks */,
 				8894458D26282AF800193FAD /* TXLiteAVSDK_ReplayKitExt.framework in Frameworks */,
 				8894456B26282A3200193FAD /* ReplayKit.framework in Frameworks */,
-				210791D339EFE14046EEB572 /* TXLiteAVSDK_TRTC.framework in Frameworks */,
+				A1D1D27B90E50600C25EC6FF /* TXLiteAVSDK_TRTC.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -468,7 +470,7 @@
 			isa = PBXGroup;
 			children = (
 				889444FD262824EA00193FAD /* TXLiteAVSDK_ReplayKitExt.framework */,
-				33CA596735CB2A149D77601D /* TXLiteAVSDK_TRTC.framework */,
+				9BF6BE3939A2001D38AD68CA /* TXLiteAVSDK_TRTC.framework */,
 			);
 			name = SDK;
 			path = ../SDK;
@@ -1235,6 +1237,10 @@
 					"@executable_path/SDK",
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../SDK";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1269,6 +1275,10 @@
 					"@executable_path/SDK",
 				);
 				LIBRARY_SEARCH_PATHS = "$(PROJECT_DIR)/../SDK";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fcxx-modules",
+				);
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.rtmpdemo2;
 				PRODUCT_NAME = "$(TARGET_NAME)";

diff --git a/iOS/TRTC说明文档.md b/iOS/TRTC说明文档.md
@@ -0,0 +1,58 @@
+## 目录结构说明
+
+本目录包含 iOS 版 TRTC-API-Example 的源代码，最简单的示例代码，使用Objective-C语言。包括视频通话、语音通话等基础功能以及一些高级功能。- TRTC-API-Example-OC： 
+
+```
+├─ TRTC-API-Example // TRTC API Example，包括视频通话、语音通话的基础功能以及一些高级功能
+|  ├─ AudioCall             // 演示 TRTC 音频通话的示例代码
+|  ├─ VideoCall             // 演示 TRTC 视频通话的示例代码
+|  ├─ Live                  // 演示 TRTC 视频互动直播的示例代码
+|  ├─ VoiceChatRoom         // 演示 TRTC 语音互动直播的示例代码
+|  ├─ ScreenShare           // 演示 TRTC 录屏直播的示例代码
+|  ├─ Advanced              // 演示 TRTC 高级功能示例代码
+|  |  ├─ StringRoomId              // 演示 TRTC 字符串房间号示例代码
+|  |  ├─ SetVideoQuality           // 演示 TRTC 画质设定示例代码
+|  |  ├─ SetAudioQuality           // 演示 TRTC 音质设定示例代码
+|  |  ├─ SetRenderParams           // 演示 TRTC 渲染控制示例代码
+|  |  ├─ SpeedTest                 // 演示 TRTC 网络测速示例代码
+|  |  ├─ PushCDN                   // 演示 TRTC CDN发布示例代码
+|  |  ├─ CustomCamera              // 演示 TRTC 自定义视频采集&amp;渲染发布示例代码
+|  |  ├─ SetAudioEffect            // 演示 TRTC 设置音效示例代码
+|  |  ├─ SetBackgroundMusic        // 演示 TRTC 设置背景音乐示例代码
+|  |  ├─ LocalVideoShare           // 演示 TRTC 本地视频文件分享示例代码
+|  |  ├─ LocalRecord               // 演示 TRTC 本地视频录制示例代码
+|  |  ├─ JoinMultipleRoom          // 演示 TRTC 加入多个房间示例代码
+|  |  ├─ SEIMessage                // 演示 TRTC 收发SEI消息示例代码
+|  |  ├─ SwitchRoom                // 演示 TRTC 快速切换房间示例代码
+|  |  ├─ RoomPk                    // 演示 TRTC 跨房PK示例代码
+|  |  ├─ ThirdBeauty               // 演示 TRTC 第三方美颜示例代码
+|  
+├─ SDK 
+|  ├─ TXLiteAVSDK_TRTC.framework          // 如果您下载的是精简版 zip 包，解压后将出现此文件夹
+|  ├─ TXLiteAVSDK_Professional.framework  // 如果您下载的是专业版 zip 包，解压后将出现此文件夹
+|  ├─ TXLiteAVSDK_Enterprise.framework    // 如果您下载的是企业版 zip 包，解压后将出现此文件夹
+
+```
+
+## SDK 分类和下载
+
+腾讯云 TRTC SDK 基于 LiteAVSDK 统一框架设计和实现，该框架包含直播、点播、短视频、RTC、AI美颜在内的多项功能：
+- 如果您追求最小化体积增量，可以下载 TRTC 精简版：[TXLiteAVSDK_TRTC.framework](https://cloud.tencent.com/document/product/647/32689#TRTC)
+- 如果您需要使用多个功能而不希望打包多个 SDK，可以下载专业版：[TXLiteAVSDK_Professional.framework](https://cloud.tencent.com/document/product/647/32689#Professional)
+- 如果您已经通过腾讯云商务购买了 AI 美颜 License，可以下载企业版：[TXLiteAVSDK_Enterprise.framework](https://cloud.tencent.com/document/product/647/32689#Enterprise)
+
+## 相关文档链接
+
+- [SDK 的版本更新历史](https://github.com/tencentyun/TRTCSDK/releases)
+- [SDK 的 API 文档](https://liteav.sdk.qcloud.com/doc/api/zh-cn/md_introduction_trtc_iOS_mac_%E6%A6%82%E8%A7%88.html)
+- [SDK 的官方体验 App](https://cloud.tencent.com/document/product/647/17021)
+- [场景方案：互动直播](https://cloud.tencent.com/document/product/647/43181)
+- [场景方案：视频通话](https://cloud.tencent.com/document/product/647/42044)
+- [场景方案：语音通话](https://cloud.tencent.com/document/product/647/42046)
+
+## 各场景化源码链接
+- [实时视频/语音通话](https://github.com/tencentyun/TUICalling/)
+- [视频互动直播](https://github.com/tencentyun/TUILiveRoom/)
+- [多人视频会议](https://github.com/tencentyun/TUIMeeting/)
+- [语音聊天室](https://github.com/tencentyun/TUIVoiceRoom/)
+- [语音沙龙](https://github.com/tencentyun/TUIChatSalon/)
diff --git a/iOS/TRTC说明文档.pdf b/iOS/TRTC说明文档.pdf