guhongwei 4 年之前
父节点
当前提交
b0fd0c6827

文件差异内容过多而无法显示
+ 9012 - 0
public/ckplayer/ckplayer/ckplayer.js


文件差异内容过多而无法显示
+ 105 - 0
public/ckplayer/ckplayer/ckplayer.json


文件差异内容过多而无法显示
+ 16 - 0
public/ckplayer/ckplayer/ckplayer.min.js


文件差异内容过多而无法显示
+ 105 - 0
public/ckplayer/ckplayer/ckplayer.mobile.json


二进制
public/ckplayer/ckplayer/ckplayer.swf


+ 28 - 0
public/ckplayer/ckplayer/hls/LICENSE

@@ -0,0 +1,28 @@
+Copyright (c) 2017 Dailymotion (http://www.dailymotion.com)
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+src/remux/mp4-generator.js and src/demux/exp-golomb.js implementation in this project
+are derived from the HLS library for video.js (https://github.com/videojs/videojs-contrib-hls)
+
+That work is also covered by the Apache 2 License, following copyright:
+Copyright (c) 2013-2015 Brightcove
+
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

文件差异内容过多而无法显示
+ 15403 - 0
public/ckplayer/ckplayer/hls/hls.js


文件差异内容过多而无法显示
+ 7 - 0
public/ckplayer/ckplayer/hls/hls.min.js


+ 42 - 0
public/ckplayer/ckplayer/language.json

@@ -0,0 +1,42 @@
+{
+    "adCountdown": "[$Second]",
+    "skipDelay": "[$Second]",
+    "buttonOver": {
+      "play": "点击播放",
+      "pause": "暂停播放",
+      "mute": "静音",
+      "escMute": "恢复音量",
+      "full": "全屏",
+      "escFull": "退出全屏",
+      "previousPage": "上一集",
+      "nextPage": "下一集",
+      "definition": "选择清晰度",
+      "subtitles": "选择字幕",
+      "playbackrate": "倍速播放"
+    },
+    "volumeSliderOver": "音量:[$volume]%",
+    "buffer": "[$percentage]%",
+    "timeSliderOver": "[$timeh]:[$timei]:[$times]",
+    "liveAndVod": "[$timeh]:[$timei]:[$times]",
+    "vod":"[$timeh]:[$timei]:[$times] / [$durationh]:[$durationi]:[$durations]",
+    "live": "直播中 [$liveTimeY]-[$liveTimem]-[$liveTimed] [$liveTimeh]:[$liveTimei]:[$liveTimes]",
+    "m3u8Definition": {
+      "name": [
+        "流畅",
+        "低清",
+        "标清",
+        "高清",
+        "超清",
+        "蓝光",
+        "未知"
+      ]
+    },
+    "error": {
+      "cannotFindUrl": "视频地址不存在",
+      "streamNotFound": "加载失败",
+      "formatError": "视频格式错误"
+    },
+    "definition": "自动",
+    "subtitle": "默认",
+    "playbackrate": "默认"
+}

文件差异内容过多而无法显示
+ 883 - 0
public/ckplayer/ckplayer/style.json


文件差异内容过多而无法显示
+ 861 - 0
public/ckplayer/ckplayer/style.mobile.json


+ 1 - 0
public/index.html

@@ -7,6 +7,7 @@
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= htmlWebpackPlugin.options.title %></title>
     <title><%= htmlWebpackPlugin.options.title %></title>
     <script src="/platlive/static/js/flowplayer-3.2.13.min.js"></script>
     <script src="/platlive/static/js/flowplayer-3.2.13.min.js"></script>
+    <script src="/platlive/ckplayer/ckplayer/ckplayer.js"></script>
   </head>
   </head>
   <body>
   <body>
     <noscript>
     <noscript>

+ 15 - 23
src/views/hall/direct.vue

@@ -56,7 +56,8 @@
                 </el-col>
                 </el-col>
                 <el-col :span="24" :class="[dockInfo.room_id == '1006' ? 'leftvideos' : 'leftvideo']">
                 <el-col :span="24" :class="[dockInfo.room_id == '1006' ? 'leftvideos' : 'leftvideo']">
                   <span v-if="dockInfo.room_id == '1006'">
                   <span v-if="dockInfo.room_id == '1006'">
-                    <div class="h5video" id="videoDiv" style="height:400px;"></div>
+                    <!-- <div class="h5video" id="videoDiv" style="height:400px;"></div> -->
+                    <div id="videoDiv" class="h5video active"></div>
                   </span>
                   </span>
                   <span v-else>
                   <span v-else>
                     <el-col :span="24" class="videoTop">
                     <el-col :span="24" class="videoTop">
@@ -421,29 +422,17 @@ export default {
   },
   },
   methods: {
   methods: {
     searchLive() {
     searchLive() {
-      let url_2 = `${process.env.VUE_APP_LIVE_URL + this.dockInfo.room_id}`;
-      var ovideoDiv = document.getElementById('videoDiv');
-      ovideoDiv.setAttribute('data-rtmp', url_2);
-      ovideoDiv.setAttribute('href', url_2);
-      var swfStr = '/platlive/swf/flowplayer-3.2.18.swf';
-      var obj_1 = {
-        clip: {
-          provider: 'rtmp',
-          bufferLength: 0,
-          bufferTime: 0,
-          autoPlay: true,
+      let rmtpUrl = `${process.env.VUE_APP_LIVE_URL + this.dockInfo.room_id}`;
+      setTimeout(function() {
+        var videoObjects = {
+          container: '#videoDiv',
+          variable: 'player',
+          autoplay: true,
           live: true,
           live: true,
-        },
-        plugins: {
-          rtmp: {
-            url: 'flowplayer.rtmp-3.2.13.swf',
-            netConnectionUrl: url_2,
-          },
-        },
-      };
-      const obj_2 = JSON.parse(JSON.stringify(obj_1));
-      obj_2.plugins.rtmp.netConnectionUrl = url_2;
-      flowplayer('videoDiv', swfStr, obj_2);
+          video: rmtpUrl,
+        };
+        let player = new ckplayer(videoObjects);
+      }, 2);
     },
     },
     // 展会
     // 展会
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
     ...dock({ dockQuery: 'query', dockFetch: 'fetch', goodsquery: 'goodsquery' }),
@@ -722,6 +711,9 @@ export default {
           font-size: 20px;
           font-size: 20px;
         }
         }
       }
       }
