From 4b644cd8882095c90d5ae7810a61c93359fd94f0 Mon Sep 17 00:00:00 2001
From: harry <harry@fangmingyi.com>
Date: Wed, 4 Mar 2020 00:52:12 +0800
Subject: [PATCH] =?UTF-8?q?webpack=20=E6=9E=84=E5=BB=BAflv.js=20=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=EF=BC=8C=E4=BC=B0=E8=AE=A1=E6=98=AFwebpack=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E8=BF=87=E4=BD=8E=EF=BC=8C=E4=B8=8D=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?typescript=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/public/index.html                | 162 ++++++++++++++++++
 .../Video/video-play => public/js}/flv.min.js |   0
 .../courses/Video/video-play/flv-player.jsx   |   5 +-
 3 files changed, 164 insertions(+), 3 deletions(-)
 rename public/react/{src/modules/courses/Video/video-play => public/js}/flv.min.js (100%)

diff --git a/public/react/public/index.html b/public/react/public/index.html
index 976791e90..ddf1ed4a9 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -16,6 +16,7 @@
     Content=”EduCoder翻转课堂教学模式，颠覆了传统教学模式，让教师与学生的关系由“权威”变成了“伙伴”。将学习的主动权转交给学生，使学生可个性化化学，学生的学习主体得到了彰显。”>
   <meta name=”Description” Content=”EduCoder实训项目为单个知识点关卡实践训练，帮助学生巩固单一弱点，强化学习。 ”>
   <meta name=”Description” Content=”EduCoder实践教学平台，各类大赛为进一步提高各类学生综合运用高级语言程序设计能力，培养创新意识和实践探索精神，发掘优秀软件人才。 ”>
+<<<<<<< HEAD
   <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
 
   <meta name="theme-color" content="#000000">
@@ -105,6 +106,20 @@
 
 <!--    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">-->
     <!--
+=======
+  <!--    <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3, user-scalable=no">-->
+  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=0.3, maximum-scale=0.3">
+
+  <meta name="theme-color" content="#000000">
+  <!--<meta http-equiv="cache-control" content="no-cache,no-store, must-revalidate" />-->
+  <!--<meta http-equiv="pragma" content="no-cache" />-->
+  <!--<meta http-equiv="Expires" content="0" />-->
+
+  <link rel="manifest" href="%PUBLIC_URL%/manifest.json">
+
+  <!--    <link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">-->
+  <!--
+>>>>>>> dc8805b... webpack 构建flv.js 报错，估计是webpack版本过低，不支持typescript等
       Notice the use of %PUBLIC_URL% in the tags above.
       It will be replaced with the URL of the `public` folder during the build.
       Only files inside the `public` folder can be referenced from the HTML.
@@ -113,6 +128,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
+<<<<<<< HEAD
 <!--    <title>EduCoder</title>-->
     <!--react-ssr-head-->
     <script type="text/javascript">
@@ -124,7 +140,153 @@
     })();
   </script>
   <script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script>
