dev_unstable
hjm 6 years ago
parent bcf91750a8
commit 83829d91c5

@ -60,8 +60,7 @@ function doCreateUploader (options) {
const fileName = uploadInfo.file.name const fileName = uploadInfo.file.name
// 如果不重新赋值第二次create后执行到这里会空指针
const _uploader = uploader;
if (!uploadInfo.videoId) { if (!uploadInfo.videoId) {
var createUrl = `${_testHost}/users/${login}/video_auths.json?debug=true` var createUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
@ -74,14 +73,14 @@ function doCreateUploader (options) {
var uploadAuth = data.UploadAuth var uploadAuth = data.UploadAuth
var uploadAddress = data.UploadAddress var uploadAddress = data.UploadAddress
var videoId = data.VideoId var videoId = data.VideoId
_uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId) uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
options.addFileSuccess && options.addFileSuccess(uploadInfo) options.addFileSuccess && options.addFileSuccess(uploadInfo)
}).catch((error) => { }).catch((error) => {
// 删除当前出错的,并执行下一个任务 // 删除当前出错的,并执行下一个任务
_uploader.deleteFile(_uploader._curIndex) uploader.deleteFile(uploader._curIndex)
_uploader.nextUpload() uploader.nextUpload()
console.log(error) console.log(error)
}) })
@ -103,12 +102,12 @@ function doCreateUploader (options) {
var uploadAuth = data.UploadAuth var uploadAuth = data.UploadAuth
var uploadAddress = data.UploadAddress var uploadAddress = data.UploadAddress
var videoId = data.VideoId var videoId = data.VideoId
_uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId) uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
options.addFileSuccess && options.addFileSuccess(uploadInfo) options.addFileSuccess && options.addFileSuccess(uploadInfo)
}).catch((error) => { }).catch((error) => {
_uploader.deleteFile(_uploader._curIndex) uploader.deleteFile(uploader._curIndex)
_uploader.nextUpload() uploader.nextUpload()
console.log(error) console.log(error)
}) })
} }
@ -148,14 +147,13 @@ function doCreateUploader (options) {
$('#status').text('文件上传超时!') $('#status').text('文件上传超时!')
var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true` var refreshUrl = `${_testHost}/users/${login}/video_auths.json?debug=true`
const _uploader = uploader;
axios.put(refreshUrl, { axios.put(refreshUrl, {
video_id: uploadInfo.videoId, video_id: uploadInfo.videoId,
}).then((response) => { }).then((response) => {
const data = response.data.data const data = response.data.data
var uploadAuth = data.UploadAuth var uploadAuth = data.UploadAuth
_uploader.resumeUploadWithAuth(uploadAuth) uploader.resumeUploadWithAuth(uploadAuth)
}).catch((error) => { }).catch((error) => {
console.log(error) console.log(error)
}) })

Loading…
Cancel
Save