Skip to content

Commit

Permalink
更新到V4播放协议
Browse files Browse the repository at this point in the history
  • Loading branch information
shengcui2018 committed Mar 13, 2020
1 parent aee6b17 commit 86e4e5d
Show file tree
Hide file tree
Showing 55 changed files with 1,490 additions and 1,157 deletions.
35 changes: 16 additions & 19 deletions Example/Example.xcodeproj/project.pbxproj
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
objects = {

/* Begin PBXBuildFile section */
9115CA9B2251AE23000CA93E /* LoopPlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9115CA9A2251AE23000CA93E /* LoopPlayViewController.m */; };
912A617B216074B700C16E41 /* danmakufile in Resources */ = {isa = PBXBuildFile; fileRef = 912A617A216074B700C16E41 /* danmakufile */; };
91625B9821ACE9CC0039E58E /* DownloadTableViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 91625B9721ACE9CB0039E58E /* DownloadTableViewController.m */; };
917AB1C921F16F0000D6B041 /* SimpleMovieController.m in Sources */ = {isa = PBXBuildFile; fileRef = 917AB1C821F16F0000D6B041 /* SimpleMovieController.m */; };
919D18852151E9F100947BF5 /* AppLogMgr.m in Sources */ = {isa = PBXBuildFile; fileRef = 919D187D2151E9F100947BF5 /* AppLogMgr.m */; };
919D18862151E9F100947BF5 /* MainTableViewCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 919D187F2151E9F100947BF5 /* MainTableViewCell.m */; };
919D18872151E9F100947BF5 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 919D18812151E9F100947BF5 /* MainViewController.m */; };
Expand All @@ -29,18 +27,16 @@
91A1D6D02147C0D500EA9A19 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 91A1D6CF2147C0D500EA9A19 /* Assets.xcassets */; };
91A1D6D32147C0D500EA9A19 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 91A1D6D12147C0D500EA9A19 /* LaunchScreen.storyboard */; };
91A1D6D62147C0D500EA9A19 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 91A1D6D52147C0D500EA9A19 /* main.m */; };
F20E02E7241BE73400196226 /* SimpleMovieController.m in Sources */ = {isa = PBXBuildFile; fileRef = F20E02E5241BE73300196226 /* SimpleMovieController.m */; };
F20E02EA241BE8B400196226 /* LoopPlayViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F20E02E8241BE8B400196226 /* LoopPlayViewController.m */; };
FB2B82D064582E49878F0546 /* libPods-Example.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BA2BBB2CD07BE7EF959CE320 /* libPods-Example.a */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
129BAA86323ECF5FE269806B /* Pods-Example.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.debug.xcconfig"; sourceTree = "<group>"; };
9115CA992251AE23000CA93E /* LoopPlayViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = LoopPlayViewController.h; sourceTree = "<group>"; };
9115CA9A2251AE23000CA93E /* LoopPlayViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = LoopPlayViewController.m; sourceTree = "<group>"; };
912A617A216074B700C16E41 /* danmakufile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xml; path = danmakufile; sourceTree = "<group>"; };
91625B9621ACE9CB0039E58E /* DownloadTableViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadTableViewController.h; sourceTree = "<group>"; };
91625B9721ACE9CB0039E58E /* DownloadTableViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DownloadTableViewController.m; sourceTree = "<group>"; };
917AB1C721F16F0000D6B041 /* SimpleMovieController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SimpleMovieController.h; sourceTree = "<group>"; };
917AB1C821F16F0000D6B041 /* SimpleMovieController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SimpleMovieController.m; sourceTree = "<group>"; };
919D187C2151E9F100947BF5 /* AppLogMgr.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppLogMgr.h; sourceTree = "<group>"; };
919D187D2151E9F100947BF5 /* AppLogMgr.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppLogMgr.m; sourceTree = "<group>"; };
919D187E2151E9F100947BF5 /* MainTableViewCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainTableViewCell.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -80,6 +76,10 @@
91A1D6D42147C0D500EA9A19 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
91A1D6D52147C0D500EA9A19 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
BA2BBB2CD07BE7EF959CE320 /* libPods-Example.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Example.a"; sourceTree = BUILT_PRODUCTS_DIR; };
F20E02E5241BE73300196226 /* SimpleMovieController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SimpleMovieController.m; sourceTree = "<group>"; };
F20E02E6241BE73400196226 /* SimpleMovieController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimpleMovieController.h; sourceTree = "<group>"; };
F20E02E8241BE8B400196226 /* LoopPlayViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoopPlayViewController.m; sourceTree = "<group>"; };
F20E02E9241BE8B400196226 /* LoopPlayViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoopPlayViewController.h; sourceTree = "<group>"; };
F8E98CB518DA48C3D587C021 /* Pods-Example.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example.release.xcconfig"; path = "Pods/Target Support Files/Pods-Example/Pods-Example.release.xcconfig"; sourceTree = "<group>"; };
/* End PBXFileReference section */