+=======
+  <!--    <title>EduCoder</title>-->
+  <!--react-ssr-head-->
+  <script type="text/javascript">
+
+    window.__isR = true;
+    // 不支持ie9 ie10
+    if (
+      (navigator.userAgent.indexOf('MSIE 9') != -1
+        || navigator.userAgent.indexOf('MSIE 10') != -1)
+      &&
+      location.pathname.indexOf("/compatibility") == -1) {
+      debugger;
+      // location.href = './compatibility'
+      location.href = '/compatibility.html'
+    }
+    // const isMobile = (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase()));
+    const isWeiXin = (/MicroMessenger/i.test(navigator.userAgent.toLowerCase()));
+    if (isWeiXin) {
+      document.write('<script type="text/javascript" src="/javascripts/wx/jweixin-1.3.0.js"><\/script>');
+    }
+  </script>
+
+  <!-- <link rel="stylesheet" type="text/css" href="/css/edu-common.css">
+    <link rel="stylesheet" type="text/css" href="/css/edu-public.css">
+
+    <link rel="stylesheet" type="text/css" href="/css/taskstyle.css">
+
+    <link rel="stylesheet" type="text/css" href="/css/font-awesome.css">
+
+    <link rel="stylesheet" type="text/css" href="/css/editormd.min.css">
+
+    <link rel="stylesheet" type="text/css" href="/css/merge.css"> -->
+
+  <link rel="stylesheet" type="text/css" href="/css/css_min_all.css">
+
+  <!--<link rel="stylesheet" type="text/css" href="/css/css_min_all.css">-->
+
+  <!--<link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_653600_nm6lho7nxxq.css">-->
+
+  <!-- <link href="/react/build/css/iconfont.css" rel="stylesheet" type="text/css"> -->
+
+  <!--<link href="http://47.96.87.25:48080/stylesheets/educoder/edu-all.css" rel="stylesheet" type="text/css">-->
+
+  <!--<link href="https://pandao.github.io/editor.md/examples/css/style.css" rel="stylesheet" type="text/css">-->
+
+  <!--<link href="https://pandao.github.io/editor.md/css/editormd.preview.css" rel="stylesheet" type="text/css">-->
+  <!-- <link href="https://testeduplus2.educoder.net/stylesheets/css/edu-common.css" rel="stylesheet" type="text/css">
+
+    <link href="https://testeduplus2.educoder.net/stylesheets/educoder/edu-main.css" rel="stylesheet" type="text/css">
+    <link href="https://testeduplus2.educoder.net/stylesheets/educoder/antd.min.css" rel="stylesheet" type="text/css"> -->
+
+  <!-- <link rel="stylesheet" type="text/css" href="https://www.educoder.net/stylesheets/css/font-awesome.css?1510652321"> -->
+
+  <!--<link rel="stylesheet" type="text/css" href="http://47.96.87.25:48080/stylesheets/educoder/iconfont/iconfont.css">-->
+
+  <!--需要去build js配置-->
+  <link rel="stylesheet" type="text/css" href="/css/iconfont.css">
+  <link rel="stylesheet" type="text/css" href="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.css">
+  <style>
+    /*<!--去除浏览器点击操作后有蓝色的底块-->*/
+    -moz-user-select: none;
+    -webkit-user-select: none;
+    -ms-user-select: none;
+    user-select: none;
+  </style>
+
+</head>
+
+<body>
+  <noscript>
+    You need to enable JavaScript to run this app.
+  </noscript>
+  <!--用于markdown转html -->
+  <div id="md_div" style="display: none;"></div>
+  <div id="root" class="page -layout-v -fit widthunit">
+    <!--<div class="d2-home">-->
+    <!--<div class="d2-home__main">-->
+    <!--&lt;!&ndash;<img  class="d2-home__loading"&ndash;&gt;-->
+    <!--&lt;!&ndash;src="loading-spin.svg"&ndash;&gt;-->
+    <!--&lt;!&ndash;alt="loading">&ndash;&gt;-->
+    <!--<div class="lds-ripple"><div></div><div></div></div>-->
+    <!--<div class="d2-home__title">-->
+    <!--正在加载资源-->
+    <!--</div>-->
+    <!--<div class="d2-home__sub-title">-->
+    <!--加载资源可能需要较多时间 请耐心等待-->
+    <!--</div>-->
+    <!--</div>-->
+    <!--<div class="d2-home__footer">-->
+    <!--&lt;!&ndash;<a href="www.educoder.net"&ndash;&gt;-->
+    <!--&lt;!&ndash;target="_blank">&ndash;&gt;-->
+    <!--&lt;!&ndash;&ndash;&gt;-->
+    <!--&lt;!&ndash;</a>&ndash;&gt;-->
+    <!--EduCoder-->
+    <!--</div>-->
+    <!--</div>-->
+  </div>
+  <div id="picture_display" style="display: none;"></div>
+  <!-- js css合并  文件优先级的问题 -->
+  <script type="text/javascript" src="/js/js_min_all.js"></script>
+  <script type="text/javascript" src="/js/flv.min.js"></script>
+
+  <!-- 在tpi js里加载这3个脚本 -->
+  <script>
+    (function () { // Scoping function to avoid globals
+      var href = location.href;
+      if (window.location.port === "3007") {
+        if (href.indexOf('/tasks/') != -1) {
+          document.write('<script type="text/javascript" src="https://newweb.educoder.net/assets/kindeditor/kindeditor.js"><\/script>');
+          // build.js中会将这个url附加一个前缀 react/build
+          document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
+          document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
+        } else if (href.indexOf('/paths/') != -1) {
+          document.write('<script type="text/javascript" src="https://newweb.educoder.net/javascripts/educoder/edu_application.js"><\/script>');
+
+        }
+      } else {
+        if (href.indexOf('/tasks/') != -1) {
+          document.write('<script type="text/javascript" src="/assets/kindeditor/kindeditor.js"><\/script>');
+          // build.js中会将这个url附加一个前缀 react/build
+          document.write('<script type="text/javascript" src="/js/create_kindeditor.js"><\/script>');
+          document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
+        } else if (href.indexOf('/paths/') != -1) {
+          document.write('<script type="text/javascript" src="/javascripts/educoder/edu_application.js"><\/script>');
+
+        }
+      }
+>>>>>>> dc8805b... webpack 构建flv.js 报错，估计是webpack版本过低，不支持typescript等
+
+</body>
+
+<<<<<<< HEAD
+=======
+    })();
+  </script>
+  <!-- <script type="text/javascript" src="https://testeduplus2.educoder.net/assets/kindeditor/kindeditor.js"></script>
+    <script type="text/javascript" src="/js/create_kindeditor.js"></script>
+    <script type="text/javascript" src="https://testeduplus2.educoder.net/javascripts/educoder/edu_application.js"></script> -->
+  <script type="text/javascript" src="https://cdn.bootcss.com/quill/1.3.7/quill.core.min.js"></script>
 
+  <!--    <script>-->
+  <!--      document.body.addEventListener('touchmove', function (e) {-->
+  <!--        e.preventDefault(); //阻止默认的处理方式(阻止下拉滑动的效果)-->
+  <!--      }, {passive: false});-->
+  <!--    </script>-->
 </body>
 
+>>>>>>> dc8805b... webpack 构建flv.js 报错，估计是webpack版本过低，不支持typescript等
 </html>
\ No newline at end of file
diff --git a/public/react/src/modules/courses/Video/video-play/flv.min.js b/public/react/public/js/flv.min.js
similarity index 100%
rename from public/react/src/modules/courses/Video/video-play/flv.min.js
rename to public/react/public/js/flv.min.js
diff --git a/public/react/src/modules/courses/Video/video-play/flv-player.jsx b/public/react/src/modules/courses/Video/video-play/flv-player.jsx
index e01f9fb31..bbb762762 100644
--- a/public/react/src/modules/courses/Video/video-play/flv-player.jsx
+++ b/public/react/src/modules/courses/Video/video-play/flv-player.jsx
@@ -1,13 +1,12 @@
 import React, { useEffect, useRef } from 'react'
-import Flv from './flv.min.js'
 
 export default ({ url }) => {
   const ref = useRef()
 
   useEffect(() => {
     let player = null
-    if (Flv.isSupported) {
-      player = Flv.createPlayer({
+    if (window.flvjs.isSupported) {
+      player = window.flvjs.createPlayer({
         type: 'flv',
         volume: 0.8,
         url,