Merge branches 'PCqiandao' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into PCqiandao

app/controllers/files_controller.rb

@@ -18,11 +18,23 @@ class FilesController < ApplicationController
     sort_type = params[:sort_type] || 'created_on' # created_on：时间排序， downloads：下载次数排序; quotes: 引用次数排序
     @course_second_category_id = params[:course_second_category_id] || 0 # 0: 为主目录， 其他为次目录id
     @user = current_user
-    @attachments = @course_second_category_id.to_i == 0 ? @course.attachments.includes(:course_second_category) : @course.attachments.by_course_second_category_id(@course_second_category_id)
+    get_category(@course, @course_second_category_id)
+
+    # 主目录显示所有资源，一级目录显示一级和所属二级目录的资源，二级目录只显示该目录下的资源
+    if @course_second_category_id.to_i == 0
+      @attachments = @course.attachments.includes(:course_second_category)
+    else
+      if @parent_category_id == 0
+        category_ids = [@category_id] + @category.children.pluck(:id)
+        @attachments = @course.attachments.where(course_second_category_id: category_ids)
+      else
+        @attachments = @course.attachments.by_course_second_category_id(@course_second_category_id)
+      end
+    end
+
     @attachments = @attachments.includes(author: [:user_extension, :course_members])
                        .ordered(sort: sort.to_i, sort_type: sort_type.strip)
 
-    get_category(@course, @course_second_category_id)
     @total_count = @attachments.size
     @unlink_count = @attachments.no_link.size
 
@@ -354,9 +366,10 @@ class FilesController < ApplicationController
       @category_id = category.try(:id)
       @category_name = category.try(:module_name)
     else
-      category = CourseSecondCategory.find category_id
+      @category = CourseSecondCategory.find category_id
       @category_id = category.try(:id)
       @category_name = category.try(:name)
+      @parent_category_id = category&.parent_id.to_i
     end
   end
 

app/views/courses/attahcment_category_list.json.jbuilder

@@ -3,8 +3,11 @@ json.course_modules do
   json.array! @course_modules do |course_module|
     json.id course_module.id
     json.module_name course_module.module_name
-    json.course_second_categories do
+    json.course_second_categories course_module.first_categories do |category|
-      json.array! course_module.course_second_categories, :id, :name
+      json.(category, :id, :name)
+      json.course_third_categories category.children do |child|
+        json.(child, :id, :name)
+      end
     end
   end
 end

app/views/files/index.json.jbuilder

@@ -7,6 +7,7 @@ json.data do
   json.unpublish_count @unpublish_count
   json.unlink_count @unlink_count
   json.course_is_public @course.is_public?
+  json.parent_category_id @parent_category_id
   json.files do
     json.array! @attachments do |attachment|
       json.is_history_file attachment.attachment_histories.count > 0 #是否有历史文件
@@ -16,7 +17,7 @@ json.data do
       end
       # json.partial! "files/course_groups", attachment_group_settings: attachment.attachment_group_settings
       json.category_id attachment.course_second_category_id
-      if @course_second_category_id.to_i == 0
+      unless @parent_category_id.present? && @parent_category_id != 0
         json.category_name attachment.course_second_category&.name
       end
     end

public/react/src/modules/courses/Video/video-play/index.jsx

@@ -1,5 +1,26 @@
 import React, { useRef, useEffect, useCallback } from 'react'
 
