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

app/helpers/courses_helper.rb

@@ -238,7 +238,9 @@ module CoursesHelper
 
   # 获取课堂的资源数
   def get_attachment_count(course, category_id)
-    category_id.to_i == 0 ? course.attachments.size : course.attachments.where(course_second_category_id: category_id).size
+    identity = current_user.course_identity(course)
+    attachments = category_id.to_i == 0 ? course.attachments : course.attachments.where(course_second_category_id: category_id)
+    identity > Course::ASSISTANT_PROFESSOR ? attachments.published.size : attachments.size
   end
 
   # 获取课堂的视频数

app/libs/aliyun_vod/service/video_manage.rb

@@ -26,7 +26,7 @@ module AliyunVod::Service::VideoManage
     result
   end
 
-  # 读取视频编码格式
+  # 读取视频编码格式与视频格式
   def get_meta_code_info(video_id)
     params = {
       Action: 'GetMezzanineInfo',
@@ -36,11 +36,14 @@ module AliyunVod::Service::VideoManage
 
     result = request(:post, params)
     Rails.logger.info("#######:#{result['Mezzanine']['VideoStreamList'][0]['CodecName']}")
-    result['Mezzanine']['VideoStreamList'][0]['CodecName']
+    codecnamne = result['Mezzanine']['VideoStreamList'].first['CodecName']
+    file_url = result['Mezzanine']['FileURL']
+    format = file_url&.split(".")&.last
 
+    {codecnamne: codecnamne, format: format}
   rescue => e
     Rails.logger.info "读取视频编码信息失败: #{video_id}, #{e.message}"
-    ""
+    {codecnamne: "", format: ""}
   end
 
   # 删除视频信息

app/models/attachment.rb

@@ -24,6 +24,7 @@ class Attachment < ApplicationRecord
   scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}
+  scope :published, -> {where(is_publish: 1)}
 
   validates_length_of :description, maximum: 100, message: "不能超过100个字符"
 

app/services/videos/batch_publish_service.rb

@@ -29,12 +29,13 @@ class Videos::BatchPublishService < ApplicationService
           video.status = "published"
         end
 
-        # 标清转码为h264
+        #  非MP4 H264编码的都转码
         code_info = AliyunVod::Service.get_meta_code_info(video.uuid)
-        if code_info.present? && code_info.start_with?('h264', 'h265')
+        Rails.logger.info("code_info: #{code_info[:format]}, #{code_info[:codecnamne]}")
+        if code_info[:format] == "mp4" && code_info[:codecnamne].present? && code_info[:codecnamne].start_with?('h264')
           video.transcoded = true
           result = AliyunVod::Service.get_play_info(video.uuid) rescue nil
-          play_url = result['PlayInfoList']['PlayInfo'][0]['PlayURL'] if result.present?
+          play_url = result['PlayInfoList']['PlayInfo'].first['PlayURL'] if result.present?
           video.play_url = play_url
         else
           AliyunVod::Service.submit_transcode_job(video.uuid, Video::NORMAL_TRANSCODE_GROUP_ID)

lib/tasks/video_transcode.rake

@@ -3,7 +3,7 @@ namespace :video_transcode do
   desc "视频转码成h264"
   task :submit => :environment do
     Video.find_each do |v|
-      if v.uuid && !v.transcoded && !v.file_url.include?('.mp4') && !AliyunVod::Service.get_meta_code_info(v.uuid).start_with?("h264", "h265")
+      if v.uuid && !v.transcoded && !v.file_url.include?('.mp4') && !AliyunVod::Service.get_meta_code_info(v.uuid)[:codecnamne].start_with?("h264", "h265")
         p "--- Start submit video trans code #{v.uuid}"
         AliyunVod::Service.submit_transcode_job(v.uuid, 'a0277c5c0c7458458e171b0cee6ebf5e')
       else

public/react/src/modules/courses/Resource/index.js

