修改ci&修复视频播放结束重新播放的bug

CodFrm · Apr 6, 2019 · 66070ad · 66070ad
1 parent 1ede43b
commit 66070ad
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,7 +21,7 @@ before_install:
 
 script: 
  - npm run pack
- - cd build/cxmooc-tools && zip ../cxmooc-tools.zip -r ./
+ - cd build/cxmooc-tools && zip ../cxmooc-tools.zip -r ./ && cd ../../
 
 deploy:
   provider: releases

diff --git a/src/cxmooc-tools/chaoxing/video.js b/src/cxmooc-tools/chaoxing/video.js
@@ -90,19 +90,18 @@ module.exports = function () {
                 }
             }
         });
-
-        let end = false;
+        let tag = Math.random();
+        localStorage['now_video_tag'] = tag;
         let pauseTimer = setInterval(function () {
             //以防万一的暂停- -
-            if (!self.pause && !end) {
+            if (!self.pause && localStorage['now_video_tag'] == tag) {
                 self.video.paused && self.video.play();
-            } else {
+            } else if (localStorage['now_video_tag'] != tag) {
                 clearInterval(pauseTimer);
             }
         }, 10000);
 
         $(self.video).on('ended', function () {
-            end = true;
             if (undefined != self.complete) {
                 self.complete();
             }