v1.1.3

History.md

+PC-1.1.3 / 2019-07-19
+==================
+
+ * 修改 video currentTime 突然获取 超大值，增加判断 提示播放器异常，刷新重看
+
 PC-1.1.2 / 2019-07-16
 ==================
 

client-dist/index.html

@@ -15,4 +15,4 @@
     <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/console-polyfill.js"></script>
     <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/html5shiv.min.js"></script>
     <script src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/static/compatible/respond.min.js"></script>
-  <![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/manifest.f39c4625.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.bb1c6d7c.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.5c558967.js"></script></body></html>
\ No newline at end of file
+  <![endif]--><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/manifest.85abc648.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/vendor.bb1c6d7c.js"></script><script type="text/javascript" src="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/resources/app.5fb36ac1.js"></script></body></html>
\ No newline at end of file

client-dist/resources/11.5302c669b95c.css

+#player p[data-v-b94f6c04]{color:#fff;text-align:center;padding:50px 0}#player p a[data-v-b94f6c04]{color:#b01c40;text-decoration:underline}
\ No newline at end of file

client-dist/resources/11.7275abdd54ff.css

-#player p[data-v-dced0884]{color:#fff;text-align:center;padding:50px 0}#player p a[data-v-dced0884]{color:#b01c40;text-decoration:underline}
\ No newline at end of file

client-dist/resources/manifest.f39c4625.js → client-dist/resources/manifest.85abc648.js

-!function(d){function e(e){for(var t,r,n=e[0],a=e[1],o=e[2],c=0,f=[];c<n.length;c++)r=n[c],b[r]&&f.push(b[r][0]),b[r]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(d[t]=a[t]);for(p&&p(e);f.length;)f.shift()();return i.push.apply(i,o||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],n=!0,a=1;a<r.length;a++){var o=r[a];0!==b[o]&&(n=!1)}n&&(i.splice(t--,1),e=s(s.s=r[0]))}return e}var r={},l={3:0},b={3:0},i=[];function s(e){if(r[e])return r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return d[e].call(t.exports,t,t.exports,s),t.l=!0,t.exports}s.e=function(i){var e=[];l[i]?e.push(l[i]):0!==l[i]&&{0:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"7e9c19881242",1:"31d6cfe0d16a",5:"b6a10460f085",6:"7f893c86c40d",7:"b7a3b3beb3de",8:"edadd3d1dece",9:"2b76410db4d0",10:"30b36ab56f09",11:"7275abdd54ff",12:"e14af2852dbd",13:"03a7345988fb",14:"7b16b71e9379",15:"fc688477e0f2",16:"9c95c5430f41",17:"081b63b62922",18:"69bf85281bf8",19:"fca5eccb0e56",20:"76e82d4724d6",21:"abf993cecc16",22:"da1346fedd49",23:"5ba1b1bc7480",24:"43ee51cf782c",25:"12c536f6abaf",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a",31:"31d6cfe0d16a",32:"31d6cfe0d16a",33:"31d6cfe0d16a"}[i]+".css",a=s.p+t,r=document.getElementsByTagName("link"),o=0;o<r.length;o++){var c=(d=r[o]).getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(c===t||c===a))return e()}var f=document.getElementsByTagName("style");for(o=0;o<f.length;o++){var d;if((c=(d=f[o]).getAttribute("data-href"))===t||c===a)return e()}var u=document.createElement("link");u.rel="stylesheet",u.type="text/css",u.onload=e,u.onerror=function(e){var t=e&&e.target&&e.target.src||a,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),n(r)},u.href=a,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var t,r=b[i];if(0!==r)if(r)e.push(r[2]);else{var n=new Promise(function(e,t){r=b[i]=[e,t]});e.push(r[2]=n);var a,o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.charset="utf-8",c.timeout=120,s.nc&&c.setAttribute("nonce",s.nc),c.src=s.p+"resources/"+({}[t=i]||t)+"."+{0:"fa8f2b4e",1:"d064c442",5:"c7817f69",6:"b1ef9e64",7:"22e3a852",8:"70d69ac2",9:"75f8a6c2",10:"bd3cdbd6",11:"39188c2b",12:"9d2722ff",13:"81f1f175",14:"abfc162b",15:"215fc286",16:"2196badb",17:"ed816a77",18:"f27e87cc",19:"eb8b2375",20:"44834369",21:"015fe65a",22:"48061ee9",23:"b90bdb3f",24:"c496539e",25:"77f16629",26:"7263b586",27:"96f77249",28:"c9ab77ad",29:"e2b8b230",30:"c7136a86",31:"a2b590da",32:"846a5348",33:"03e953f0"}[t]+".js",a=function(e){c.onerror=c.onload=null,clearTimeout(f);var t=b[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src,a=new Error("Loading chunk "+i+" failed.\n("+r+": "+n+")");a.type=r,a.request=n,t[1](a)}b[i]=void 0}};var f=setTimeout(function(){a({type:"timeout",target:c})},12e4);c.onerror=c.onload=a,o.appendChild(c)}return Promise.all(e)},s.m=d,s.c=r,s.d=function(e,t,r){s.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},s.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},s.t=function(t,e){if(1&e&&(t=s(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(s.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)s.d(r,n,function(e){return t[e]}.bind(null,n));return r},s.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return s.d(t,"a",t),t},s.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},s.p="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/",s.oe=function(e){throw console.error(e),e};var t=window.webpackJsonp=window.webpackJsonp||[],n=t.push.bind(t);t.push=e,t=t.slice();for(var a=0;a<t.length;a++)e(t[a]);var p=n;u()}([]);
\ No newline at end of file
+!function(d){function e(e){for(var t,r,n=e[0],a=e[1],o=e[2],c=0,f=[];c<n.length;c++)r=n[c],b[r]&&f.push(b[r][0]),b[r]=0;for(t in a)Object.prototype.hasOwnProperty.call(a,t)&&(d[t]=a[t]);for(p&&p(e);f.length;)f.shift()();return i.push.apply(i,o||[]),u()}function u(){for(var e,t=0;t<i.length;t++){for(var r=i[t],n=!0,a=1;a<r.length;a++){var o=r[a];0!==b[o]&&(n=!1)}n&&(i.splice(t--,1),e=s(s.s=r[0]))}return e}var r={},l={3:0},b={3:0},i=[];function s(e){if(r[e])return r[e].exports;var t=r[e]={i:e,l:!1,exports:{}};return d[e].call(t.exports,t,t.exports,s),t.l=!0,t.exports}s.e=function(i){var e=[];l[i]?e.push(l[i]):0!==l[i]&&{0:1,5:1,6:1,7:1,8:1,9:1,10:1,11:1,12:1,13:1,14:1,15:1,16:1,17:1,18:1,19:1,20:1,21:1,22:1,23:1,24:1,25:1}[i]&&e.push(l[i]=new Promise(function(e,n){for(var t="resources/"+({}[i]||i)+"."+{0:"7e9c19881242",1:"31d6cfe0d16a",5:"b6a10460f085",6:"7f893c86c40d",7:"b7a3b3beb3de",8:"edadd3d1dece",9:"2b76410db4d0",10:"30b36ab56f09",11:"5302c669b95c",12:"e14af2852dbd",13:"03a7345988fb",14:"7b16b71e9379",15:"fc688477e0f2",16:"9c95c5430f41",17:"081b63b62922",18:"69bf85281bf8",19:"fca5eccb0e56",20:"76e82d4724d6",21:"abf993cecc16",22:"da1346fedd49",23:"5ba1b1bc7480",24:"43ee51cf782c",25:"12c536f6abaf",26:"31d6cfe0d16a",27:"31d6cfe0d16a",28:"31d6cfe0d16a",29:"31d6cfe0d16a",30:"31d6cfe0d16a",31:"31d6cfe0d16a",32:"31d6cfe0d16a",33:"31d6cfe0d16a"}[i]+".css",a=s.p+t,r=document.getElementsByTagName("link"),o=0;o<r.length;o++){var c=(d=r[o]).getAttribute("data-href")||d.getAttribute("href");if("stylesheet"===d.rel&&(c===t||c===a))return e()}var f=document.getElementsByTagName("style");for(o=0;o<f.length;o++){var d;if((c=(d=f[o]).getAttribute("data-href"))===t||c===a)return e()}var u=document.createElement("link");u.rel="stylesheet",u.type="text/css",u.onload=e,u.onerror=function(e){var t=e&&e.target&&e.target.src||a,r=new Error("Loading CSS chunk "+i+" failed.\n("+t+")");r.request=t,delete l[i],u.parentNode.removeChild(u),n(r)},u.href=a,document.getElementsByTagName("head")[0].appendChild(u)}).then(function(){l[i]=0}));var t,r=b[i];if(0!==r)if(r)e.push(r[2]);else{var n=new Promise(function(e,t){r=b[i]=[e,t]});e.push(r[2]=n);var a,o=document.getElementsByTagName("head")[0],c=document.createElement("script");c.charset="utf-8",c.timeout=120,s.nc&&c.setAttribute("nonce",s.nc),c.src=s.p+"resources/"+({}[t=i]||t)+"."+{0:"fa8f2b4e",1:"d064c442",5:"c7817f69",6:"b1ef9e64",7:"22e3a852",8:"70d69ac2",9:"75f8a6c2",10:"bd3cdbd6",11:"6efe3774",12:"9d2722ff",13:"81f1f175",14:"abfc162b",15:"215fc286",16:"2196badb",17:"ed816a77",18:"f27e87cc",19:"eb8b2375",20:"44834369",21:"015fe65a",22:"48061ee9",23:"b90bdb3f",24:"c496539e",25:"77f16629",26:"7263b586",27:"96f77249",28:"c9ab77ad",29:"e2b8b230",30:"c7136a86",31:"a2b590da",32:"846a5348",33:"03e953f0"}[t]+".js",a=function(e){c.onerror=c.onload=null,clearTimeout(f);var t=b[i];if(0!==t){if(t){var r=e&&("load"===e.type?"missing":e.type),n=e&&e.target&&e.target.src,a=new Error("Loading chunk "+i+" failed.\n("+r+": "+n+")");a.type=r,a.request=n,t[1](a)}b[i]=void 0}};var f=setTimeout(function(){a({type:"timeout",target:c})},12e4);c.onerror=c.onload=a,o.appendChild(c)}return Promise.all(e)},s.m=d,s.c=r,s.d=function(e,t,r){s.o(e,t)||Object.defineProperty(e,t,{enumerable:!0,get:r})},s.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},s.t=function(t,e){if(1&e&&(t=s(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var r=Object.create(null);if(s.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var n in t)s.d(r,n,function(e){return t[e]}.bind(null,n));return r},s.n=function(e){var t=e&&e.__esModule?function(){return e.default}:function(){return e};return s.d(t,"a",t),t},s.o=function(e,t){return Object.prototype.hasOwnProperty.call(e,t)},s.p="https://zws-imgs-pub.ezijing.com/static/build/learn-mba/",s.oe=function(e){throw console.error(e),e};var t=window.webpackJsonp=window.webpackJsonp||[],n=t.push.bind(t);t.push=e,t=t.slice();for(var a=0;a<t.length;a++)e(t[a]);var p=n;u()}([]);
\ No newline at end of file

client/components/player/chapterVideo/chapterVideo.vue

@@ -118,7 +118,8 @@ export default {
         mapFrames: [], // 记录视频播放过的 所有帧 hash 表，数组 下标表示 视频对应帧 - 1，数组值 表示 播放过的帧，重复播 + 1
         videoWidth: VIDEO_DEFAULT_WIDTH,
         videoHeight: VIDEO_DEFAULT_HEIGHT,
-        username: (window.G.UserInfo && window.G.UserInfo.username) || ''
+        username: (window.G.UserInfo && window.G.UserInfo.username) || '',
+        duration: 10000
       },
       /* 增加节流函数 对应 执行 */
       resizeVideo: null,
@@ -193,6 +194,8 @@ export default {
     // 播放时间变更
     onVideoTimeChange (data) {
       let time = data.time
+      /* 获取视频 总时长 */
+      this.videoFlash.duration = data.duration || this.videoFlash.duration
       /* 获取 对应 播放 速度 和 是否 拖动 进度条 */
       this.videoFlash.speed = parseFloat(data.quality.split(' ')[1] || 1)
       this.videoFlash.isSeek = data.isSeek
@@ -342,7 +345,8 @@ export default {
           this._rProgress.map = this.videoFlash.mapFrames
         }
         let _rProgress = this._rProgress
-        let tempTime = this.videoFlash.lastTime
+        let _duration = this.videoFlash.duration
+        let tempTime = Math.min(this.videoFlash.lastTime, _duration)
         let _speed = this.videoFlash.speed
         let _isSeek = this.videoFlash.isSeek
         let _queue = this.videoFlash.queueFrames
@@ -359,6 +363,11 @@ export default {
           /* cpt 和 mpt 应该没问题 */
           _rProgress.cpt = tempTime
           _rProgress.mpt = tempTime > _rProgress.mpt ? tempTime : _rProgress.mpt
+          /* mpt 最大不能超过 总时长 */
+          _rProgress.mpt = _rProgress.mpt > _duration ? _duration : _rProgress.mpt
+          if (parseInt(_rProgress.mpt) > (parseInt(_duration) + 10000)) {
+            this.$message.info('视频播放出错，请刷新页面重新观看。')
+          }
           _rProgress.ps = _queue
           _rProgress.vid = this.id
           /* 调用接口执行刷新 */

client/components/player/chapterVideo/video.vue

@@ -62,11 +62,11 @@ export default {
       }
       // 播放过程中不断触发，传递当前播放到的时间
       window._playerIng = function (time) {
-        $('#' + PLAYER_WRAP_ID).trigger('player.time', { time, quality: that.getPlayer().callAction('getQuality'), isSeek: false })
+        $('#' + PLAYER_WRAP_ID).trigger('player.time', { time, duration: that.getPlayer().callAction('getDuration'), quality: that.getPlayer().callAction('getQuality'), isSeek: false })
       }
       // 拖动播放进度条
       window._playerSeek = function () {
-        $('#' + PLAYER_WRAP_ID).trigger('player.seek', { time: that.getPlayer().callAction('getCurrentTime'), quality: that.getPlayer().callAction('getQuality'), isSeek: true })
+        $('#' + PLAYER_WRAP_ID).trigger('player.seek', { time: that.getPlayer().callAction('getCurrentTime'), duration: that.getPlayer().callAction('getDuration'), quality: that.getPlayer().callAction('getQuality'), isSeek: true })
       }
       // 视频播放结束
       window._playerFinish = function () {

client/components/player/chapterVideo/videoH5.vue

@@ -84,7 +84,7 @@ export default {
         }
         if (rate) { _quality += (' ' + rate) }
         time = videoPlayer.getCurrentTime()
-        $('#' + PLAYER_WRAP_ID).trigger('player.time', { time, quality: _quality, isSeek: false })
+        $('#' + PLAYER_WRAP_ID).trigger('player.time', { time, duration: videoPlayer.getDuration(), quality: _quality, isSeek: false })
       }
       // 开始拖拽
       window._playerSeekStart = function (time) {
@@ -101,7 +101,7 @@ export default {
           case 'SD': _quality = '高清'; break
         }
         if (rate) { _quality += (' ' + rate) }
-        $('#' + PLAYER_WRAP_ID).trigger('player.seek', { time: videoPlayer.getCurrentTime(), quality: _quality, isSeek: true })
+        $('#' + PLAYER_WRAP_ID).trigger('player.seek', { time: videoPlayer.getCurrentTime(), duration: videoPlayer.getDuration(), quality: _quality, isSeek: true })
       }
       // 视频播放结束
       window._playerFinish = function () {

client/project/main.js

@@ -21,7 +21,7 @@ Vue.use(VueRouter)
 const router = createRouter()
 /* 设置全局变量 */
 window.G = Vue.prototype.$GlobalVariable = {
-  VERSION: 'PC-1.1.2'
+  VERSION: 'PC-1.1.3'
 }
 Vue.prototype.$md5 = md5
 /* 导航守卫 */