Skip to content

Commit

Permalink
1. Upgrade demo for picture-in-picture function
Browse files Browse the repository at this point in the history
  • Loading branch information
ianyanzhang committed Sep 1, 2023
1 parent e1cef7a commit cb84b66
Show file tree
Hide file tree
Showing 64 changed files with 409 additions and 300 deletions.
2 changes: 1 addition & 1 deletion Demo/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def common_pods_all
pod 'AFNetworking'
pod 'BlocksKit', '~> 2.2.5'
pod 'CWStatusBarNotification', '~> 2.3.5'
pod 'TXLiteAVSDK_Player', '~> 11.3.14342'
pod 'TXLiteAVSDK_Player', '~> 11.4.14445'
end

def common_pods_smart
Expand Down
12 changes: 12 additions & 0 deletions Demo/TXLiteAVDemo.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
EDC1B2C02847C9A60077A920 /* VideoCacheListCell.m in Sources */ = {isa = PBXBuildFile; fileRef = EDC1B2AE2847C9A60077A920 /* VideoCacheListCell.m */; };
EDC1B2C12847C9A60077A920 /* VideoCacheListView.m in Sources */ = {isa = PBXBuildFile; fileRef = EDC1B2AF2847C9A60077A920 /* VideoCacheListView.m */; };
EDC1B2C22847C9A60077A920 /* VideoCacheListModel.m in Sources */ = {isa = PBXBuildFile; fileRef = EDC1B2B32847C9A60077A920 /* VideoCacheListModel.m */; };
EDD28B1A2AA0685C0052D106 /* TXVodPlayer.bundle in Resources */ = {isa = PBXBuildFile; fileRef = EDD28B192AA0685C0052D106 /* TXVodPlayer.bundle */; };
EDF0D82929A8BC4600EA1238 /* SuperPlayerKitBundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = ED59415D2938C908006FFA17 /* SuperPlayerKitBundle.bundle */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -407,6 +408,7 @@
EDC1B2B62847C9A60077A920 /* ResolutionModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResolutionModel.h; sourceTree = "<group>"; };
EDC1B2B72847C9A60077A920 /* VideoCacheCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoCacheCell.h; sourceTree = "<group>"; };
EDC1B2B82847C9A60077A920 /* VideoCacheView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoCacheView.h; sourceTree = "<group>"; };
EDD28B192AA0685C0052D106 /* TXVodPlayer.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TXVodPlayer.bundle; sourceTree = "<group>"; };
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>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -441,6 +443,7 @@
172F22E127311FFE00FA7882 /* Resources */ = {
isa = PBXGroup;
children = (
EDD28B182AA0685C0052D106 /* Vod */,
172F22E8273120B500FA7882 /* Live */,
);
path = Resources;
Expand Down Expand Up @@ -1209,6 +1212,14 @@
path = VideoCacheListView;
sourceTree = "<group>";
};
EDD28B182AA0685C0052D106 /* Vod */ = {
isa = PBXGroup;
children = (
EDD28B192AA0685C0052D106 /* TXVodPlayer.bundle */,
);
path = Vod;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -1319,6 +1330,7 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
EDD28B1A2AA0685C0052D106 /* TXVodPlayer.bundle in Resources */,
C603F9B326047CB9009E3AB2 /* LaunchScreen_en.storyboard in Resources */,
47E8C8BF260AECC4001CF672 /* V2LiveLocalized.strings in Resources */,
47642AA7261491B90020F1BA /* [email protected] in Resources */,
Expand Down
5 changes: 5 additions & 0 deletions Demo/TXLiteAVDemo/App/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,11 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
self.didLaunched = YES;
[self playVideoFromLaunchInfo:self.launchInfo];
}

// 移除点播播放器配置UD
[[NSUserDefaults standardUserDefaults] removeObjectForKey:@"vodConfig"];
[[NSUserDefaults standardUserDefaults] synchronize];

return YES;
}

Expand Down
14 changes: 7 additions & 7 deletions Demo/TXLiteAVDemo/App/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>9.4.0</string>
<string>11.4.0</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleURLTypes</key>
Expand All @@ -36,7 +36,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1376</string>
<string>4162</string>
<key>IMSDKCrashReporterEnable</key>
<false/>
<key>LSApplicationQueriesSchemes</key>
Expand All @@ -51,15 +51,15 @@
<true/>
</dict>
<key>NSAppleMusicUsageDescription</key>
<string>视频云工具包需要访问你的媒体库权限以获取音乐,不允许则无法添加音乐</string>
<string>腾讯云视立方需要访问你的媒体库权限以获取音乐,不允许则无法添加音乐</string>
<key>NSCameraUsageDescription</key>
<string>视频云工具包需要访问你的相机权限,开启后用于视频录制,以及访问您实时拍摄的面部信息用于美颜功能的体验</string>
<string>腾讯云视立方需要访问你的相机权限,开启后用于视频录制,连麦互动,访问您实时互动的面部信息用于美颜功能的体验,扫描二维码获取视频播放地址</string>
<key>NSMicrophoneUsageDescription</key>
<string>视频云工具包需要访问你的麦克风权限,开启后录制的视频才会有声音</string>
<string>视频云工具包需要访问你的麦克风权限,开启后用于视频互动中获取音频数据输入</string>
<key>NSPhotoLibraryAddUsageDescription</key>
<string>视频云工具包需要访问你的相册权限,开启后才能保存编辑的文件</string>
<string>腾讯云视立方需要访问你的相册权限,开启后用于直播互动过程中的直播截图保存到相册,短视频录制保存到本地相册,在播放器中播放本地相册里的视频</string>
<key>NSPhotoLibraryUsageDescription</key>
<string>视频云工具包需要访问你的相册权限,开启后才能编辑视频文件</string>
<string>腾讯云视立方需要访问你的相册权限,开启后用于直播互动过程中的直播截图保存到相册,短视频录制保存到本地相册,在播放器中播放本地相册里的视频</string>
<key>UIBackgroundModes</key>
<array>
<string>audio</string>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_setting.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "btn_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "btn_unselected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_cache_time.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_fill.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_log_show.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_pause.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_portrait.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_setting.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "play_start.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "navi_log.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading

0 comments on commit cb84b66

Please sign in to comment.