diff --git a/app/Console/Tasks/VodEventTask.php b/app/Console/Tasks/VodEventTask.php index be34f31d..6439bb3c 100644 --- a/app/Console/Tasks/VodEventTask.php +++ b/app/Console/Tasks/VodEventTask.php @@ -57,7 +57,7 @@ class VodEventTask extends Task $attrs = $chapter->attrs; /** - * 获取不到时长,尝试通过接口获得 + * 获取不到时长,尝试通过主动查询获取 */ if ($duration == 0) { $duration = $this->getFileDuration($fileId); @@ -68,6 +68,7 @@ class VodEventTask extends Task */ if ($duration == 0) { $attrs['file']['status'] = ChapterModel::FS_FAILED; + $attrs['duration'] = 0; $chapter->update(['attrs' => $attrs]); return; } diff --git a/app/Http/Admin/Services/ChapterContent.php b/app/Http/Admin/Services/ChapterContent.php index 5d257fc5..dec9abcd 100644 --- a/app/Http/Admin/Services/ChapterContent.php +++ b/app/Http/Admin/Services/ChapterContent.php @@ -133,14 +133,19 @@ class ChapterContent extends Service $vod = $chapterRepo->findChapterVod($chapter->id); - $vod->file_id = $fileId; - $vod->file_transcode = []; - $vod->update(); - $attrs = $chapter->attrs; - $attrs['duration'] = 0; - $attrs['file']['status'] = ChapterModel::FS_UPLOADED; + + if ($fileId != $vod->file_id) { + $vod->file_id = $fileId; + $vod->file_transcode = []; + $vod->update(); + + $attrs['file']['status'] = ChapterModel::FS_UPLOADED; + $attrs['duration'] = 0; + } + $chapter->attrs = $attrs; + $chapter->update(); $this->updateCourseVodAttrs($vod->course_id); diff --git a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt index eff5554f..dcdc68de 100644 --- a/app/Http/Admin/Views/chapter/edit_lesson_vod.volt +++ b/app/Http/Admin/Views/chapter/edit_lesson_vod.volt @@ -70,7 +70,7 @@
- +
diff --git a/public/static/admin/js/media.upload.js b/public/static/admin/js/media.upload.js index fc303673..2bcc0656 100644 --- a/public/static/admin/js/media.upload.js +++ b/public/static/admin/js/media.upload.js @@ -46,6 +46,7 @@ layui.use(['jquery', 'element'], function () { uploader.done().then(function (result) { $('input[name=file_id]').val(result.fileId); + $('#vod-submit').removeAttr('disabled').removeClass('layui-btn-disabled'); $.ajax({ type: 'POST', url: $('#vod-form').attr('action'),