Merge branch 'feature/zhangleyuan/20210304/video-size' into dev

src/common/constants/academic/lessonEnum.js

@@ -4,9 +4,9 @@
  * @Last Modified by: 吴文洁
  * @Last Modified by: 吴文洁
  * @Last Modified time: 2020-07-16 11:32:50
  * @Last Modified time: 2020-07-16 11:32:50
  */
  */
-const DEFAULT_SIZE_UNIT = 1024 * 1024; // 将B转换成M
+const DEFAULT_SIZE_UNIT = 1000 * 1000; // 将B转换成M
 
 
-const GIGABYTE_SIZE_UNIT = 1024 * 1024 * 1024; // 转换为G
+const GIGABYTE_SIZE_UNIT = 1000 * 1000 * 1000; // 转换为G
 
 
 const SupportFileType = [
 const SupportFileType = [
   "application/msword",
   "application/msword",
@@ -106,11 +106,11 @@ const FileVerifyMap = {
   },
   },
   "audio/mp4": {
   "audio/mp4": {
     type: "MP4",
     type: "MP4",
-    maxSize: 2048
+    maxSize: 2000
   },
   },
   "video/mp4": {
   "video/mp4": {
     type: "MP4",
     type: "MP4",
-    maxSize: 2048
+    maxSize: 2000
   }
   }
 };
 };
 
 

src/common/constants/academic/liveEnum.js

@@ -2,11 +2,11 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-07-23 17:11:49
  * @Date: 2020-07-23 17:11:49
  * @LastEditors: zhangleyuan
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2020-12-18 17:54:36
+ * @LastEditTime: 2021-03-04 17:16:01
  * @Description: 
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */ 
  */ 
-const DEFAULT_SIZE_UNIT = 1024 * 1024; // 将B转换成M
+const DEFAULT_SIZE_UNIT = 1000 * 1000; // 将B转换成M
 
 
 const SupportFileType = [
 const SupportFileType = [
   "application/msword",
   "application/msword",

src/domains/resource-disk/constants.ts

@@ -2,11 +2,11 @@
  * @Author: 吴文洁
  * @Author: 吴文洁
  * @Date: 2020-08-20 09:21:40
  * @Date: 2020-08-20 09:21:40
  * @LastEditors: zhangleyuan
  * @LastEditors: zhangleyuan
- * @LastEditTime: 2021-03-04 10:22:07
+ * @LastEditTime: 2021-03-04 17:16:30
  * @Description: 
  * @Description: 
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  * @Copyright: 杭州杰竞科技有限公司 版权所有
  */
  */
-const DEFAULT_SIZE_UNIT: number = 1024 * 1024; // 将B转换成M
+const DEFAULT_SIZE_UNIT: number = 1000 * 1000; // 将B转换成M
 
 
 const SUFFIX_MAP: {
 const SUFFIX_MAP: {
   [key: string]: string
   [key: string]: string
@@ -139,11 +139,11 @@ const FILR_VERIFY_MAP = {
   },
   },
   "audio/mp4": {
   "audio/mp4": {
     type: "MP4",
     type: "MP4",
-    maxSize: 2048
+    maxSize: 2000
   },
   },
   "video/mp4": {
   "video/mp4": {
     type: "MP4",
     type: "MP4",
-    maxSize: 2048
+    maxSize: 2000
   }
   }
 };
 };
 
 

src/modules/prepare-lesson/components/FolderList.jsx

@@ -448,7 +448,7 @@ class FolderList extends React.Component {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }
-      if (type.indexOf('video') > -1 && size > 2048 * DEFAULT_SIZE_UNIT) {
+      if (type.indexOf('video') > -1 && size > 2000 * DEFAULT_SIZE_UNIT) {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }

src/modules/prepare-lesson/components/OperateArea.jsx

@@ -135,7 +135,7 @@ class OperateArea extends React.Component {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }
-      if (type.indexOf('video') > -1 && size > 2048 * DEFAULT_SIZE_UNIT) {
+      if (type.indexOf('video') > -1 && size > 2000 * DEFAULT_SIZE_UNIT) {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }

src/modules/resource-disk/components/FolderList.jsx

@@ -484,7 +484,7 @@ class FolderList extends React.Component {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }
-      if (type.indexOf('video') > -1 && size > 2048 * DEFAULT_SIZE_UNIT) {
+      if (type.indexOf('video') > -1 && size > 2000 * DEFAULT_SIZE_UNIT) {
         nonCompliantFileList.push(file);
         nonCompliantFileList.push(file);
         _fileList.splice(index, 1);
         _fileList.splice(index, 1);
       }
       }