ezuikit-js 7.5.0 → 7.6.1

package/demos/base-demo/ezuikit_static/v65/v2/js/jsPluginV2-2.0.1.min.js

@@ -3049,6 +3049,10 @@ const loadJSByBlobToHeader = (url, callback, isReady) => {
                       }
                     }
                   }
+                  if (oJSON && oJSON.errorCode) {
+                    //推流异常时返回异常信息
+                    cbMessage(oJSON);
+                  }
                 } else {
                   let dataObj = {};
                   let dataBuf = new Uint8Array(e.data);
@@ -3753,7 +3757,6 @@ const loadJSByBlobToHeader = (url, callback, isReady) => {
 //宽、高
 var nWidth = 0;
 var nHeight = 0;
-var g_port;
 // 录制
 // var aHead = []; 
 function downloadFile(oData, szName) {
@@ -3901,9 +3904,26 @@ class JSPluginV2 {
       console.log("1.获取播放库端口号 g_port:" + _this.g_port);
       // 端口已经使用，设置为不可用状态
       this.portAvailable = false;
+
+      //xuehb 开始取流 4
+      if (_this.EventCallback && _this.EventCallback.openStreamCallback) {
+        console.log('开始取流-----v2');
+        _this.EventCallback.openStreamCallback();
+      }
       _this.oStreamClient.openStream(szUrl, oParams, data => {
+        if (data.errorCode && data.errorCode != '1') {
+          //推流异常时触发errorHandler
+          if (_this.EventCallback && _this.EventCallback.pluginErrorHandler) {
+            _this.EventCallback.pluginErrorHandler(iWndNum, data.errorCode, data);
+          }
+        }
         if (data.bHead) {
           //判断是否开启预览，用于初始化播放库，回放跳片段是会返回媒体头，不能只判断是否为媒体头
+          //xuehb 完成取流返回流头 5 
+          if (_this.EventCallback && _this.EventCallback.getStreamHeaderCallback) {
+            console.log('完成取流返回流头');
+            _this.EventCallback.getStreamHeaderCallback();
+          }
           _this.PlayM4_openStream(_this.g_port, data.buf);
           _this.aHead = new Uint8Array(data.buf);
           _this.pCanvasData = Module._malloc(128); //通过emscripten分配C/C++中的堆内存
@@ -3920,6 +3940,28 @@ class JSPluginV2 {
           aKeyData = null;
           let resP = Module._JSPlayM4_Play(_this.g_port, _this.pCanvasData); //pCanvasString或pCanvasData
           console.log("4.开始播放 resP:" + resP);
+          try {
+            const getQueryString = (name, url) => {
+              const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+              const r = url.match(reg);
+              if (r != null) {
+                return unescape(r[2]);
+              }
+              return null;
+            };
+            const date = getQueryString('begin', oParams.playURL);
+            const year = parseInt(date.slice(0, 4));
+            const month = parseInt(date.slice(4, 6));
+            const day = parseInt(date.slice(6, 8));
+            const hour = parseInt(date.slice(9, 11));
+            const min = parseInt(date.slice(11, 13));
+            const second = parseInt(date.slice(13, 15)) + 3;
+            const setRes = Module._JSPlayM4_SetGlobalBaseTime(_this.g_port, year, month, day, hour, min, second, 0);
+            console.log('设置OSD时间: ', _this.g_port, year + ':' + month + ':' + day + ':' + hour + ':' + min + ':' + second + ':' + 0);
+            console.log('设置OSD时间res:', setRes);
+          } catch (error) {
+            console.log('_JSPlayM4_SetGlobalBaseTime:', error);
+          }
           _this.bPlay = true;
           _this.bPlayIng = false;
           // 设置一系列回调
@@ -3933,13 +3975,32 @@ class JSPluginV2 {
           Module._JSPlayM4_RenderPrivateData(0, 4, 0);
           Module._JSPlayM4_RenderPrivateData(0, 16, 0);
           this.firstFlag = true;
+          this.firstGetData = true;
           resolve(resP);
         } else {
+          if (this.firstGetData) {
+            // 第一次获取数据
+            this.firstGetData = false;
+
+            //xuehb 返回视频流(首次) 6
+            if (_this.EventCallback && _this.EventCallback.getVideoStreamCallback) {
+              _this.EventCallback.getVideoStreamCallback();
+            }
+          }
           if (this.firstFlag) {
             let oFrameInfo = Module._JSPlayM4_GetFrameInfo(this.g_port);
             var nWidth = Module.HEAP32[oFrameInfo + 12 >> 2];
             var nHeight = Module.HEAP32[oFrameInfo + 16 >> 2];
             if (nWidth) {
+              //xuehb 首屏展示 7
+              if (_this.EventCallback && _this.EventCallback.appearFirstFrameCallback) {
+                console.log('出现首帧画面（播放成功）------多线程');
+                _this.EventCallback.appearFirstFrameCallback();
+              }
+              //xuehb 平均成功取流的出流耗时 8
+              if (_this.EventCallback && _this.EventCallback.averageStreamSuccessCallback) {
+                _this.EventCallback.averageStreamSuccessCallback();
+              }
               console.log("首帧展示", nWidth, nHeight);
               this.firstFlag = false;
               if (document.getElementById(this.szId + '-player-tmp')) {
@@ -3991,13 +4052,13 @@ class JSPluginV2 {
         //websocket onopen事件触发
         _this.szStreamUUID = id;
         _this.oStreamClient.startPlay(id).then(() => {
-          let resSSOM = Module._JSPlayM4_SetStreamOpenMode(g_port, 1);
+          let resSSOM = Module._JSPlayM4_SetStreamOpenMode(_this.g_port, 1);
           console.log("2.设置流模式 resSSOM:" + resSSOM);
         }).catch(err => {
           console.log("err", err);
           _this._doRelease();
           _this.bPlayIng = false;
-          reject(err);
+          reject(err.oError);
         });
       }, function (oError) {
         //websocekt 未进入onopen
@@ -4471,8 +4532,11 @@ class JSPluginV2 {
   }
   JS_Speed(nextRate) {
     this.oStreamClient.setPlayRate(this.szStreamUUID, nextRate);
+    window.Module._JSPlayM4_SetDecodeFrameType(1);
+    const fastRes = window.Module._JSPlayM4_Fast(this.g_port);
     this.iRate = nextRate;
     console.log("开启倍速播放", nextRate);
+    console.log("开启倍速播放res:", fastRes);
   }
   JS_Seek(iWndNum, szStartTime, szStopTime) {
     let oPromise = new Promise((resolve, reject) => {
@@ -4574,19 +4638,18 @@ class JSPluginV2 {
       if (this.playURL.indexOf("playback") !== -1) {
         this.playURL = this.playURL.replace(/begin=[0-9]{8}T[0-9]{6}Z/gi, `begin=${this.bPauseTime.slice(0, 8)}T${this.bPauseTime.slice(8, 14)}Z`);
       }
+      console.log('this.playURL:', this.playURL);
+      console.log('this.bPauseTime:', this.bPauseTime);
+      if (this.playURL.indexOf("cloudplayback") !== -1) {
+        this.playURL = this.playURL.replace(/"startTime":[0-9]{13}/gi, `"startTime":${this.bPauseTime}`);
+      }
       this.bPause = false;
       this.JS_Play(this.szUrl, {
         playURL: this.playURL
       }).then(data => {
-        resolve({
-          code: 1,
-          msg: "恢复成功"
-        });
+        resolve(data);
       }).catch(err => {
-        reject({
-          code: 0,
-          msg: "恢复失败"
-        });
+        reject(err);
       });
     });
     return promise;

package/demos/base-demo/ezuikit_static/v66/v1/css/theme.css

@@ -0,0 +1,121 @@
+.footer-controls .theme-icon-item {
+  margin: 0 1%;
+}
+.footer-controls.themeEditing .theme-icon-item {
+  position: relative;
+  /* margin: 0 8px; */
+}
+.footer-controls .footer-controls-left{
+  margin-left: 12px;
+}
+.footer-controls.themeEditing .footer-controls-left .theme-icon-item {
+  /* margin-left: 12px; */
+}
+.footer-controls.themeEditing .footer-controls-right .theme-icon-item {
+  /* margin-right: 12px; */
+}
+.footer-controls .theme-icon-item .icon-move {
+  display: none;
+}
+.footer-controls.themeEditing .theme-icon-item:hover .icon-move {
+  display: block;
+}
+.footer-controls.themeEditing .footer-controls-left .theme-icon-item:first-child .icon-move.left{
+  display: none;
+}
+.footer-controls.themeEditing .footer-controls-left .theme-icon-item:nth-last-child(1) .icon-move.right{
+  display: none;
+}
+.footer-controls .footer-controls-right {
+  margin-right: 12px;
+}
+
+.footer-controls.themeEditing .footer-controls-right .theme-icon-item:first-child .icon-move.left{
+  display: none;
+}
+.footer-controls.themeEditing .footer-controls-right .theme-icon-item:nth-last-child(1) .icon-move.right{
+  display: none;
+}
+
+.header-controls .theme-icon-item {
+  margin: 0 1%;
+}
+.header-controls.themeEditing .theme-icon-item {
+  position: relative;
+  /* margin: 0 8px; */
+}
+.header-controls.themeEditing .header-controls-left  {
+  margin-left: 12px;
+}
+.header-controls.themeEditing .header-controls-right {
+  margin-right: 12px;
+}
+.header-controls .theme-icon-item .icon-move {
+  display: none;
+}
+.header-controls.themeEditing .theme-icon-item:hover .icon-move {
+  display: block;
+}
+.header-controls.themeEditing .header-controls-left .theme-icon-item:first-child .icon-move.left{
+  display: none;
+}
+.header-controls.themeEditing .header-controls-left .theme-icon-item:nth-last-child(1) .icon-move.right{
+  display: none;
+}
+
+.header-controls.themeEditing .header-controls-right .theme-icon-item:first-child .icon-move.left{
+  display: none;
+}
+.header-controls.themeEditing .header-controls-right .theme-icon-item:nth-last-child(1) .icon-move.right{
+  display: none;
+}
+
+
+.time-area {
+  position: absolute;
+  color: #FFFFFF;
+  width: 68px;
+  height: 24px;
+  line-height: 24px;
+  background: #00000050;
+  border-radius: 12px;
+  display: none;
+  align-content: center;
+  left: calc(50% - 34px);
+  top: -30px;
+  align-items: center;
+  justify-content: space-around;
+  padding-left: 4px;
+  z-index: 9999999;
+
+}
+.time-area .dot {
+  display: inline-block;
+  width: 8px;
+  height: 8px;
+  background: red;
+  border-radius: 100%;
+  margin: 0 4px 1px 4px;
+}
+
+
+/* .footer-controls.themeEditing .theme-icon-item {
+  position: relative;
+  margin: 0 8px;
+}
+.footer-controls.themeEditing .footer-controls-left .theme-icon-item:nth-child(1) .ezuikit-theme-icon >span:first-child{
+  display: none!important;
+}
+.footer-controls.themeEditing .footer-controls-left .theme-icon-item:nth-last-child(2) .ezuikit-theme-icon >span:nth-child(3){
+  display: none!important;
+}
+
+.footer-controls.themeEditing .theme-icon-item:hover .ezuikit-theme-icon {
+  display: block!important;
+}
+.footer-controls.themeEditing .footer-controls-right .theme-icon-item:nth-child(1) .ezuikit-theme-icon >span:first-child{
+  display: none!important;
+}
+.footer-controls.themeEditing .footer-controls-right .theme-icon-item:nth-last-child(1) .ezuikit-theme-icon >span:nth-child(3){
+  display: none!important;
+} */

package/demos/base-demo/ezuikit_static/v66/v1/js/AudioRenderer.js

@@ -0,0 +1,225 @@
+/**
+ * Created by wangweijie5 on 2016/12/16.
+ */
+
+"use strict";
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+var __instance = function () {
+    var instance = void 0;
+    return function (newInstance) {
+        if (newInstance) instance = newInstance;
+        return instance;
+    };
+}();
+
+var AudioRenderer = function () {
+    function AudioRenderer() {
+        _classCallCheck(this, AudioRenderer);
+
+        if (__instance()) return __instance();
+
+        // 确保只有单例
+        if (AudioRenderer.unique !== undefined) {
+            return AudioRenderer.unique;
+        }
+
+        AudioRenderer.unique = this;
+
+        this.oAudioContext = null;
+        this.currentVolume = 0.8; // 初始音量
+        this.bSetVolume = false;
+        this.gainNode = null;
+        this.iWndNum = -1; // 窗口号
+        this.mVolumes = new Map(); // 用于存储所有音量
+
+        // Init AudioContext
+        var AudioContext = window.AudioContext || window.webkitAudioContext;
+        this.oAudioContext = new AudioContext();
+
+        this.writeString = function (view, offset, string) {
+            for (var i = 0; i < string.length; i++) {
+                view.setUint8(offset + i, string.charCodeAt(i));
+            }
+        };
+
+        this.setBufferToDataview = function (output, offset, input) {
+            for (var i = 0; i < input.length; i++, offset++) {
+                output.setUint8(offset, input[i]);
+            }
+        };
+
+        __instance(this);
+    }
+
+    /**
+     * @synopsis 音频播放
+     *
+     *  @param dataBuf [IN] 音频缓存
+     *  @param dataLen [IN] 缓存长度
+     *  @param audioInfo [IN] 音频参数
+     *
+     * @returns 状态码
+     */
+
+
+    _createClass(AudioRenderer, [{
+        key: 'Play',
+        value: function Play(dataBuf, dataLen, audioInfo) {
+            var bufferData = new ArrayBuffer(44 + dataLen);
+            var viewTalk = new DataView(bufferData);
+            var sampleRates = audioInfo.samplesPerSec;
+            var channels = audioInfo.channels;
+            var bitsPerSample = audioInfo.bitsPerSample;
+
+            //console.log("audiorender sampleRates"+sampleRates+"channels:"+channels+"bitsPerSample:"+bitsPerSample);
+
+            /* RIFF identifier */
+            this.writeString(viewTalk, 0, 'RIFF');
+            /* file length */
+            viewTalk.setUint32(4, 32 + dataLen * 2, true);
+            /* RIFF type */
+            this.writeString(viewTalk, 8, 'WAVE');
+            /* format chunk identifier */
+            this.writeString(viewTalk, 12, 'fmt ');
+            /* format chunk length */
+            viewTalk.setUint32(16, 16, true);
+            /* sample format (raw) */
+            viewTalk.setUint16(20, 1, true);
+            /* channel count */
+            viewTalk.setUint16(22, channels, true);
+            /* sample rate */
+            viewTalk.setUint32(24, sampleRates, true);
+            /* byte rate (sample rate * block align) */
+            viewTalk.setUint32(28, sampleRates * 2, true);
+            /* block align (channel count * bytes per sample)/8 */
+            viewTalk.setUint16(32, channels * bitsPerSample / 8, true);
+            /* bits per sample */
+            viewTalk.setUint16(34, bitsPerSample, true);
+            /* data chunk identifier */
+            this.writeString(viewTalk, 36, 'data');
+            /* data chunk length */
+            viewTalk.setUint32(40, dataLen, true);
+            this.setBufferToDataview(viewTalk, 44, dataBuf);
+
+            var self = this;
+            this.oAudioContext.decodeAudioData(viewTalk.buffer, function (buffer) {
+
+                var bufferSource = self.oAudioContext.createBufferSource();
+                if (bufferSource == null) {
+                    return -1;
+                }
+
+                bufferSource.buffer = buffer;
+                bufferSource.start(0);
+
+                if (self.gainNode == null || self.bSetVolume) {
+                    self.gainNode = self.oAudioContext.createGain();
+                    // self.gainNode.gain.value = self.currentVolume;
+                    // // self.currentVolume = self.gainNode.gain.value;
+                    // self.gainNode.connect(self.oAudioContext.destination);
+
+                    self.bSetVolume = false;
+                }
+
+                self.gainNode.gain.value = self.currentVolume;
+                // self.currentVolume = self.gainNode.gain.value;
+                self.gainNode.connect(self.oAudioContext.destination);
+
+                bufferSource.connect(self.gainNode);
+            }, function (e) {
+                console.log("decode error");
+                return -1;
+            });
+
+            return 0;
+        }
+
+        /**
+         * @synopsis 停止播放
+         *
+         * @returns 返回音量
+         */
+
+    }, {
+        key: 'Stop',
+        value: function Stop() {
+            if (this.gainNode != null) {
+                this.gainNode.disconnect();
+                this.gainNode = null;
+            }
+
+            // this.oAudioContext.close();
+
+            // AudioRenderer.unique = undefined;
+            // __instance() = null;
+            return true;
+        }
+
+        /**
+         * @synopsis 设置音量
+         *
+         *  @param iVolume [IN] 音量
+         *
+         * @returns 状态码
+         */
+
+    }, {
+        key: 'SetVolume',
+        value: function SetVolume(iVolume) {
+            this.bSetVolume = true;
+            this.currentVolume = iVolume;
+
+            // 储存当前窗口设置音量值
+            this.mVolumes.set(this.iWndNum, iVolume);
+            return true;
+        }
+
+        /**
+         * @synopsis 设置窗口号
+         *
+         *  @param iWndNum [IN] 窗口号
+         *
+         * @returns 状态码
+         */
+
+    }, {
+        key: 'SetWndNum',
+        value: function SetWndNum(iWndNum) {
+            this.iWndNum = iWndNum;
+
+            // 获取当前窗口设置音量值
+            var iVolume = this.mVolumes.get(iWndNum);
+            if (iVolume == undefined) {
+                iVolume = 0.8; // 默认音量
+            }
+            this.currentVolume = iVolume;
+
+            return true;
+        }
+
+        /**
+         * @synopsis 获取音量
+         *
+         * @returns 返回音量
+         */
+
+    }, {
+        key: 'GetVolume',
+        value: function GetVolume() {
+            // 获取当前窗口设置音量值
+            var iVolume = this.mVolumes.get(this.iWndNum);
+            if (iVolume == undefined) {
+                iVolume = 0.8; // 默认音量
+            }
+
+            return iVolume;
+        }
+    }]);
+window.AudioRenderer = AudioRenderer;
+    return AudioRenderer;
+}();
+//# sourceMappingURL=AudioRenderer.js.map