@@ -64,6 +64,7 @@ class Fileslists extends Component{
 		});
 	}
   componentDidMount=()=>{
+
   	this.getcourse_groupslists()
     this.setState({
       isSpin:true,
@@ -85,43 +86,45 @@ class Fileslists extends Component{
 			this.seactall(parseInt(this.props.match.params.Id),"desc")
     }
     this.updadatalist();
-		on('updateNavSuccess', this.updateNavSuccess)
-		on('updateNavSuccess',this.updadatalist)
+		on('files', this.updateNavSuccess)
+		on('files',this.updadatalist)
   }
 
 	updateNavSuccess=()=>{
+
   	let{sort}=this.state;
 		this.setState({
 			isSpin:true
 		})
 		if(this.props.match.params.main_id){
+
 			this.seactall(undefined,sort);
 		}else if(this.props.match.params.Id){
+
 			this.seactall(parseInt(this.props.match.params.Id),sort)
 		}
 	}
   componentDidUpdate = (prevProps) => {
 
-    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.main_id!=this.props.match.params.main_id||prevProps.match.params.Id!=this.props.match.params.Id){
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.Id!=this.props.match.params.Id&&this.props.coursesidtype!="node") {
 
+      if(this.props.coursesidtype==="node") {
 
-      if(this.props.match.params.main_id){
         this.getcourse_groupslists()
         this.setState({
-          isSpin:true,
-          checkBoxValues:[],
-          checkAllValue:false,
+          isSpin: true,
+          checkBoxValues: [],
+          checkAllValue: false,
         })
-        if(this.props.match.params.main_id!=undefined){
+        if (this.props.match.params.main_id != undefined) {
           this.setState({
-            child:false,
-            sort:"desc"
+            child: false,
+            sort: "desc"
           })
-          this.seactall(undefined,"desc");
-        }
+          this.seactall(undefined, "desc");
         }
+      }else{
 
-      if(this.props.match.params.Id){
         this.getcourse_groupslists()
         this.setState({
           isSpin:true,
@@ -136,8 +139,12 @@ class Fileslists extends Component{
           this.seactall(parseInt(this.props.match.params.Id),"desc")
         }
       }
+
     }
 
+
+
+
   }
 
   updadatalist=(id)=>{
@@ -174,6 +181,7 @@ class Fileslists extends Component{
 
   }
   updatafiled=()=>{
+
 		let{sort}=this.state;
 		if(this.props.match.params.main_id){
 			this.seactall(undefined,sort);
@@ -640,7 +648,7 @@ class Fileslists extends Component{
   }
 
 	Settingtypess=(id,title,link)=>{
-  	debugger
+
 		this.setState({
 			Addanexternallink:true,
 			Exterchainname:"资源设置",
@@ -951,10 +959,12 @@ class Fileslists extends Component{
                 }
 
                 secondRowLeft={
-                  <div style={{"display":"inline-block", "marginTop": "22px"}}>
+                  this.props.isAdmin()?<div style={{"display":"inline-block", "marginTop": "22px"}}>
                     <span>共 {total_count} 个资源</span>
                     <span style={{"marginLeft":"16px"}}>已发布：{publish_count}个</span>
                     <span style={{"marginLeft":"16px"}}>未发布：{unpublish_count}个</span>
+                  </div>:<div style={{"display":"inline-block", "marginTop": "22px"}}>
+                    <span>共 {publish_count} 个资源</span>
                   </div>
                 }
                 onPressEnter={this.onPressEnter}

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -775,7 +775,7 @@ class CommonWorkList extends Component{
 
     const hasData = this.state.homework_status && this.state.homework_status.indexOf("未发布") == -1 // student_works && !!student_works.length && page == 1 &&
 
-	   console.log(StudentData)
+	   //console.log(StudentData)
 		// console.log(student_works)
     return(
       <React.Fragment>

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -706,7 +706,7 @@ class CoursesBanner extends Component {
 
                       {this.props.isStudent()?this.props.current_user&&this.props.current_user.course_is_end===true?"":<a className="fr user_default_btn user_blue_btn mr20 font-18"
                                                  onClick={() => this.exitclass()}
-                      > 退出课堂 </a>:""}
+                      > 永久退出课堂 </a>:""}
 
                     </div>
 

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -536,7 +536,7 @@ class Coursesleftnav extends Component{
     successFunc && successFunc(1);
   }
 
-  saveNavmodapost=(url,value,positiontype,coursesId)=>{
+  saveNavmodapost=(url,value,positiontype,coursesId,type)=>{
 
     axios.post(url,
       {name:value}).then((result)=>{
@@ -548,15 +548,28 @@ class Coursesleftnav extends Component{
 							description:result.data.message
 						});
 
-						if(positiontype==="shixun_homeworks"){
+						if(positiontype==="shixun_homeworks"||positiontype==="shixun_homework"){
+              if(type===true){
+                this.updasaveNavmoda()
+                trigger('shixun')
+              }else{
                 this.updasaveNavmoda()
-              trigger('updateNavSuccess')
                 this.props.history.push(`/classrooms/${coursesId}/shixun_homework/${result.data.category_id}`);
+
               }
-						if(positiontype==="files"){
+            }
+
+						if(positiontype==="files"||positiontype==="file"){
+
+                if(type===true){
+                  this.updasaveNavmoda()
+                  trigger('files')
+
+                  }else{
                   this.updasaveNavmoda()
-              trigger('updateNavSuccess')
                   this.props.history.push(`/classrooms/${coursesId}/file/${result.data.category_id}`);
+                }
+
              	}
 
 					  if(positiontype==="boards"){
@@ -565,7 +578,7 @@ class Coursesleftnav extends Component{
 							this.props.history.push(`/classrooms/${coursesId}/boards/${result.data.category_id}`);
 						}
 
-            if(positiontype!="course_groups"&&positiontype!="shixun_homeworks"){
+            if(positiontype!="course_groups"&&positiontype!="shixun_homeworks"&&positiontype!="shixun_homework"){
               this.updasaveNavmoda()
             }
 
@@ -640,12 +653,12 @@ class Coursesleftnav extends Component{
     }else if(Navmodaltypename===3){
 
      let url="/course_modules/"+id+"/rename_module.json"
-     this.saveNavmodapost(url,NavmodalValue)
+     this.saveNavmodapost(url,NavmodalValue,this.state.positiontype,null,true)
 
    }else if(Navmodaltypename===4){
 
      let url="/course_second_categories/"+id+"/rename_category.json";
-     this.saveNavmodapost(url,NavmodalValue)
+     this.saveNavmodapost(url,NavmodalValue,this.state.positiontype,null,true)
 
     }else if(Navmodaltypename===5){
 

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

@@ -58,6 +58,7 @@ class ShixunHomework extends Component{
     }
   }
 	updateNavSuccess=()=>{
+    debugger
 		this.setState({
 			isSpin:true
 		})
@@ -111,7 +112,7 @@ class ShixunHomework extends Component{
 				this.updadatalist()
 			}
 		}
-		on('updateNavSuccess', this.updateNavSuccess)
+		on('shixun', this.updateNavSuccess)
   }
   seactall=(id)=>{
    this.setState({
@@ -146,7 +147,7 @@ class ShixunHomework extends Component{
 
   componentDidUpdate = (prevProps) => {
 
-    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.main_id!=this.props.match.params.main_id||prevProps.match.params.category_id!=this.props.match.params.category_id) {
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.category_id!=this.props.match.params.category_id&&this.props.coursesidtype!="node") {
 
       if(this.props.match.params.main_id){
         if(this.props.match.params.main_id!=undefined){

public/react/src/modules/tpm/shixuns/shixun-card.js

@@ -83,7 +83,7 @@ export default ({ middleshixundata, pagination, typepvisible, pages, totalcount,
 
             </div>
             <div className="both"></div>
-            <div className={"ml425"}
+            <div className={"educontent edu-txt-center mt10"}
               style={{ display: pagination ? "block" : "none" }}>
               <Pagination defaultCurrent={1} current={pages} total={totalcount || 1299} type="mini" pageSize={16} onChange={onPageChange} />
             </div>