@ray-js/ray-ipc-player 2.0.13 → 2.0.15

package/lib/index.js

@@ -1,6 +1,8 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import "core-js/modules/es.array.includes.js";
+import "core-js/modules/es.string.includes.js";
 import "core-js/modules/es.object.to-string.js";
 import "core-js/modules/es.promise.js";
 import "core-js/modules/es.array.concat.js";
@@ -107,15 +109,13 @@ var Player = function (props) {
       while (1) {
         switch (_context2.prev = _context2.next) {
           case 0:
-            // console.log('hide');
             setPlayState(function (d) {
               d.loadingState = true;
-            });
-            _context2.next = 3;
-            return getCurMute();
+            }); // 先停流
 
-          case 3:
             stopPreview();
+            _context2.next = 4;
+            return getCurMute();
 
           case 4:
           case "end":
@@ -179,6 +179,7 @@ var Player = function (props) {
                 d.errorState = false;
                 d.loadingState = isOnPreview ? false : true;
               }); // !prePlayRef.current && connectState && (await disconnect());
+              // console.log(connectState, isOnPreview, '当前链接状态和预览状态');
 
               ipcCtx.current && createConnect();
 
@@ -275,15 +276,55 @@ var Player = function (props) {
         params && onInitPreview && onInitPreview(devId);
         onChangeStreamStatus && onChangeStreamStatus(1002);
       },
-      fail: function fail() {
-        // console.error('开启失败：', devId);
-        setPlayState(function (d) {
-          d.errorState = true;
-          d.loadingState = false;
-          d.errorMsg = locals.getLang('ipc_player_preview_fail');
-        });
-        onChangeStreamStatus && onChangeStreamStatus(-1002);
-      },
+      fail: function () {
+        var _fail = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5(e) {
+          var isOnPreview;
+          return _regeneratorRuntime.wrap(function (_context5) {
+            while (1) {
+              switch (_context5.prev = _context5.next) {
+                case 0:
+                  _context5.next = 2;
+                  return getIsOnPreview(ipcCtx.current);
+
+                case 2:
+                  isOnPreview = _context5.sent;
+
+                  if (!(!isOnPreview || e !== null && e !== void 0 && e.errorMsg.includes('doing preview'))) {
+                    _context5.next = 7;
+                    break;
+                  }
+
+                  // 忽略重复预览异常的报错
+                  setPlayState(function (d) {
+                    d.loadingState = false;
+                    d.errorState = false;
+                    d.errorMsg = '';
+                  });
+                  onChangeStreamStatus && onChangeStreamStatus(1002);
+                  return _context5.abrupt("return");
+
+                case 7:
+                  setPlayState(function (d) {
+                    d.errorState = true;
+                    d.loadingState = false;
+                    d.errorMsg = locals.getLang('ipc_player_preview_fail');
+                  });
+                  onChangeStreamStatus && onChangeStreamStatus(-1002);
+
+                case 9:
+                case "end":
+                  return _context5.stop();
+              }
+            }
+          }, _callee5);
+        }));
+
+        function fail() {
+          return _fail.apply(this, arguments);
+        }
+
+        return fail;
+      }(),
       complete: function complete() {
         // console.log('startPreview:', muteRef.current);
         setMuted(muteRef.current);
@@ -393,22 +434,22 @@ var Player = function (props) {
 
 
   var handleReWakeCamera = /*#__PURE__*/function () {
-    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee5() {
-      return _regeneratorRuntime.wrap(function (_context5) {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee6() {
+      return _regeneratorRuntime.wrap(function (_context6) {
         while (1) {
-          switch (_context5.prev = _context5.next) {
+          switch (_context6.prev = _context6.next) {
             case 0:
-              _context5.next = 2;
+              _context6.next = 2;
               return putDpData({
                 105: false
               }, devId);
 
             case 2:
             case "end":
-              return _context5.stop();
+              return _context6.stop();
           }
         }
-      }, _callee5);
+      }, _callee6);
     }));
 
     return function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-miniapp",