[feta]支持HLS创建多个实例

yujianbohz · yujianbohz · commit ebbcd188ebc8 · 2022-06-28T10:55:35.000+08:00
diff --git a/demos/base-demo/ezuikit.js b/demos/base-demo/ezuikit.js
@@ -319,13 +319,15 @@ var HLS = /*#__PURE__*/function () {
 
     _classCallCheck$1(this, HLS);
 
-    addJs("https://open.ys7.com/sdk/js/2.0/js/hls.min.js", function () {
+    addJs("https://open.ys7.com/assets/ezuikit_v3.4/js/hls.js", function () {
       console.log("加载hls.min.js成功", window.Hls);
       console.log("isSupportHls", window.Hls.isSupported());
 
       if (window.Hls.isSupported()) {
         _this.initHLS(videoId, url);
       }
+    }, function () {
+      return !!window.Hls;
     });
   }
 
@@ -31912,9 +31914,40 @@ var matchTemplate = function matchTemplate(templateName, params) {
 };
 
 var isVersion2Available = function isVersion2Available() {
+  var ua = window.navigator.userAgent.toLowerCase(); //获取用户端信息
+
+  var info = {
+    sa: /version.*safari/.test(ua),
+    //匹配Safari浏览器
+    ch: /chrome/.test(ua),
+    //匹配Chrome浏览器
+    ff: /gecko/.test(ua) && !/webkit/.test(ua) //匹配Firefox浏览器
+
+  };
   var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-  var isSharedArrayBuffer = window.SharedArrayBuffer;
-  return isSharedArrayBuffer && !isMobile;
+
+  if (isMobile) {
+    return false;
+  } else if (info.ch) {
+    var getChromeVersion = function getChromeVersion() {
+      var arr = window.navigator.userAgent.split(' ');
+      var chromeVersion = '';
+
+      for (var i = 0; i < arr.length; i++) {
+        if (/chrome/i.test(arr[i])) chromeVersion = arr[i];
+      }
+
+      if (chromeVersion) {
+        return Number(chromeVersion.split('/')[1].split('.')[0]);
+      } else {
+        return false;
+      }
+    };
+
+    return getChromeVersion() > 91 && !!window.SharedArrayBuffer;
+  }
+
+  return false;
 };
 
 var EZUIKitPlayer = /*#__PURE__*/function () {
diff --git a/demos/base-demo/hls.html b/demos/base-demo/hls.html
@@ -11,11 +11,13 @@
 <body>
   <div className="demo">
     <h2>视频模式使用示例：</h2>
-    <video id="hlsId" autoplay controls src="https://open.ys7.com/v3/openlive/C78957921_1_2.m3u8?expire=1680953107&id=434433876120637440&t=007a292c63640f6de88c92e43b5d72233f6b1ed5d69560122ba2ac294d01237e&ev=100"></video>
-    <p style="font-style: italic;">播放多个视频，可初始化多个实例，参考：/demos/base-demo/multi-demo</p>
+    <video id="hlsId" autoplay controls style="width: 600px;height:400px"></video>
+    <video id="hlsId2" autoplay controls style="width: 600px;height:400px"></video>
   </div>
   <script>
-    var hlsDemo = new EZUIKit.HLS("hlsId","https://hls01open.ys7.com/openlive/6e0b2be040a943489ef0b9bb344b96b8.m3u8");
+    var hlsDemo = new EZUIKit.HLS("hlsId","https://open.ys7.com/v3/openlive/C78957921_1_2.m3u8?expire=1687488306&id=461844489422516224&t=96ea4ce49d2ea4f2f65d045edbe8fa1a51ef9fac6f38e150052bc64a91c27db7&ev=100");
+
+    var hlsDemo2 = new EZUIKit.HLS("hlsId2","https://open.ys7.com/v3/openlive/G39444019_1_2.m3u8?expire=1687487466&id=461840962679742464&t=c076d5a5ad56090e919a6a2500b96169c20a77874cce866a87a7d65e493e6f2f&ev=100");
   </script>
 </body>
 
diff --git a/ezuikit.js b/ezuikit.js
@@ -319,13 +319,15 @@ var HLS = /*#__PURE__*/function () {
 
     _classCallCheck$1(this, HLS);
 
-    addJs("https://open.ys7.com/sdk/js/2.0/js/hls.min.js", function () {
+    addJs("https://open.ys7.com/assets/ezuikit_v3.4/js/hls.js", function () {
       console.log("加载hls.min.js成功", window.Hls);
       console.log("isSupportHls", window.Hls.isSupported());
 
       if (window.Hls.isSupported()) {
         _this.initHLS(videoId, url);
       }
+    }, function () {
+      return !!window.Hls;
     });
   }
 
@@ -31912,9 +31914,40 @@ var matchTemplate = function matchTemplate(templateName, params) {
 };
 
 var isVersion2Available = function isVersion2Available() {
+  var ua = window.navigator.userAgent.toLowerCase(); //获取用户端信息
+
+  var info = {
+    sa: /version.*safari/.test(ua),
+    //匹配Safari浏览器
+    ch: /chrome/.test(ua),
+    //匹配Chrome浏览器
+    ff: /gecko/.test(ua) && !/webkit/.test(ua) //匹配Firefox浏览器
+
+  };
   var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
-  var isSharedArrayBuffer = window.SharedArrayBuffer;
-  return isSharedArrayBuffer && !isMobile;
+
+  if (isMobile) {
+    return false;
+  } else if (info.ch) {
+    var getChromeVersion = function getChromeVersion() {
+      var arr = window.navigator.userAgent.split(' ');
+      var chromeVersion = '';
+
+      for (var i = 0; i < arr.length; i++) {
+        if (/chrome/i.test(arr[i])) chromeVersion = arr[i];
+      }
+
+      if (chromeVersion) {
+        return Number(chromeVersion.split('/')[1].split('.')[0]);
+      } else {
+        return false;
+      }
+    };
+
+    return getChromeVersion() > 91 && !!window.SharedArrayBuffer;
+  }
+
+  return false;
 };
 
 var EZUIKitPlayer = /*#__PURE__*/function () {
