Merge pull request bytedance#129 from bytedance/dev

Dev
zhangchen91 · Dec 3, 2018 · 8b92777 · 8b92777
2 parents 99243b0 + a260166
commit 8b92777
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 26 deletions.
diff --git a/packages/xgplayer-logger/package.json b/packages/xgplayer-logger/package.json
@@ -1,7 +1,7 @@
 {
   "name": "xgplayer-logger",
-  "version": "1.1.3",
-  "description": "视频监控",
+  "version": "1.1.4-beta",
+  "description": "video player logger",
   "main": "./dist/index.js",
   "directories": {
     "doc": "docs"

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-beta.4",
+    "version": "1.1.4-beta.7",
     "description": "video player",
     "main": "./dist/index.js",
     "scripts": {

diff --git a/packages/xgplayer/src/control/makeBullet.js b/packages/xgplayer/src/control/makeBullet.js
@@ -68,6 +68,7 @@ class Channel {
     }, 10)
   }
   addBullet (bullet) {
+    let player = this.player
     let left = this.width
     let channels = this.channels
     let channelHeight = this.channelHeight
@@ -91,9 +92,22 @@ class Channel {
         flag = true
         for (let j = i; j < i + occupy; j++) {
           channel = channels[j]
-          if (channel.step < bullet.step || channel.surplus < 0) {
-            flag = false
-            break
+          let curBullet = channel.queue[0]
+          if (curBullet) {
+            if (curBullet.el.getBoundingClientRect().right > curBullet.playerPos.right) {
+              flag = false
+              break
+            }
+            let curS = curBullet.el.getBoundingClientRect().left - curBullet.playerPos.left + curBullet.el.getBoundingClientRect().width
+            let curV = curBullet.playerPos.width / curBullet.duration
+            let curT = curS / curV
+            if (!player.config.bOffset) {
+              player.config.bOffset = 0
+            }
+            if (curT + player.config.bOffset > bullet.duration) {
+              flag = false
+              break
+            }
           }
         }
         if (flag) {
@@ -225,7 +239,7 @@ class Bullet {
     let el = document.createElement('div')
     el.textContent = options.txt
     el.style.color = options.color
-    el.style.fontSize = `${options.scale}em`
+    el.style.fontSize = `${20 * options.scale}px`
     this.el = el
     this.width = options.width
     this.height = options.height

diff --git a/packages/xgplayer/src/control/rotate.js b/packages/xgplayer/src/control/rotate.js
@@ -8,22 +8,29 @@ const rotate = function () {
   let root = player.root
   root.appendChild(btn)
   let rotateDeg = 0
-  btn.addEventListener('click', function () {
-    let width = player.root.offsetWidth
-    let height = player.root.offsetHeight
-    player.root.style.width = height + 'px'
-    player.root.style.height = width + 'px'
-    rotateDeg = (rotateDeg + 0.25) % 1
-    let scale
-    if (rotateDeg === 0.25 || rotateDeg === 0.75) {
-      scale = (width / height).toFixed(2)
-    } else {
-      scale = 1
+  if (!player.rotate) {
+    player.rotate = function () {
+      let width = player.root.offsetWidth
+      let height = player.root.offsetHeight
+      player.root.style.width = height + 'px'
+      player.root.style.height = width + 'px'
+      rotateDeg = (rotateDeg + 0.25) % 1
+      let scale
+      if (rotateDeg === 0.25 || rotateDeg === 0.75) {
+        if (width >= height) {
+          scale = (width / height).toFixed(2)
+        } else {
+          scale = (height / width).toFixed(2)
+        }
+      } else {
+        scale = 1
+      }
+      player.video.style.transform = `rotate(${rotateDeg}turn) scale(${scale})`
+      player.video.style.webKitTransform = `rotate(${rotateDeg}turn) scale(${scale})`
+      player.emit('rotate', rotateDeg * 360)
     }
-    player.video.style.transform = `rotate(${rotateDeg}turn) scale(${scale})`
-    player.video.style.webKitTransform = `rotate(${rotateDeg}turn) scale(${scale})`
-    player.emit('rotate', rotateDeg * 360)
-  })
+  }
+  btn.addEventListener('click', player.rotate)
 }
 
 Player.install('rotate', rotate)
diff --git a/packages/xgplayer/src/proxy.js b/packages/xgplayer/src/proxy.js
@@ -14,6 +14,7 @@ class Proxy {
       autoplay: options.autoplay,
       playsinline: options.playsinline,
       'webkit-playsinline': options.playsinline,
+      'x5-playsinline': options.playsinline,
       'x5-video-player-type': options['x5-video-player-type'],
       'x5-video-player-fullscreen': options['x5-video-player-fullscreen'],
       'x5-video-orientation': options['x5-video-orientation'],