+Object.defineProperty(HTMLMediaElement.prototype, 'playing', {
+  get: function () {
+    return !!(this.currentTime > 0 && !this.paused && !this.ended && this.readyState > 2)
+  }
+})
+
+function compareNumbers(a, b) {
+  return a - b;
+}
+
+function getTotalEffectTime(pos) {
+  pos.sort(compareNumbers)
+  let sum = 0
+  for (let i = 0; i < pos.length - 1; i++) {
+    let v = pos[i + 1] - pos[i]
+    if (v < 21) {
+      sum += v
+    }
+  }
+  return sum
+}
 const regex = /(android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini)/i
 //接口文档 https://www.showdoc.cc/educoder?page_id=4029884447803706
 export default ({ src, videoId, logWatchHistory, courseId = null }) => {
@@ -12,22 +33,21 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
   const device = deviceMatch ? deviceMatch[0] : 'pc'
 
   let totalDuration = 0
-  let totalTimePlayed = 0
   let sumTimePlayed = 0
   let lastUpdatedTime = 0
-  let lastEffectUpdatedTime = 0
   let logId = null
   let initLog = false
   let timeTick = 20 //记录频率 默认20s
   let logCount = 1
   let isLoging = false
   let isSeeking = false
+  let pos = []//播放时间点集
 
   const log = useCallback((callback) => {
     let params = {}
     if (logId) {
       params['log_id'] = logId
-      params['watch_duration'] = totalTimePlayed //当前观看视频时长，拖放进度条，重复的视频片段观看时，不会把重复的时长累积进来，最大时长是视频的总时长
+      params['watch_duration'] = getTotalEffectTime(pos) //当前观看视频时长，拖放进度条，重复的视频片段观看时，不会把重复的时长累积进来，最大时长是视频的总时长
       params['total_duration'] = sumTimePlayed //累计观看视频时长，拖放进度条，重复的视频片段观看时，重复观看时长要累积进来
     } else {
       if (courseId) {
@@ -82,6 +102,7 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
   useEffect(() => {
 
     function onPlay() {
+      pos.push(el.current.currentTime)
       if (!initLog) {
         initLog = true
         log()
@@ -92,13 +113,12 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
       log(() => {
         logId = null
         logCount = 1
-        totalTimePlayed = 0
         lastUpdatedTime = 0
         sumTimePlayed = 0
         initLog = false
         isLoging = false
-        lastEffectUpdatedTime = 0
         isSeeking = false
+        pos = []
       })
     }
 
@@ -106,31 +126,31 @@ export default ({ src, videoId, logWatchHistory, courseId = null }) => {
       if (!isSeeking) {
         let newTime = el.current.currentTime
         let timeDiff = newTime - lastUpdatedTime
-        let effectTimeDiff = newTime - lastEffectUpdatedTime
+        //currenttime update before Seeking & Seeked fired
-        if (effectTimeDiff > 0) {
+        if (Math.abs(timeDiff) < 0.5) {
-          totalTimePlayed += effectTimeDiff
-          lastEffectUpdatedTime = newTime
-        }
           sumTimePlayed += Math.abs(timeDiff)
           lastUpdatedTime = newTime
-
           if (!isLoging) {
             if (sumTimePlayed - logCount * timeTick >= 0) {
               logCount++
+              pos.push(lastUpdatedTime)
               log()
             }
           }
         }
+      }
 
     }
 
     function onSeeking() {
       isSeeking = true
-      lastUpdatedTime = el.current.currentTime
-      lastEffectUpdatedTime = el.current.currentTime
     }
 
     function onSeeked() {
+      if (el.current.playing) {
+        pos.push(el.current.currentTime, lastUpdatedTime)
+      }
+      lastUpdatedTime = el.current.currentTime
       isSeeking = false
     }
 

public/react/src/modules/tpm/shixunchild/shixunchildCss/Challenges.css

@@ -178,23 +178,23 @@
     white-space: nowrap;
 }
 
-.icon-bianji_Hover,.icon-xiayi_Hover,.icon-shangyi_Hover,.icon-shanchu_Hover{
+/* .icon-bianji_Hover,.icon-xiayi_Hover,.icon-shangyi_Hover,.icon-shanchu_Hover{
-    color:#BBBBBB !important;
+    color: rgb(80, 145, 255) !important;
-}
+} */
 
-.icon-bianji_Hover:hover{
+.icon-bianji_Hover{
     color: rgb(80, 145, 255) !important;
 }
 
-.icon-xiayi_Hover:hover{
+.icon-xiayi_Hover{
     color: rgb(51, 189, 140)  !important;
 }
 
-.icon-shangyi_Hover:hover{
+.icon-shangyi_Hover{
     color: rgb(51, 189, 140)  !important;
 }
 
-.icon-shanchu_Hover:hover{
+.icon-shanchu_Hover{
     color:rgb(255, 85, 85)  !important;
 }
 .ysliconfont{