fix(xgplayer): fix exitFullscreen event problem in Android

masterpieceis · Oct 28, 2018 · 3eff095 · 3eff095
1 parent 28ed120
commit 3eff095
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/packages/xgplayer/browser/index.js b/packages/xgplayer/browser/index.js
diff --git a/packages/xgplayer/dist/index.js b/packages/xgplayer/dist/index.js
diff --git a/packages/xgplayer/package.json b/packages/xgplayer/package.json
@@ -1,6 +1,6 @@
 {
     "name": "xgplayer",
-    "version": "1.1.4-alpha.3",
+    "version": "1.1.4-alpha.4",
     "description": "video player",
     "main": "./dist/index.js",
     "scripts": {

diff --git a/packages/xgplayer/src/control/fullscreen.js b/packages/xgplayer/src/control/fullscreen.js
@@ -32,7 +32,6 @@ let fullscreen = function () {
     } else {
       util.addClass(el, 'xgplayer-fullscreen-active')
     }
-    player.emit('requestFullscreen')
   }
   let exitFullscreen = function (el) {
     path.setAttribute('d', iconPath.default)
@@ -48,7 +47,6 @@ let fullscreen = function () {
     } else {
       util.removeClass(el, 'xgplayer-fullscreen-active')
     }
-    player.emit('exitFullscreen')
   }
   root.appendChild(btn);
   ['click', 'touchend'].forEach(item => {
@@ -73,10 +71,12 @@ let fullscreen = function () {
       util.addClass(container, 'xgplayer-is-fullscreen')
       path.setAttribute('d', iconPath.active)
       tips.textContent = tipsExitFull
+      player.emit('requestFullscreen')
     } else {
       util.removeClass(container, 'xgplayer-is-fullscreen')
       path.setAttribute('d', iconPath.default)
       tips.textContent = tipsFull
+      player.emit('exitFullscreen')
     }
   }