Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/courses/Video/Video.js

@@ -168,11 +168,18 @@ class Video extends Component {
   }
 
   // 移动到
-  moveVideo=(id)=>{
-    this.setState({
-      moveVisible:true,
-      moveVideoId:id
-    })
+  moveVideo=(id,flag)=>{
+    if(!flag){
+      this.setState({
+        moveVisible:true,
+        moveVideoId:id
+      })
+    }else{
+      this.props.define({
+        title:'提示',
+        content:"您不是课堂管理员或者视频发布者，暂不能移动视频。",
+      })
+    }
   }
   setMoveVisible=(flag)=>{
     this.setState({
@@ -194,6 +201,8 @@ class Video extends Component {
     const { videos, upload, uploadVideo, videoData, changePage, pageSize, page } = this.props;
 
     const operation = admin || business;
+    const {course_identity} = this.props.coursedata;
+    const flagMove = parseInt(course_identity) < 5;
     return (
       <div>
         <EditVideoModal {...this.props} visible={visible} setVisible={this.setVisible}
@@ -247,7 +256,7 @@ class Video extends Component {
                                 getCopyText={this.getCopyText}
                                 operation={operation || item.user_id === user_id}
                                 deleteVideo={(admin || item.user_id === user_id) ? this.deleteVideo : undefined}
-                                moveVideo={videoData && videoData.has_category && (operation || item.user_id === user_id) ? ()=>this.moveVideo(item.id):undefined}
+                                moveVideo={videoData && videoData.has_category && flagMove ? ()=>this.moveVideo(item.id,(course_identity > 2 && item.user_id === user_id)):undefined}
                               >
                               </VideoInReviewItem>
                             )

public/react/src/modules/user/usersInfo/video/AliyunUploaderManager.js

@@ -27,16 +27,16 @@ function loadLib(callback) {
             });
         });
 }
-function createUploader(options) {
+function createUploader(options,setLoading) {
     if (window.AliyunUpload && window.AliyunUpload.Vod) {
-        doCreateUploader(options)
+        doCreateUploader(options,setLoading)
     } else {
         loadLib(() => {
-            doCreateUploader(options)
+            doCreateUploader(options,setLoading)
         })
     }
 }
-function doCreateUploader (options) {
+function doCreateUploader (options,setLoading) {
     uploader = new window.AliyunUpload.Vod({
         timeout: $('#timeout').val() || 60000,
         partSize: $('#partSize').val() || 1048576,
@@ -82,7 +82,8 @@ function doCreateUploader (options) {
                         var uploadAddress = data.UploadAddress
                         var videoId = data.VideoId
                         uploader.setUploadAuthAndAddress(uploadInfo, uploadAuth, uploadAddress, videoId)
-    
+                        console.log("onUploadstarted","false");
+                        setLoading && setLoading(false);
                     }
                 }).catch((error) => {
                     // 删除当前出错的，并执行下一个任务
@@ -106,7 +107,7 @@ function doCreateUploader (options) {
                     if (response.data.status == -1) {
                         options.onUploadError && options.onUploadError(uploadInfo)
                         return;
-                    }
+                    } 
                     const data = response.data.data
                     var uploadAuth = data.UploadAuth
                     var uploadAddress = data.UploadAddress
@@ -180,9 +181,9 @@ function doCreateUploader (options) {
         options.gotUploader(uploader)
     }
 }
-export function getUploader (_login, options) {
+export function getUploader (_login, options,setLoading) {
     _login && (login = _login)
     if (!uploader || options.create == true) {
-        createUploader(options)
+        createUploader(options,setLoading)
     }
 }

public/react/src/modules/user/usersInfo/video/VideoUploadList.js

@@ -126,7 +126,6 @@ function VideoUploadList (props) {
                     dispatch({type: 'addVideo', uploadInfo})
                 },
                 onUploadProgress: (uploadInfo, totalSize, progress) => {
-                    setLoading(false);
                     console.log("upload",uploadInfo);
                     var progressPercent = Math.ceil(progress * 100)
 
@@ -188,7 +187,7 @@ function VideoUploadList (props) {
 
                     window.uploader = uploader;
                 }
-            }
+            },setLoading
             // )
             )
         } else {