+      .h5video {
+        height: 400px;
+      }
       .leftvideo {
       .leftvideo {
         height: 410px;
         height: 410px;
         overflow: hidden;
         overflow: hidden;

+ 34 - 22
src/views/superAdminCenter/monitor/index.vue

@@ -49,30 +49,42 @@ export default {
     },
     },
     searchLive() {
     searchLive() {
       var envUrl = process.env.VUE_APP_LIVE_URL;
       var envUrl = process.env.VUE_APP_LIVE_URL;
-      var swfStr = '/platlive/swf/flowplayer-3.2.18.swf';
-      var obj_1 = {
-        clip: {
-          provider: 'rtmp',
-          bufferLength: 0,
-          bufferTime: 0,
-          autoPlay: true,
-          live: true,
-        },
-        plugins: {
-          rtmp: {
-            url: 'flowplayer.rtmp-3.2.13.swf',
-          },
-        },
-      };
       for (const val of this.list) {
       for (const val of this.list) {
-        val.url = envUrl + val.room_id;
-        var videoRoom = document.getElementById(val.room_id);
-        videoRoom.setAttribute('data-rtmp', val.url);
-        videoRoom.setAttribute('href', val.url);
-        const obj_2 = JSON.parse(JSON.stringify(obj_1));
-        obj_2.plugins.rtmp.netConnectionUrl = val.url;
-        flowplayer(val.room_id, swfStr, obj_2);
+        setTimeout(function() {
+          var videoObjects = {
+            container: `#${val.room_id}`,
+            variable: 'player',
+            autoplay: true,
+            live: true,
+            video: envUrl + val.room_id,
+          };
+          let player = new ckplayer(videoObjects);
+        }, 2);
       }
       }
+      // var swfStr = '/platlive/swf/flowplayer-3.2.18.swf';
+      // var obj_1 = {
+      //   clip: {
+      //     provider: 'rtmp',
+      //     bufferLength: 0,
+      //     bufferTime: 0,
+      //     autoPlay: true,
+      //     live: true,
+      //   },
+      //   plugins: {
+      //     rtmp: {
+      //       url: 'flowplayer.rtmp-3.2.13.swf',
+      //     },
+      //   },
+      // };
+      // for (const val of this.list) {
+      //   val.url = envUrl + val.room_id;
+      //   var videoRoom = document.getElementById(val.room_id);
+      //   videoRoom.setAttribute('data-rtmp', val.url);
+      //   videoRoom.setAttribute('href', val.url);
+      //   const obj_2 = JSON.parse(JSON.stringify(obj_1));
+      //   obj_2.plugins.rtmp.netConnectionUrl = val.url;
+      //   flowplayer(val.room_id, swfStr, obj_2);
+      // }
     },
     },
   },
   },
   computed: {
   computed: {