Skip to content

GitLab

Commit 5fac1f20 authored by Han Ruisong's avatar Han Ruisong
Browse files

升级到 4.5.2 

1.修复进度条显示异常的问题。
2.修复GIF录制时，loading可能不消失的问题。
3.优化SDK解密流程，提升稳定性。
4.优化SDK统计上报流程。
parent ca86f7a8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 272 additions and 98 deletions
.DS_Store
View file @ 5fac1f20
No preview for this file type
Demo/Demo.xcodeproj/project.pbxproj
View file @ 5fac1f20
This diff is collapsed.
Demo/Demo.xcodeproj/xcuserdata/mac.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
View file @ 5fac1f20
......@@ -3,22 +3,185 @@
uuid = "AD3D3292-9E0B-4C03-BAEE-512F2BB8893D"
type = "1"
version = "2.0">
<<<<<<< .working
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "59905C0D-ED77-42B3-B1A3-FFC8759E9B02"
uuid = "D9AA14C9-ABAB-4657-A157-E875027A41AF"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/Classes/DWVodPlayViewController.m"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "51"
endingLineNumber = "51"
landmarkName = "-viewDidLoad"
startingLineNumber = "197"
endingLineNumber = "197"
landmarkName = "-endRecordingGif"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A940E69A-40DE-4D23-9D7E-9FE492890ED8"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "411"
endingLineNumber = "411"
landmarkName = "-interceptVideo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "0263DA42-2484-40F9-8AE4-3A0BF0FE0F67"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "458"
endingLineNumber = "458"
landmarkName = "-createImagesWithInterceptVideo:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "97ADA0A3-1264-4589-896F-BFA34D9BF8AA"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "465"
endingLineNumber = "465"
landmarkName = "-createImagesWithInterceptVideo:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "38C64DC4-E3D8-46A2-B723-95D1D47C28D4"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "369"
endingLineNumber = "369"
landmarkName = "-interceptVideo"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "791213F1-E67E-410E-952B-A67720EDBB43"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "295"
endingLineNumber = "295"
landmarkName = "-createGifImg:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "A7DFD2FF-E560-496C-82AE-EED455EC26C2"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "358"
endingLineNumber = "358"
landmarkName = "-createGifImg:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AC0EC596-05A5-4CA3-9569-A744B8D9BE3F"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "146"
endingLineNumber = "146"
landmarkName = "-startRecordingGif"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "05EE9253-391A-4433-87EB-E84C22600441"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/SDK/GIF/DWGIFManager.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "354"
endingLineNumber = "354"
landmarkName = "-createGifImg:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "5F859FF2-560A-4815-9B69-A5C52BDC2320"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/Classes/View/Player/DWVodPlayerView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2344"
endingLineNumber = "2344"
landmarkName = "-gifButtonAction"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "67322DA2-9E63-4AF9-8E02-4D45E6306CB3"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/Classes/View/Player/DWVodPlayerView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "2422"
endingLineNumber = "2422"
landmarkName = "-endRecordGif"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
=======
>>>>>>> .merge-right.r2448
</Bucket>
Demo/Demo/Classes/DWVodPlayViewController.m
View file @ 5fac1f20
......@@ -442,7 +442,6 @@ typedef enum : NSUInteger {
}
[weakSelf startDownloadTask:playInfosArray];
};
bdUtility.errorBlock = ^(NSError * _Nonnull error) {
......
Demo/Demo/Classes/View/Player/DWPlayerSlider.m
View file @ 5fac1f20
......@@ -66,12 +66,20 @@
if (!self.bufferView) {
self.bufferView = [[DWPlayerSliderBufferView alloc]init];
self.bufferView.backgroundColor = [UIColor colorWithRed:153/255.0 green:153/255.0 blue:153/255.0 alpha:0.8];
for (UIView * view in self.subviews) {
if ([view isMemberOfClass:[UIView class]]) {
self.bufferView.frame = CGRectMake(0, view.frame.origin.y, 0, view.frame.size.height);
[self insertSubview:self.bufferView aboveSubview:view];
[self insertSubview:self.bufferView atIndex:1];
}
}
// for (UIView * view in self.subviews) {
// if ([view isMemberOfClass:[UIView class]]) {
// self.bufferView.frame = CGRectMake(0, view.frame.origin.y, 0, view.frame.size.height);
// [self insertSubview:self.bufferView aboveSubview:view];
// }
// }
}
}
......
Demo/Demo/Classes/View/Player/DWVodPlayerView.m
View file @ 5fac1f20
......@@ -302,11 +302,11 @@ static const CGFloat gifSeconds = 0.25;
self.isSwitchquality = NO;
self.videoModel = videoModel;
[self.playerView playVodViedo:videoModel withCustomId:nil];
[self.playerView playVodViedo:videoModel withCustomId:nil];
[self play];
//处理视频清晰度数据
[self dealQualityArray];
......@@ -2277,6 +2277,8 @@ static const CGFloat gifSeconds = 0.25;
if (error) {
//报错
[[NSString stringWithFormat:@"gif生成失败:%@",[error localizedDescription]] showAlert];
[weakSelf gifCancelAction];
}
if (GifURL) {
//这里自己处理逻辑，看是否要保存本地之类的
......@@ -2330,10 +2332,12 @@ static const CGFloat gifSeconds = 0.25;
//获取点击时的时间
[self.gifManager associationWithUrl:[self.playerView drmGIFURL] CurrentPlayer:self.playerView.player AndUseM3U8Method:NO];
[self.gifManager startRecordingGif];
}else{
//第二次点击
if (_clipTime > 3) {
[self.gifHud setHidden:NO];
[self endRecordGif];
}
}
......@@ -2400,8 +2404,6 @@ static const CGFloat gifSeconds = 0.25;
-(void)endRecordGif
{
[self.gifHud setHidden:NO];
if (self.playerView.playing) {
[self pause];
}
......@@ -2867,6 +2869,7 @@ static const CGFloat gifSeconds = 0.25;
//同步视频总时间
self.pan.duration = CMTimeGetSeconds(self.playerView.player.currentItem.duration);
}
//播放完毕
......
Demo/Demo/DWConfigurationManager.m
View file @ 5fac1f20
......@@ -27,7 +27,7 @@
self.DWAccount_userId = @"391E6E3340A00767";
self.DWAccount_apikey = @"T8WdOUuvFEiOsou1xjDr4U73v12M7iNa";
self.isOpenAd = NO;
}
return self;
......
Demo/Demo/SDK/DWSDK.h
View file @ 5fac1f20
......@@ -26,5 +26,5 @@
#import "DWVodAdInfoModel.h"
//版本号
#define SDK_VERSION @"4.5.1"
#define SDK_VERSION @"4.5.2"
Demo/Demo/SDK/libCCSDK.a
View file @ 5fac1f20
No preview for this file type
doc/iOS点播SDK开发指南/4.开发指南.html
View file @ 5fac1f20
This source diff could not be displayed because it is too large. You can view the blob instead.
include/DWSDK.h
View file @ 5fac1f20
......@@ -26,5 +26,5 @@
#import "DWVodAdInfoModel.h"
//版本号
#define SDK_VERSION @"4.5.1"
#define SDK_VERSION @"4.5.2"
include/libCCSDK.a
View file @ 5fac1f20
No preview for this file type
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