Skip to content

Commit cb84b66

Browse files
author
ianyanzhang
committed
1. Upgrade demo for picture-in-picture function
1 parent e1cef7a commit cb84b66

File tree

64 files changed

+409
-300
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+409
-300
lines changed

‎Demo/Podfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def common_pods_all
2727
pod 'AFNetworking'
2828
pod 'BlocksKit', '~> 2.2.5'
2929
pod 'CWStatusBarNotification', '~> 2.3.5'
30-
pod 'TXLiteAVSDK_Player', '~> 11.3.14342'
30+
pod 'TXLiteAVSDK_Player', '~> 11.4.14445'
3131
end
3232

3333
def common_pods_smart

‎Demo/TXLiteAVDemo.xcodeproj/project.pbxproj‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
EDC1B2C02847C9A60077A920 /* VideoCacheListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EDC1B2AE2847C9A60077A920 /* VideoCacheListCell.m */; };
122122
EDC1B2C12847C9A60077A920 /* VideoCacheListView.m in Sources */ = {isa = PBXBuildFile; fileRef = EDC1B2AF2847C9A60077A920 /* VideoCacheListView.m */; };
123123
EDC1B2C22847C9A60077A920 /* VideoCacheListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EDC1B2B32847C9A60077A920 /* VideoCacheListModel.m */; };
124+
EDD28B1A2AA0685C0052D106 /* TXVodPlayer.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EDD28B192AA0685C0052D106 /* TXVodPlayer.bundle */; };
124125
EDF0D82929A8BC4600EA1238 /* SuperPlayerKitBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = ED59415D2938C908006FFA17 /* SuperPlayerKitBundle.bundle */; };
125126
/* End PBXBuildFile section */
126127

@@ -407,6 +408,7 @@
407408
EDC1B2B62847C9A60077A920 /* ResolutionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResolutionModel.h; sourceTree = "<group>"; };
408409
EDC1B2B72847C9A60077A920 /* VideoCacheCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoCacheCell.h; sourceTree = "<group>"; };
409410
EDC1B2B82847C9A60077A920 /* VideoCacheView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoCacheView.h; sourceTree = "<group>"; };
411+
EDD28B192AA0685C0052D106 /* TXVodPlayer.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TXVodPlayer.bundle; sourceTree = "<group>"; };
410412
FD55FF487EC5F3A9A38203AA /* Pods-TXLiteAVDemo_Player.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-TXLiteAVDemo_Player.debug.xcconfig"; path = "Target Support Files/Pods-TXLiteAVDemo_Player/Pods-TXLiteAVDemo_Player.debug.xcconfig"; sourceTree = "<group>"; };
411413
/* End PBXFileReference section */
412414

@@ -441,6 +443,7 @@
441443
172F22E127311FFE00FA7882 /* Resources */ = {
442444
isa = PBXGroup;
443445
children = (
446+
EDD28B182AA0685C0052D106 /* Vod */,
444447
172F22E8273120B500FA7882 /* Live */,
445448
);
446449
path = Resources;
@@ -1209,6 +1212,14 @@
12091212
path = VideoCacheListView;
12101213
sourceTree = "<group>";
12111214
};
1215+
EDD28B182AA0685C0052D106 /* Vod */ = {
1216+
isa = PBXGroup;
1217+
children = (
1218+
EDD28B192AA0685C0052D106 /* TXVodPlayer.bundle */,
1219+
);
1220+
path = Vod;
1221+
sourceTree = "<group>";
1222+
};
12121223
/* End PBXGroup section */
12131224

12141225
/* Begin PBXNativeTarget section */
@@ -1319,6 +1330,7 @@
13191330
isa = PBXResourcesBuildPhase;
13201331
buildActionMask = 2147483647;
13211332
files = (
1333+
EDD28B1A2AA0685C0052D106 /* TXVodPlayer.bundle in Resources */,
13221334
C603F9B326047CB9009E3AB2 /* LaunchScreen_en.storyboard in Resources */,
13231335
47E8C8BF260AECC4001CF672 /* V2LiveLocalized.strings in Resources */,
13241336
47642AA7261491B90020F1BA /* launchimage_en@2x.png in Resources */,

‎Demo/TXLiteAVDemo/App/AppDelegate.m‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
165165
self.didLaunched = YES;
166166
[self playVideoFromLaunchInfo:self.launchInfo];
167167
}
168+
169+
// 移除点播播放器配置UD
170+
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"vodConfig"];
171+
[[NSUserDefaults standardUserDefaults] synchronize];
172+
168173
return YES;
169174
}
170175

