Skip to content

GitLab

Commit cd58867c authored by Hanruisong's avatar Hanruisong
Browse files

feat: 更新到4.13.0 

1.新增自定义LOGO功能。
2.修复demo播放按钮显示异常的问题。
parent 43f9fa05
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 26 deletions
Demo/Demo.xcodeproj/project.pbxproj
View file @ cd58867c
......@@ -407,12 +407,12 @@
DD54280B250B55AB0097614C /* icon_ad_mute@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD542807250B55AB0097614C /* icon_ad_mute@3x.png */; };
DD54280C250B55AB0097614C /* icon_ad_mute@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD542808250B55AB0097614C /* icon_ad_mute@2x.png */; };
DD54280D250B55AB0097614C /* icon_ad_mute_select@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD542809250B55AB0097614C /* icon_ad_mute_select@3x.png */; };
DD89BEB025AC266C0000B315 /* DWResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD89BEAE25AC266C0000B315 /* DWResource.bundle */; };
DD89BEB125AC266C0000B315 /* vrlibraw.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD89BEAF25AC266C0000B315 /* vrlibraw.bundle */; };
DD89BEB225AC26730000B315 /* CCVodSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD89BEA925AC26340000B315 /* CCVodSDK.framework */; };
DD89BEB325AC26740000B315 /* CCVodSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD89BEA925AC26340000B315 /* CCVodSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DD89BEB425AC26770000B315 /* HDBaseUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD89BEAA25AC26340000B315 /* HDBaseUtils.framework */; };
DD89BEB525AC26770000B315 /* HDBaseUtils.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD89BEAA25AC26340000B315 /* HDBaseUtils.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DDDFFE9A25B6BA09009C54EE /* vrlibraw.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DDDFFE9825B6BA09009C54EE /* vrlibraw.bundle */; };
DDDFFE9B25B6BA09009C54EE /* DWResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DDDFFE9925B6BA09009C54EE /* DWResource.bundle */; };
DDDFFE9C25B6BA13009C54EE /* HDBaseUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDDFFE9525B6BA00009C54EE /* HDBaseUtils.framework */; };
DDDFFE9D25B6BA13009C54EE /* HDBaseUtils.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DDDFFE9525B6BA00009C54EE /* HDBaseUtils.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DDDFFE9E25B6BA15009C54EE /* CCVodSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDDFFE9425B6BA00009C54EE /* CCVodSDK.framework */; };
DDDFFE9F25B6BA15009C54EE /* CCVodSDK.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DDDFFE9425B6BA00009C54EE /* CCVodSDK.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -422,8 +422,8 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
DD89BEB325AC26740000B315 /* CCVodSDK.framework in Embed Frameworks */,
DD89BEB525AC26770000B315 /* HDBaseUtils.framework in Embed Frameworks */,
DDDFFE9D25B6BA13009C54EE /* HDBaseUtils.framework in Embed Frameworks */,
DDDFFE9F25B6BA15009C54EE /* CCVodSDK.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -993,10 +993,10 @@
DD542807250B55AB0097614C /* icon_ad_mute@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_ad_mute@3x.png"; sourceTree = "<group>"; };
DD542808250B55AB0097614C /* icon_ad_mute@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_ad_mute@2x.png"; sourceTree = "<group>"; };
DD542809250B55AB0097614C /* icon_ad_mute_select@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_ad_mute_select@3x.png"; sourceTree = "<group>"; };
DD89BEA925AC26340000B315 /* CCVodSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CCVodSDK.framework; sourceTree = "<group>"; };
DD89BEAA25AC26340000B315 /* HDBaseUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HDBaseUtils.framework; sourceTree = "<group>"; };
DD89BEAE25AC266C0000B315 /* DWResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = DWResource.bundle; path = CCVodSDK.framework/DWResource.bundle; sourceTree = "<group>"; };
DD89BEAF25AC266C0000B315 /* vrlibraw.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = vrlibraw.bundle; path = CCVodSDK.framework/vrlibraw.bundle; sourceTree = "<group>"; };
DDDFFE9425B6BA00009C54EE /* CCVodSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CCVodSDK.framework; sourceTree = "<group>"; };
DDDFFE9525B6BA00009C54EE /* HDBaseUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HDBaseUtils.framework; sourceTree = "<group>"; };
DDDFFE9825B6BA09009C54EE /* vrlibraw.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = vrlibraw.bundle; path = CCVodSDK.framework/vrlibraw.bundle; sourceTree = "<group>"; };
DDDFFE9925B6BA09009C54EE /* DWResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = DWResource.bundle; path = CCVodSDK.framework/DWResource.bundle; sourceTree = "<group>"; };
DDF1A579255E8A52007EE8B9 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
/* End PBXFileReference section */
......@@ -1005,14 +1005,14 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DD89BEB425AC26770000B315 /* HDBaseUtils.framework in Frameworks */,
DDDFFE9C25B6BA13009C54EE /* HDBaseUtils.framework in Frameworks */,
048AD12822CDCE83008C8911 /* libxml2.tbd in Frameworks */,
043441FF225EF2BB003F7EC1 /* CoreServices.framework in Frameworks */,
352CBDD91FD6980C00D24715 /* AudioToolbox.framework in Frameworks */,
352CBDD71FD697E800D24715 /* MediaPlayer.framework in Frameworks */,
B88562A41DED1AC8008D1763 /* SystemConfiguration.framework in Frameworks */,
B57CC7C018E2E581001A1696 /* AVFoundation.framework in Frameworks */,
DD89BEB225AC26730000B315 /* CCVodSDK.framework in Frameworks */,
DDDFFE9E25B6BA15009C54EE /* CCVodSDK.framework in Frameworks */,
B57CC7BE18E2E575001A1696 /* CoreLocation.framework in Frameworks */,
B57CC7BC18E2E569001A1696 /* CoreMedia.framework in Frameworks */,
B547EC4C18E033FB00BC980C /* CoreGraphics.framework in Frameworks */,
......@@ -1847,7 +1847,7 @@
isa = PBXGroup;
children = (
044C66A122D46DAE0032396F /* Demo.entitlements */,
DD89BEA825AC26340000B315 /* SDK */,
DDDFFE9325B6BA00009C54EE /* SDK */,
0434420D225F0EDD003F7EC1 /* Classes */,
B547EC5818E033FB00BC980C /* DWAppDelegate.h */,
B547EC5918E033FB00BC980C /* DWAppDelegate.m */,
......@@ -1874,13 +1874,13 @@
name = "Supporting Files";
sourceTree = "<group>";
};
DD89BEA825AC26340000B315 /* SDK */ = {
DDDFFE9325B6BA00009C54EE /* SDK */ = {
isa = PBXGroup;
children = (
DD89BEAE25AC266C0000B315 /* DWResource.bundle */,
DD89BEAF25AC266C0000B315 /* vrlibraw.bundle */,
DD89BEA925AC26340000B315 /* CCVodSDK.framework */,
DD89BEAA25AC26340000B315 /* HDBaseUtils.framework */,
DDDFFE9925B6BA09009C54EE /* DWResource.bundle */,
DDDFFE9825B6BA09009C54EE /* vrlibraw.bundle */,
DDDFFE9425B6BA00009C54EE /* CCVodSDK.framework */,
DDDFFE9525B6BA00009C54EE /* HDBaseUtils.framework */,
);
path = SDK;
sourceTree = "<group>";
......@@ -1896,7 +1896,7 @@
B547EC4318E033FB00BC980C /* Frameworks */,
B547EC4418E033FB00BC980C /* Resources */,
DD0F24D3255E22B000DA2705 /* Embed Frameworks */,
DD89BEAD25AC26580000B315 /* ShellScript */,
DDDFFEA025B6BA2D009C54EE /* ShellScript */,
);
buildRules = (
);
......@@ -2026,6 +2026,7 @@
0491DCF824B5604300DF40C7 /* icon_barrage_close@3x.png in Resources */,
0491DD2424B5604300DF40C7 /* icon_barrage_color_01@2x.png in Resources */,
04FFA9EA22647579008C2713 /* icon_play_full@2x.png in Resources */,
DDDFFE9A25B6BA09009C54EE /* vrlibraw.bundle in Resources */,
DD54280C250B55AB0097614C /* icon_ad_mute@2x.png in Resources */,
0491DCF224B5604300DF40C7 /* icon_barrage_set_return@3x.png in Resources */,
0491DD0F24B5604300DF40C7 /* icon_barrage_color_05@3x.png in Resources */,
......@@ -2056,7 +2057,6 @@
04AB4A3722B1F22A00BB9BF9 /* icon_exercises_error@2x.png in Resources */,
04D60ED822719B9C0009C572 /* icon_play_vr_inselect_select@2x.png in Resources */,
043D4E6B22D5C91D00FCDCBE /* icon_sound_add@2x.png in Resources */,
DD89BEB025AC266C0000B315 /* DWResource.bundle in Resources */,
04346AC8249720C6005A3396 /* icon_screenshot@2x.png in Resources */,
04B7A661226B0E5E00951983 /* icon_question_multi_select@3x.png in Resources */,
04AB4A3F22B1F22A00BB9BF9 /* icon_exercises_answer_d_select@2x.png in Resources */,
......@@ -2090,6 +2090,7 @@
0414B00623F51AA0002C7F7D /* icon_pip@2x.png in Resources */,
04FFA9F822647C84008C2713 /* icon_play_gif_normal@3x.png in Resources */,
04F0B79F22602D8F0097C3CB /* icon_return_black@2x.png in Resources */,
DDDFFE9B25B6BA09009C54EE /* DWResource.bundle in Resources */,
043D018722B76F1C008589DA /* icon_exercises_statistics_error@3x.png in Resources */,
0491DD0124B5604300DF40C7 /* icon_barrage_set_normal@2x.png in Resources */,
04FFA9D622647579008C2713 /* icon_play_return@3x.png in Resources */,
......@@ -2154,7 +2155,6 @@
04346AC0249720C6005A3396 /* brightness.png in Resources */,
04B7A65F226B0E5E00951983 /* icon_question_single_select@2x.png in Resources */,
0491DD1F24B5604300DF40C7 /* icon_barrage_color_select@3x.png in Resources */,
DD89BEB125AC266C0000B315 /* vrlibraw.bundle in Resources */,
04BAA93D22D4787B000495B4 /* icon_screen_list@2x.png in Resources */,
04AB4A2622B1F22A00BB9BF9 /* icon_exercises_answer_g_normal@2x.png in Resources */,
04B7A65C226B0E5E00951983 /* icon_question_multi_select@2x.png in Resources */,
......@@ -2204,7 +2204,7 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
DD89BEAD25AC26580000B315 /* ShellScript */ = {
DDDFFEA025B6BA2D009C54EE /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
......
Demo/Demo/Classes/DWLocalPlayViewController.m
View file @ cd58867c
......@@ -41,6 +41,7 @@
return;
}
}
[self.playerView playLocalVideo:self.downloadModel];
/*
......
Demo/Demo/Classes/DWVodPlayViewController.m
View file @ cd58867c
......@@ -568,6 +568,18 @@ typedef enum : NSUInteger {
DWDownloadModel * model = [DWDownloadSessionManager createDownloadModel:videoModel Quality:qualityModel.quality AndOthersInfo:@{@"imageUrl":imageUrl,@"title":title}];
/*
//下载时，带自定义logo设置
DWVideoLogoModel * videoLogo = [[DWVideoLogoModel alloc]init];
//设置资源地址，必填
// videoLogo.url = [NSURL URLWithString:<#(nonnull NSString *)#>];
//设置logo位置，选填，默认(0.1，0.1)
// videoLogo.logoOrigin = CGPointMake(<#CGFloat x#>, <#CGFloat y#>);
//设置logo大小，选填，默认(0.10.1)
// videoLogo.logoSize = CGSizeMake(<#CGFloat width#>, <#CGFloat height#>);
[manager insertVideoLogoWithDownloadModel:model VideoLogo:videoLogo];
*/
if (!model) {
[@"DownloadModel创建失败，请检查参数" showAlert];
continue;
......
Demo/Demo/Classes/View/Player/DWVodPlayerView.m
View file @ cd58867c
......@@ -357,6 +357,18 @@ static CGFloat barrageBgHeight = 40;
self.playRepeat = NO;
/*
//播放，带自定义logo设置
DWVideoLogoModel * videoLogo = [[DWVideoLogoModel alloc]init];
//设置资源地址，必填
// videoLogo.url = [NSURL URLWithString:<#(nonnull NSString *)#>];
//设置logo位置，选填，默认(0.1，0.1)
// videoLogo.logoOrigin = CGPointMake(<#CGFloat x#>, <#CGFloat y#>);
//设置logo大小，选填，默认(0.10.1)
// videoLogo.logoSize = CGSizeMake(<#CGFloat width#>, <#CGFloat height#>);
self.playerView.videoLogo = videoLogo;
*/
[self.playerView playVodViedo:videoModel withCustomId:nil];
[self play];
......@@ -1238,6 +1250,18 @@ static CGFloat barrageBgHeight = 40;
return;
}
/*
//下载时，带自定义logo设置
DWVideoLogoModel * videoLogo = [[DWVideoLogoModel alloc]init];
//设置资源地址，必填
// videoLogo.url = [NSURL URLWithString:<#(nonnull NSString *)#>];
//设置logo位置，选填，默认(0.1，0.1)
// videoLogo.logoOrigin = CGPointMake(<#CGFloat x#>, <#CGFloat y#>);
//设置logo大小，选填，默认(0.10.1)
// videoLogo.logoSize = CGSizeMake(<#CGFloat width#>, <#CGFloat height#>);
[manager insertVideoLogoWithDownloadModel:model VideoLogo:videoLogo];
*/
[manager startWithDownloadModel:model];
[[NSString stringWithFormat:@"开始下载：%@",vodVideo.title] showAlert];
......@@ -3500,6 +3524,8 @@ static CGFloat barrageBgHeight = 40;
//读取原先的播放时间 用oldTimeScrub方法
[self.playerView oldTimeScrub:self.switchTime];
[self play];
//同步视频总时间
self.pan.duration = CMTimeGetSeconds(self.playerView.player.currentItem.duration);
......
Demo/Demo/SDK/CCVodSDK.framework/Headers/CCVodSDK.h
View file @ cd58867c
//版本号
#define SDK_VERSION @"4.12.0"
#define SDK_VERSION @"4.13.0"
#import <CCVodSDK/DWGIFManager.h>
#import <CCVodSDK/DWAdInfo.h>
......@@ -32,3 +32,4 @@
#import <CCVodSDK/DWBatchDownloadUtility.h>
#import <CCVodSDK/DWBarrageModel.h>
#import <CCVodSDK/DWBarrageManager.h>
#import <CCVodSDK/DWVideoLogoModel.h>
Demo/Demo/SDK/CCVodSDK.framework/Headers/DWDownloadModel.h
View file @ cd58867c
......@@ -22,6 +22,7 @@ typedef NS_ENUM(NSUInteger, DWDownloadState) {
@class DWDownloadProgress;
@class DWDownloadModel;
@class DWVideoSubtitleModel;
@class DWVideoLogoModel;
// 进度更新block
typedef void (^DWDownloadProgressBlock)(DWDownloadProgress *progress,DWDownloadModel *downloadModel);
......@@ -112,6 +113,11 @@ typedef void (^DWDownloadStateBlock)(DWDownloadModel *downloadModel, NSError *er
*/
@property(nonatomic, strong, readonly)DWVideoSubtitleModel * subtitle2;
/**
* @brief 自定义LOGO
*/
@property(nonatomic, strong, readonly)DWVideoLogoModel * videoLogo;
/**
* @brief 自定义字段，根据自己需求适当添加，比如添加媒体图片，标题等
*/
......
Demo/Demo/SDK/CCVodSDK.framework/Headers/DWDownloadSessionManager.h
View file @ cd58867c
......@@ -90,6 +90,16 @@
*/
+(DWDownloadModel *)createDownloadModel:(DWVodVideoModel *)videoMdoel Quality:(NSString *)quality AndOthersInfo:(NSDictionary *)othersInfo;
/*!
* @method
* @abstract 插入自定义LOGO
* @discussion 在startWithDownloadModel:方法前调用，否则会导致自定义水印无法正常下载
* @param downloadModel DWDownloadModel对象
* @param videoLogo 自定义水印对象
* @result 插入成功返回YES，失败返回NO
*/
-(BOOL)insertVideoLogoWithDownloadModel:(DWDownloadModel *)downloadModel VideoLogo:(DWVideoLogoModel *)videoLogo;
/*!
* @method
* @abstract 开始下载任务
......
Demo/Demo/SDK/CCVodSDK.framework/Headers/DWPlayerView.h
View file @ cd58867c
......@@ -10,6 +10,7 @@
@class DWVodVideoModel;
@class DWDownloadModel;
@class DWVideoQualityModel;
@class DWVideoLogoModel;
typedef NS_ENUM(NSUInteger, DWPlayerViewTimeOut) {
DWPlayerViewStatusTimeOutLoad,//加载超时
......@@ -169,6 +170,11 @@ typedef NS_ENUM(NSUInteger, DWPlayerViewLoadStyle) {
*/
@property(nonatomic,assign,readonly)NSTimeInterval pausedTimes;
/**
* @brief 视频自定义Logo。对于在线视频，直接设置即可显示，对于离线视频，调用playLocalVideo:方法播放时，会自动设置下载视频所设置的Logo，无需手动设置。
*/
@property(nonatomic,strong)DWVideoLogoModel * videoLogo;
/*!
* @method
* @abstract 初始化播放对象
......
Demo/Demo/SDK/CCVodSDK.framework/Headers/DWVideoLogoModel.h 0 → 100644
View file @ cd58867c
//
// DWVideoLogoModel.h
// CCVodSDK
//
// Created by 666666 on 2021/1/12.
//
#import <Foundation/Foundation.h>
//自定义视频LOGO
@interface DWVideoLogoModel : NSObject
/**
* @brief 资源地址URL，必填。支持网络URL，本地URL，支持jpg/jpeg/png/gif格式
*/
@property(nonatomic, strong)NSURL * url;
/**
* @brief 下载到本地Logo资源路径
*/
@property(nonatomic, strong, readonly)NSString * filePath;
/**
* @brief logo坐标百分比，选填，默认值左上角(0.1,0.1)
*/
@property(nonatomic, assign)CGPoint logoOrigin;
/**
* @brief logo大小，相对于DWPlayerView对象size的百分比，选填，默认(0.1,0.1)
*/
@property(nonatomic, assign)CGSize logoSize;
@end
Demo/Demo/SDK/HDBaseUtils.framework/Headers/DWDrmServer.h 100644 → 100755
View file @ cd58867c
File mode changed from 100644 to 100755
Demo/Demo/SDK/HDBaseUtils.framework/Headers/DWHTTPRequest.h 100644 → 100755
View file @ cd58867c
File mode changed from 100644 to 100755
Demo/Demo/SDK/HDBaseUtils.framework/Headers/HDBaseUtils.h 100644 → 100755
View file @ cd58867c
......@@ -17,7 +17,7 @@ FOUNDATION_EXPORT const unsigned char HDBaseUtilsVersionString[];
// In this header, you should import all the public headers of your framework using statements like #import <HDBaseUtils/PublicHeader.h>
//base库版本号
#define HDBASESDK_VERSION @"1.0.8"
#define HDBASESDK_VERSION @"1.0.9"
#import <HDBaseUtils/HDUniversalUtils.h>
......
Demo/Demo/SDK/HDBaseUtils.framework/Headers/HDMarqueeAction.h 100644 → 100755
View file @ cd58867c
File mode changed from 100644 to 100755
Demo/Demo/SDK/HDBaseUtils.framework/Headers/HDMarqueeView.h 100644 → 100755
View file @ cd58867c
File mode changed from 100644 to 100755
Demo/Demo/SDK/HDBaseUtils.framework/Headers/HDReachability.h 100644 → 100755
View file @ cd58867c
File mode changed from 100644 to 100755
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment