@ray-js/ray-ipc-player 2.0.1 → 2.0.3-beta-1

package/lib/index.js

@@ -85,8 +85,10 @@ var Player = function (props) {
     // console.log('show');
     if (ipcCtx.current && playState.connectState) {
       startPreview('');
+    } else if (ipcCtx.current) {
+      retry();
     }
-  }, [playState.connectState]));
+  }, [playState.connectState, privateState]));
   usePageEvent('onHide', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     return _regeneratorRuntime.wrap(function (_context) {
       while (1) {
@@ -108,17 +110,14 @@ var Player = function (props) {
         }
       }
     }, _callee);
-  }))); // 隐私模式
-
+  })));
   useEffect(function () {
-    setPlayState(function (d) {
-      d.errorState = privateState;
-    });
-
-    if (!privateState) {
-      retry();
-    }
-  }, [privateState]);
+    onlineStatus && createIpcCtx(devId);
+    return function () {
+      disconnect();
+      ipcCtx.current = null;
+    };
+  }, [devId, onlineStatus]);
   useEffect(function () {
     muteRef.current = defaultMute;
   }, [defaultMute]);
@@ -126,11 +125,12 @@ var Player = function (props) {
     setPlayState(function (d) {
       d.updateLy = updateLayout;
     });
-  }, [updateLayout]); // 设备离线
+  }, [updateLayout]); // 设备离线、隐私模式
 
   useEffect(function () {
     setPlayState(function (d) {
       d.deviceOnlineState = onlineStatus;
+      d.errorState = privateState;
     });
 
     if (!onlineStatus) {
@@ -138,13 +138,13 @@ var Player = function (props) {
         d.errorState = true;
         d.errorMsg = locals.getLang('ipc_player_no_line');
       });
-    } else if (playState.initLy) {
+    } else if (playState.initLy && !privateState) {
       retry();
     }
-  }, [onlineStatus, playState.initLy]); // 重试
+  }, [onlineStatus, playState.initLy, privateState]); // 重试
 
   var _retry = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(connectState) {
       return _regeneratorRuntime.wrap(function (_context2) {
         while (1) {
           switch (_context2.prev = _context2.next) {
@@ -155,7 +155,7 @@ var Player = function (props) {
                 d.errorState = false;
                 d.loadingState = true;
               });
-              _context2.t0 = playState.connectState;
+              _context2.t0 = connectState;
 
               if (!_context2.t0) {
                 _context2.next = 5;
@@ -166,7 +166,7 @@ var Player = function (props) {
               return disconnect();
 
             case 5:
-              createConnect();
+              ipcCtx.current && createConnect();
 
             case 6:
             case "end":
@@ -183,7 +183,7 @@ var Player = function (props) {
 
   var retry = useCallback(function () {
     // console.log('retry:', muteRef.current);
-    !privateState && _retry();
+    !privateState && _retry(playState.connectState);
   }, [playState.connectState, privateState]); // 创建ipc实例
 
   var createIpcCtx = function (id) {
@@ -196,15 +196,8 @@ var Player = function (props) {
       ctx: ipcCtx.current,
       retry: retry
     });
-  };
+  }; // 建立连接
 
-  useEffect(function () {
-    onlineStatus && createIpcCtx(devId);
-    return function () {
-      disconnect();
-      ipcCtx.current = null;
-    };
-  }, [devId, onlineStatus]); // 建立连接
 
   var createConnect = function (params) {
     var _ipcCtx$current;
@@ -432,7 +425,7 @@ var Player = function (props) {
     autoPauseIfNavigate: false,
     autoPauseIfOpenNative: false,
     muted: defaultMute,
-    objectFit: "fillCrop",
+    objectFit: "contain",
     clarity: clarity,
     rotateZ: rotateZ,
     scalable: scalable,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ray-js/ray-ipc-player",
-  "version": "2.0.1",
+  "version": "2.0.3-beta-1",
   "description": "ray小程序播放器",
   "keywords": [
     "tuya-panel",