Commit 66461d17 authored by Han Ruisong's avatar Han Ruisong
Browse files

升级到 4.4.3

1.修复拖拽统计异常的问题。
2.修复下载链接超时时,可能会重新下载的问题。
parent 98ebf965
No preview for this file type
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
uuid = "D493E4A5-FF32-4C5D-B61B-0D88D4BD1AD4"
uuid = "AD3D3292-9E0B-4C03-BAEE-512F2BB8893D"
type = "1"
version = "2.0">
<<<<<<< .working
<<<<<<< .working
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "DE53A975-9630-4280-B01B-8814706A834B"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/Classes/View/Player/DWVodPlayerPanGesture.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "67"
endingLineNumber = "67"
landmarkName = "-handlePan"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
=======
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
uuid = "AFBDA185-F80C-4FB7-9C05-D31B5996C717"
shouldBeEnabled = "No"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Demo/Plugins/HDMarqueeView.m"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "118"
endingLineNumber = "118"
landmarkName = "-stopMarquee"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
=======
>>>>>>> .merge-right.r2371
>>>>>>> .merge-right.r2366
</Bucket>
......@@ -98,6 +98,7 @@
__weak typeof(self) weakSelf = self;
//请求视频播放信息 获取下载地址 hlsSupport传@"0"
DWPlayInfo *playinfo = [[DWPlayInfo alloc] initWithUserId:[DWConfigurationManager sharedInstance].DWAccount_userId andVideoId:model.videoId key:[DWConfigurationManager sharedInstance].DWAccount_apikey hlsSupport:@"0"];
playinfo.mediatype = @"0";
//网络请求超时时间
playinfo.timeoutSeconds = 30;
playinfo.errorBlock = ^(NSError *error){
......@@ -177,8 +178,16 @@
}else{
//开始
for (DWDownloadModel * downloadModel in self.downloadList) {
if (downloadModel.state != DWDownloadStateRunning) {
[self.manager resumeWithDownloadModel:downloadModel];
if (downloadModel.state != DWDownloadStateRunning && downloadModel.state != DWDownloadStateReadying) {
//判断下载链接是否超时
if ([self.manager isValidateURLWithDownloadModel:downloadModel]) {
// NSLog(@"url可用");
[self.manager resumeWithDownloadModel:downloadModel];
}else{
// NSLog(@"url不可用");
//重新获取下载路径
[self requestPlayInfo:downloadModel];
}
}
}
}
......
......@@ -91,6 +91,7 @@
-(void)reloadLoaclData
{
//请自行替换数据
NSArray * videos = @[];
for (int i = 0; i < videos.count; i++) {
......
......@@ -2,7 +2,7 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.networking.wifi-info</key>
<key>com.apple.external-accessory.wireless-configuration</key>
<true/>
</dict>
</plist>
......@@ -26,5 +26,5 @@
#import "DWVodAdInfoModel.h"
//版本号
#define SDK_VERSION @"4.4.2"
#define SDK_VERSION @"4.4.3"
No preview for this file type
......@@ -26,5 +26,5 @@
#import "DWVodAdInfoModel.h"
//版本号
#define SDK_VERSION @"4.4.2"
#define SDK_VERSION @"4.4.3"
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