Expand Down Expand Up @@ -184,8 +184,12 @@
919D188E2151F05E00947BF5 /* ListUI */,
919D188A2151F05D00947BF5 /* MoviePlayerViewController.h */,
919D18912151F05E00947BF5 /* MoviePlayerViewController.m */,
F20E02E6241BE73400196226 /* SimpleMovieController.h */,
F20E02E5241BE73300196226 /* SimpleMovieController.m */,
919D18942151F05E00947BF5 /* SuperPlayerGuideView.h */,
919D18932151F05E00947BF5 /* SuperPlayerGuideView.m */,
F20E02E9241BE8B400196226 /* LoopPlayViewController.h */,
F20E02E8241BE8B400196226 /* LoopPlayViewController.m */,
919D18952151F05E00947BF5 /* TXMoviePlayerNetApi.h */,
919D188B2151F05E00947BF5 /* TXMoviePlayerNetApi.m */,
919D188C2151F05E00947BF5 /* TXMoviePlayerNetDelegate.h */,
Expand All @@ -198,10 +202,6 @@
91A1D6C72147C0D200EA9A19 /* AppDelegate.m */,
91A1D6C92147C0D200EA9A19 /* ViewController.h */,
91A1D6CA2147C0D200EA9A19 /* ViewController.m */,
917AB1C721F16F0000D6B041 /* SimpleMovieController.h */,
917AB1C821F16F0000D6B041 /* SimpleMovieController.m */,
9115CA992251AE23000CA93E /* LoopPlayViewController.h */,
9115CA9A2251AE23000CA93E /* LoopPlayViewController.m */,
91A1D6CC2147C0D200EA9A19 /* Main.storyboard */,
91A1D6CF2147C0D500EA9A19 /* Assets.xcassets */,
91A1D6D12147C0D500EA9A19 /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -333,11 +333,11 @@
buildActionMask = 2147483647;
files = (
919D18962151F05F00947BF5 /* TXMoviePlayerNetApi.m in Sources */,
917AB1C921F16F0000D6B041 /* SimpleMovieController.m in Sources */,
F20E02E7241BE73400196226 /* SimpleMovieController.m in Sources */,
F20E02EA241BE8B400196226 /* LoopPlayViewController.m in Sources */,
919D1A5C2159E29400947BF5 /* TXWeiboListTableViewCell.m in Sources */,
919D18972151F05F00947BF5 /* TXMoviePlayInfoResponse.m in Sources */,
91A1D6CB2147C0D200EA9A19 /* ViewController.m in Sources */,
9115CA9B2251AE23000CA93E /* LoopPlayViewController.m in Sources */,
919D18852151E9F100947BF5 /* AppLogMgr.m in Sources */,
919D18862151E9F100947BF5 /* MainTableViewCell.m in Sources */,
919D18872151E9F100947BF5 /* MainViewController.m in Sources */,
Expand Down Expand Up @@ -491,7 +491,6 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = 5GHU44CJHG;
ENABLE_BITCODE = NO;
Expand All @@ -501,7 +500,7 @@
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.SuperPlayer;
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "Wildcard Dev";
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -514,19 +513,17 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = YES;
CODE_SIGN_IDENTITY = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
DEVELOPMENT_TEAM = "";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = QE8PS7F45A;
ENABLE_BITCODE = NO;
INFOPLIST_FILE = Example/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.DeviceManageIOSApp.dailybuild;
PRODUCT_BUNDLE_IDENTIFIER = com.tencent.fx.Example;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
TARGETED_DEVICE_FAMILY = "1,2";
};
name = Release;
Expand Down
5 changes: 0 additions & 5 deletions Example/Example.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
View file

This file was deleted.

21 changes: 0 additions & 21 deletions Example/Example/Assets.xcassets/help_small.imageset/Contents.json
View file

This file was deleted.

Binary file removed Example/Example/Assets.xcassets/help_small.imageset/[email protected]
View file
Binary file not shown.
95 changes: 0 additions & 95 deletions Example/Example/DrmPlayViewController.m
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Example/Example/ListUI/ListVideoCell.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@property NSArray<ListVideoUrl *> *hdUrl;
@property int type; // 0 - 点播；1 - 直播
- (void)addHdUrl:(NSString *)url withTitle:(NSString *)title;

- (void)setModel:(SuperPlayerModel *)model;
- (SuperPlayerModel *)getPlayerModel;
@end

Expand Down
14 changes: 12 additions & 2 deletions Example/Example/ListUI/ListVideoCell.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
@implementation ListVideoUrl
@end

@implementation ListVideoModel
@implementation ListVideoModel {
SuperPlayerModel *_model;
}
- (void)addHdUrl:(NSString *)url withTitle:(NSString *)title;
{
NSMutableArray *urls = @[].mutableCopy;
Expand All @@ -28,11 +30,19 @@ - (void)addHdUrl:(NSString *)url withTitle:(NSString *)title;
_hdUrl = urls;
}

- (void)setModel:(SuperPlayerModel *)model
{
_model = model;
}

- (SuperPlayerModel *)getPlayerModel
{
if (_model) {
return _model;
}
SuperPlayerModel *model = [SuperPlayerModel new];
SuperPlayerVideoId *videoId = [SuperPlayerVideoId new];
videoId.appId = [self appId];
model.appId = [self appId];
videoId.fileId = [self fileId];
model.videoId = videoId;
model.videoURL = self.url;
Expand Down
Loading

0 comments on commit 86e4e5d

Please sign in to comment.