ezuikit-js 7.6.1 → 7.6.2

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

@@ -3049,10 +3049,6 @@ const loadJSByBlobToHeader = (url, callback, isReady) => {
                       }
                     }
                   }
-                  if (oJSON && oJSON.errorCode) {
-                    //推流异常时返回异常信息
-                    cbMessage(oJSON);
-                  }
                 } else {
                   let dataObj = {};
                   let dataBuf = new Uint8Array(e.data);
@@ -3757,6 +3753,7 @@ const loadJSByBlobToHeader = (url, callback, isReady) => {
 //宽、高
 var nWidth = 0;
 var nHeight = 0;
+var g_port;
 // 录制
 // var aHead = []; 
 function downloadFile(oData, szName) {
@@ -3904,26 +3901,9 @@ 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++中的堆内存
@@ -3940,28 +3920,6 @@ 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;
           // 设置一系列回调
@@ -3975,32 +3933,13 @@ 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')) {
@@ -4052,13 +3991,13 @@ class JSPluginV2 {
         //websocket onopen事件触发
         _this.szStreamUUID = id;
         _this.oStreamClient.startPlay(id).then(() => {
-          let resSSOM = Module._JSPlayM4_SetStreamOpenMode(_this.g_port, 1);
+          let resSSOM = Module._JSPlayM4_SetStreamOpenMode(g_port, 1);
           console.log("2.设置流模式 resSSOM:" + resSSOM);
         }).catch(err => {
           console.log("err", err);
           _this._doRelease();
           _this.bPlayIng = false;
-          reject(err.oError);
+          reject(err);
         });
       }, function (oError) {
         //websocekt 未进入onopen
@@ -4532,11 +4471,8 @@ 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) => {
@@ -4638,18 +4574,19 @@ 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(data);
+        resolve({
+          code: 1,
+          msg: "恢复成功"
+        });
       }).catch(err => {
-        reject(err);
+        reject({
+          code: 0,
+          msg: "恢复失败"
+        });
       });
     });
     return promise;