Skip to content

GitLab

Commit a3d99479 authored by Hanruisong's avatar Hanruisong
Browse files

feat: 更新到 4.10.1 

1.修复在iOS14下，开启后台播放时进入后台导致播放暂停的问题。
parent bdf2ea22
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 28 deletions
Demo/Demo.xcodeproj/project.pbxproj
View file @ a3d99479
......@@ -401,17 +401,17 @@
B57CC7BE18E2E575001A1696 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B57CC7BD18E2E575001A1696 /* CoreLocation.framework */; };
B57CC7C018E2E581001A1696 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B57CC7BF18E2E581001A1696 /* AVFoundation.framework */; };
B88562A41DED1AC8008D1763 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B88562A31DED1AC8008D1763 /* SystemConfiguration.framework */; };
DD21E564253EBCEA00A6E3FA /* CCVodSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD21E562253EBCE900A6E3FA /* CCVodSDK.framework */; };
DD21E566253EBCF100A6E3FA /* HDBaseUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD21E563253EBCE900A6E3FA /* HDBaseUtils.framework */; };
DD21E567253EBCF100A6E3FA /* HDBaseUtils.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DD21E563253EBCE900A6E3FA /* HDBaseUtils.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
DD21E56A253EBD6D00A6E3FA /* vrlibraw.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD21E568253EBD6C00A6E3FA /* vrlibraw.bundle */; };
DD21E56B253EBD6D00A6E3FA /* DWResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DD21E569253EBD6C00A6E3FA /* DWResource.bundle */; };
DD25727D24F79DED00D9BB55 /* icon_exercises_close@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD25727B24F79DED00D9BB55 /* icon_exercises_close@3x.png */; };
DD25727E24F79DED00D9BB55 /* icon_exercises_close@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD25727C24F79DED00D9BB55 /* icon_exercises_close@2x.png */; };
DD54280A250B55AB0097614C /* icon_ad_mute_select@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = DD542806250B55AA0097614C /* icon_ad_mute_select@2x.png */; };
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 */; };
DDC8248E2548165F0032C6B0 /* CCVodSDK.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC8248C2548165E0032C6B0 /* CCVodSDK.framework */; };
DDC82493254816CD0032C6B0 /* DWResource.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DDC82491254816CD0032C6B0 /* DWResource.bundle */; };
DDC82494254816CD0032C6B0 /* vrlibraw.bundle in Resources */ = {isa = PBXBuildFile; fileRef = DDC82492254816CD0032C6B0 /* vrlibraw.bundle */; };
DDC82495254817800032C6B0 /* HDBaseUtils.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DDC8248D2548165E0032C6B0 /* HDBaseUtils.framework */; };
DDC82496254817800032C6B0 /* HDBaseUtils.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DDC8248D2548165E0032C6B0 /* HDBaseUtils.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
......@@ -421,7 +421,7 @@
dstPath = "";
dstSubfolderSpec = 10;
files = (
DD21E567253EBCF100A6E3FA /* HDBaseUtils.framework in Embed Frameworks */,
DDC82496254817800032C6B0 /* HDBaseUtils.framework in Embed Frameworks */,
);
name = "Embed Frameworks";
runOnlyForDeploymentPostprocessing = 0;
......@@ -985,16 +985,16 @@
B57CC7BD18E2E575001A1696 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
B57CC7BF18E2E581001A1696 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
B88562A31DED1AC8008D1763 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
DD21E562253EBCE900A6E3FA /* CCVodSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CCVodSDK.framework; sourceTree = "<group>"; };
DD21E563253EBCE900A6E3FA /* HDBaseUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HDBaseUtils.framework; sourceTree = "<group>"; };
DD21E568253EBD6C00A6E3FA /* vrlibraw.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = vrlibraw.bundle; path = CCVodSDK.framework/vrlibraw.bundle; sourceTree = "<group>"; };
DD21E569253EBD6C00A6E3FA /* DWResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = DWResource.bundle; path = CCVodSDK.framework/DWResource.bundle; sourceTree = "<group>"; };
DD25727B24F79DED00D9BB55 /* icon_exercises_close@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_exercises_close@3x.png"; sourceTree = "<group>"; };
DD25727C24F79DED00D9BB55 /* icon_exercises_close@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_exercises_close@2x.png"; sourceTree = "<group>"; };
DD542806250B55AA0097614C /* icon_ad_mute_select@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "icon_ad_mute_select@2x.png"; sourceTree = "<group>"; };
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>"; };
DDC8248C2548165E0032C6B0 /* CCVodSDK.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CCVodSDK.framework; sourceTree = "<group>"; };
DDC8248D2548165E0032C6B0 /* HDBaseUtils.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = HDBaseUtils.framework; sourceTree = "<group>"; };
DDC82491254816CD0032C6B0 /* DWResource.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = DWResource.bundle; path = CCVodSDK.framework/DWResource.bundle; sourceTree = "<group>"; };
DDC82492254816CD0032C6B0 /* vrlibraw.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = vrlibraw.bundle; path = CCVodSDK.framework/vrlibraw.bundle; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
......@@ -1002,7 +1002,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
DD21E566253EBCF100A6E3FA /* HDBaseUtils.framework in Frameworks */,
DDC82495254817800032C6B0 /* HDBaseUtils.framework in Frameworks */,
048AD12822CDCE83008C8911 /* libxml2.tbd in Frameworks */,
043441FF225EF2BB003F7EC1 /* CoreServices.framework in Frameworks */,
352CBDD91FD6980C00D24715 /* AudioToolbox.framework in Frameworks */,
......@@ -1010,7 +1010,7 @@
B88562A41DED1AC8008D1763 /* SystemConfiguration.framework in Frameworks */,
B57CC7C018E2E581001A1696 /* AVFoundation.framework in Frameworks */,
B57CC7BE18E2E575001A1696 /* CoreLocation.framework in Frameworks */,
DD21E564253EBCEA00A6E3FA /* CCVodSDK.framework in Frameworks */,
DDC8248E2548165F0032C6B0 /* CCVodSDK.framework in Frameworks */,
B57CC7BC18E2E569001A1696 /* CoreMedia.framework in Frameworks */,
B547EC4C18E033FB00BC980C /* CoreGraphics.framework in Frameworks */,
B547EC4E18E033FB00BC980C /* UIKit.framework in Frameworks */,
......@@ -1843,7 +1843,7 @@
isa = PBXGroup;
children = (
044C66A122D46DAE0032396F /* Demo.entitlements */,
DD21E561253EBCE900A6E3FA /* SDK */,
DDC8248B2548165E0032C6B0 /* SDK */,
0434420D225F0EDD003F7EC1 /* Classes */,
B547EC5818E033FB00BC980C /* DWAppDelegate.h */,
B547EC5918E033FB00BC980C /* DWAppDelegate.m */,
......@@ -1870,13 +1870,13 @@
name = "Supporting Files";
sourceTree = "<group>";
};
DD21E561253EBCE900A6E3FA /* SDK */ = {
DDC8248B2548165E0032C6B0 /* SDK */ = {
isa = PBXGroup;
children = (
DD21E569253EBD6C00A6E3FA /* DWResource.bundle */,
DD21E568253EBD6C00A6E3FA /* vrlibraw.bundle */,
DD21E562253EBCE900A6E3FA /* CCVodSDK.framework */,
DD21E563253EBCE900A6E3FA /* HDBaseUtils.framework */,
DDC82491254816CD0032C6B0 /* DWResource.bundle */,
DDC82492254816CD0032C6B0 /* vrlibraw.bundle */,
DDC8248C2548165E0032C6B0 /* CCVodSDK.framework */,
DDC8248D2548165E0032C6B0 /* HDBaseUtils.framework */,
);
path = SDK;
sourceTree = "<group>";
......@@ -1892,7 +1892,7 @@
B547EC4318E033FB00BC980C /* Frameworks */,
B547EC4418E033FB00BC980C /* Resources */,
046FF38A2468F48100AB4A98 /* Embed Frameworks */,
DD21E56C253EBDFA00A6E3FA /* ShellScript */,
DDC82490254816880032C6B0 /* ShellScript */,
);
buildRules = (
);
......@@ -2022,7 +2022,6 @@
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 */,
DD21E56A253EBD6D00A6E3FA /* 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 */,
......@@ -2053,6 +2052,7 @@
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 */,
DDC82493254816CD0032C6B0 /* 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 */,
......@@ -2086,7 +2086,6 @@
0414B00623F51AA0002C7F7D /* icon_pip@2x.png in Resources */,
04FFA9F822647C84008C2713 /* icon_play_gif_normal@3x.png in Resources */,
04F0B79F22602D8F0097C3CB /* icon_return_black@2x.png in Resources */,
DD21E56B253EBD6D00A6E3FA /* 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 */,
......@@ -2151,6 +2150,7 @@
04346AC0249720C6005A3396 /* brightness.png in Resources */,
04B7A65F226B0E5E00951983 /* icon_question_single_select@2x.png in Resources */,
0491DD1F24B5604300DF40C7 /* icon_barrage_color_select@3x.png in Resources */,
DDC82494254816CD0032C6B0 /* 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 */,
......@@ -2200,7 +2200,7 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
DD21E56C253EBDFA00A6E3FA /* ShellScript */ = {
DDC82490254816880032C6B0 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
......
Demo/Demo/Classes/DWMainViewController.m
View file @ a3d99479
......@@ -94,8 +94,9 @@
-(void)reloadLoaclData
{
//请自行替换数据
NSArray * videos = @[];
NSArray * videos = @[];
for (int i = 0; i < videos.count; i++) {
DWVodModel * vodModel = [[DWVodModel alloc]init];
vodModel.videoId = [videos objectAtIndex:i];
......
Demo/Demo/DWConfigurationManager.m
View file @ a3d99479
......@@ -27,7 +27,7 @@
self.DWAccount_userId = @"391E6E3340A00767";
self.DWAccount_apikey = @"T8WdOUuvFEiOsou1xjDr4U73v12M7iNa";
self.isOpenAd = [[[NSUserDefaults standardUserDefaults] objectForKey:@"isOpenAD"] boolValue];
}
return self;
......
Demo/Demo/SDK/CCVodSDK.framework/Headers/CCVodSDK.h
View file @ a3d99479
//版本号
#define SDK_VERSION @"4.10.0"
#define SDK_VERSION @"4.10.1"
#import <CCVodSDK/DWGIFManager.h>
#import <CCVodSDK/DWAdInfo.h>
......
Demo/Demo/SDK/HDBaseUtils.framework/Headers/DWDrmServer.h
View file @ a3d99479
......@@ -11,6 +11,11 @@
*/
@property (assign, nonatomic, readonly)UInt16 listenPort;
/**
* @brief 是否使用ijkPlayer，默认NO
*/
@property(nonatomic,assign)BOOL isIJKPlayer;
/*!
* @method
* @abstract 初始化DWDrmServer
......
Demo/Demo/SDK/HDBaseUtils.framework/Headers/HDBaseUtils.h
View file @ a3d99479
......@@ -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.5"
#define HDBASESDK_VERSION @"1.0.6"
#import <HDBaseUtils/HDUniversalUtils.h>
......
include/CCVodSDK.framework/Headers/CCVodSDK.h
View file @ a3d99479
//版本号
#define SDK_VERSION @"4.10.0"
#define SDK_VERSION @"4.10.1"
#import <CCVodSDK/DWGIFManager.h>
#import <CCVodSDK/DWAdInfo.h>
......
include/HDBaseUtils.framework/Headers/DWDrmServer.h
View file @ a3d99479
......@@ -11,6 +11,11 @@
*/
@property (assign, nonatomic, readonly)UInt16 listenPort;
/**
* @brief 是否使用ijkPlayer，默认NO
*/
@property(nonatomic,assign)BOOL isIJKPlayer;
/*!
* @method
* @abstract 初始化DWDrmServer
......
include/HDBaseUtils.framework/Headers/HDBaseUtils.h
View file @ a3d99479
......@@ -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.5"
#define HDBASESDK_VERSION @"1.0.6"
#import <HDBaseUtils/HDUniversalUtils.h>
......
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