‎Demo/TXLiteAVDemo/App/Info.plist‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundlePackageType</key>
2020
<string>APPL</string>
2121
<key>CFBundleShortVersionString</key>
22-
<string>9.4.0</string>
22+
<string>11.4.0</string>
2323
<key>CFBundleSignature</key>
2424
<string>????</string>
2525
<key>CFBundleURLTypes</key>
@@ -36,7 +36,7 @@
3636
</dict>
3737
</array>
3838
<key>CFBundleVersion</key>
39-
<string>1376</string>
39+
<string>4162</string>
4040
<key>IMSDKCrashReporterEnable</key>
4141
<false/>
4242
<key>LSApplicationQueriesSchemes</key>
@@ -51,15 +51,15 @@
5151
<true/>
5252
</dict>
5353
<key>NSAppleMusicUsageDescription</key>
54-
<string>视频云工具包需要访问你的媒体库权限以获取音乐，不允许则无法添加音乐</string>
54+
<string>腾讯云视立方需要访问你的媒体库权限以获取音乐，不允许则无法添加音乐</string>
5555
<key>NSCameraUsageDescription</key>
56-
<string>视频云工具包需要访问你的相机权限，开启后用于视频录制，以及访问您实时拍摄的面部信息用于美颜功能的体验</string>
56+
<string>腾讯云视立方需要访问你的相机权限，开启后用于视频录制，连麦互动，访问您实时互动的面部信息用于美颜功能的体验，扫描二维码获取视频播放地址</string>
5757
<key>NSMicrophoneUsageDescription</key>
58-
<string>视频云工具包需要访问你的麦克风权限，开启后录制的视频才会有声音</string>
58+
<string>视频云工具包需要访问你的麦克风权限，开启后用于视频互动中获取音频数据输入</string>
5959
<key>NSPhotoLibraryAddUsageDescription</key>
60-
<string>视频云工具包需要访问你的相册权限，开启后才能保存编辑的文件</string>
60+
<string>腾讯云视立方需要访问你的相册权限，开启后用于直播互动过程中的直播截图保存到相册，短视频录制保存到本地相册，在播放器中播放本地相册里的视频</string>
6161
<key>NSPhotoLibraryUsageDescription</key>
62-
<string>视频云工具包需要访问你的相册权限，开启后才能编辑视频文件</string>
62+
<string>腾讯云视立方需要访问你的相册权限，开启后用于直播互动过程中的直播截图保存到相册，短视频录制保存到本地相册，在播放器中播放本地相册里的视频</string>
6363
<key>UIBackgroundModes</key>
6464
<array>
6565
<string>audio</string>

‎Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/Play/SuperPlayer/play_setting.imageset/Contents.json‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "play_setting.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "play_setting@2x.png",
10+
"idiom" : "universal",
11+
"scale" : "2x"
12+
},
13+
{
14+
"filename" : "play_setting@3x.png",
15+
"idiom" : "universal",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"author" : "xcode",
21+
"version" : 1
22+
}
23+
}

‎Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/Play/SuperPlayer/play_setting.imageset/play_setting.png‎

1.58 KB

‎Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/Play/SuperPlayer/play_setting.imageset/play_setting@2x.png‎

3.49 KB

‎Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/Play/SuperPlayer/play_setting.imageset/play_setting@3x.png‎

5.38 KB

‎Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/Play/btn_selected.imageset/Contents.json‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "btn_selected.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"version" : 1,
19+
"author" : "xcode"
20+
}
21+
}

‎Demo/TXLiteAVDemo/App/Resource/Assets.xcassets/Play/btn_selected.imageset/btn_selected.png‎

2.54 KB

0 commit comments

Comments
 (0)