@cloud-app-dev/vidc 3.1.11 → 3.1.13

package/es/Player/single_player.js

@@ -227,6 +227,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     hideTimeProgress: !!customTimeLine,
     oneFpsPlay: oneFpsPlay
   };
+  var hasApiEventInit = api && event;
   return /*#__PURE__*/React.createElement(Provider, {
     api: playApi,
     event: event,
@@ -243,20 +244,20 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       objectFit: fit,
       visibility: state.isFpsPlay ? 'hidden' : 'unset'
     }
-  })), api && event && hasLink && state.isFpsPlay ? /*#__PURE__*/React.createElement(FPSPlay, {
+  })), hasApiEventInit && hasLink && state.isFpsPlay ? /*#__PURE__*/React.createElement(FPSPlay, {
     fps: fps,
     event: event,
     api: playApi,
     fpsDelay: fpsDelay
-  }) : /*#__PURE__*/React.createElement(Empty, null)), api && event && hasLink ? /*#__PURE__*/React.createElement(VideoMessage, {
+  }) : /*#__PURE__*/React.createElement(Empty, null)), hasApiEventInit && hasLink ? /*#__PURE__*/React.createElement(VideoMessage, {
     api: playApi,
     event: event
-  }) : /*#__PURE__*/React.createElement(Empty, null), api && event && hasLink && !hideContrallerBar ? /*#__PURE__*/React.createElement(ContrallerEvent, {
+  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/React.createElement(ContrallerEvent, {
     children: /*#__PURE__*/React.createElement(ContrallerBar, Object.assign({}, contrallerProps))
-  }) : /*#__PURE__*/React.createElement(Empty, null), customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, {
+  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, {
     api: playApi,
     event: event
-  }) : /*#__PURE__*/React.createElement(Empty, null), children));
+  }) : /*#__PURE__*/React.createElement(Empty, null) : /*#__PURE__*/React.createElement(Empty, null), children));
 });
 
 function Empty() {

package/es/Player/timeline.js

@@ -15,6 +15,8 @@ import useBarStatus from './contraller_bar/useBarStatus';
 import { useVideoEvent } from './event';
 import "./style/timeline.css";
 export function useTimes(api, event, isFpsPlay) {
+  console.log(api, event);
+
   var _useState = useState({
     currentTime: 0,
     buffered: 0

package/es/PlayerExt/index.css

@@ -8,6 +8,3 @@
   align-items: center;
   justify-content: center;
 }
-.lm-player-ext-layout .lm-player-iconfont {
-  font-size: 66px;
-}

package/es/PlayerExt/index.d.ts

@@ -1,10 +1,8 @@
 /// <reference types="react" />
-import { ISegmentType } from '../Player/player';
 import './index.less';
 export declare type PlayModeType = 1 | 2;
 export interface IPluginProps {
     url?: string;
-    segments?: ISegmentType[];
     children: JSX.Element;
     /**
      * @description 模式1浏览器模式，2插件模式
@@ -44,5 +42,5 @@ export declare function getLocalPlayPath(url: string, params?: string): string;
 export declare function usePlugin(mode: PlayModeType, key: any): {
     needInstall: boolean;
 };
-export declare function ExtModel({ url, children, mode, pluginDownloadUrl, segments, pluginParams, loading }: IPluginProps): JSX.Element;
+export declare function ExtModel({ url, children, mode, pluginDownloadUrl, pluginParams, loading }: IPluginProps): JSX.Element;
 export { ExtModel as default };

package/es/PlayerExt/index.js

@@ -73,14 +73,73 @@ export function usePlugin(mode, key) {
     }, [state.installed, mode])
   };
 }
-export function ExtModel(_ref) {
-  var url = _ref.url,
-      children = _ref.children,
-      mode = _ref.mode,
-      pluginDownloadUrl = _ref.pluginDownloadUrl,
-      segments = _ref.segments,
-      pluginParams = _ref.pluginParams,
-      loading = _ref.loading;
+
+function NeedInstallPlugin(_ref) {
+  var pluginDownloadUrl = _ref.pluginDownloadUrl,
+      retry = _ref.retry;
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lm-player-ext-layout"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: -60,
+      textAlign: 'center'
+    }
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-PlaySource",
+    style: {
+      fontSize: 66
+    }
+  })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u8BF7", /*#__PURE__*/React.createElement("a", {
+    target: "_blank",
+    href: pluginDownloadUrl,
+    style: {
+      textDecoration: 'none',
+      padding: '0 4px'
+    },
+    download: "PlayerPlugin.exe",
+    rel: "noopener noreferrer"
+  }, "\u4E0B\u8F7D"), "\u64AD\u653E\u63D2\u4EF6\uFF0C"), /*#__PURE__*/React.createElement("span", null, "\u82E5\u5DF2\u5B89\u88C5\u8BF7\u70B9\u51FB", /*#__PURE__*/React.createElement("a", {
+    style: {
+      padding: '0 4px'
+    },
+    onClick: retry
+  }, "\u91CD\u8BD5")))));
+}
+
+function Loading() {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lm-player-ext-layout"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      marginTop: -60,
+      textAlign: 'center'
+    }
+  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-PlaySource",
+    style: {
+      fontSize: 66
+    }
+  })), /*#__PURE__*/React.createElement("div", null, "\u6B63\u5728\u83B7\u53D6\u89C6\u9891\u6570\u636E\uFF0C\u8BF7\u7A0D\u7B49...")));
+}
+
+function Empty() {
+  return /*#__PURE__*/React.createElement("div", {
+    className: "lm-player-ext-layout"
+  }, /*#__PURE__*/React.createElement(IconFont, {
+    type: "lm-player-PlaySource",
+    style: {
+      fontSize: 66
+    }
+  }));
+}
+
+export function ExtModel(_ref2) {
+  var url = _ref2.url,
+      children = _ref2.children,
+      mode = _ref2.mode,
+      pluginDownloadUrl = _ref2.pluginDownloadUrl,
+      pluginParams = _ref2.pluginParams,
+      loading = _ref2.loading;
 
   var _useState3 = useState({
     forceKey: Date.now()
@@ -90,10 +149,8 @@ export function ExtModel(_ref) {
       setState = _useState4[1];
 
   var hasUrl = useMemo(function () {
-    return !!url || Array.isArray(segments) && segments.find(function (v) {
-      return v.url;
-    });
-  }, [url, segments]);
+    return !!url;
+  }, [url]);
 
   var _usePlugin = usePlugin(mode, state.forceKey),
       needInstall = _usePlugin.needInstall; // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -102,75 +159,32 @@ export function ExtModel(_ref) {
   var playUrl = useMemo(function () {
     return mode === 2 && url ? getLocalPlayPath(url, pluginParams) : url;
   }, [url, mode]);
-  var playSegments = useMemo(function () {
-    return mode === 2 && segments ? segments.map(function (v) {
-      return Object.assign(Object.assign({}, v), {
-        url: v.url ? getLocalPlayPath(v.url, pluginParams) : v.url
-      });
-    }) : segments;
-  }, // eslint-disable-next-line react-hooks/exhaustive-deps
-  [segments, mode]);
 
   if (needInstall) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "lm-player-ext-layout"
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        marginTop: -60,
-        textAlign: 'center'
-      }
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
-      type: "lm-player-PlaySource"
-    })), /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("span", null, "\u8BF7", /*#__PURE__*/React.createElement("a", {
-      target: "_blank",
-      href: pluginDownloadUrl,
-      style: {
-        textDecoration: 'none',
-        padding: '0 4px'
-      },
-      download: "PlayerPlugin.exe",
-      rel: "noopener noreferrer"
-    }, "\u4E0B\u8F7D"), "\u64AD\u653E\u63D2\u4EF6\uFF0C"), /*#__PURE__*/React.createElement("span", null, "\u82E5\u5DF2\u5B89\u88C5\u8BF7\u70B9\u51FB", /*#__PURE__*/React.createElement("a", {
-      style: {
-        padding: '0 4px'
-      },
-      onClick: function onClick() {
+    return /*#__PURE__*/React.createElement(NeedInstallPlugin, {
+      pluginDownloadUrl: pluginDownloadUrl,
+      retry: function retry() {
         return setState(function (old) {
           return Object.assign(Object.assign({}, old), {
             forceKey: Date.now()
           });
         });
       }
-    }, "\u91CD\u8BD5")))));
+    });
   }
 
   if (loading) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "lm-player-ext-layout"
-    }, /*#__PURE__*/React.createElement("div", {
-      style: {
-        marginTop: -60,
-        textAlign: 'center'
-      }
-    }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(IconFont, {
-      type: "lm-player-PlaySource"
-    })), /*#__PURE__*/React.createElement("div", null, "\u6B63\u5728\u83B7\u53D6\u89C6\u9891\u6570\u636E\uFF0C\u8BF7\u7A0D\u7B49...")));
+    return /*#__PURE__*/React.createElement(Loading, null);
   }
 
   if (!hasUrl) {
-    return /*#__PURE__*/React.createElement("div", {
-      className: "lm-player-ext-layout"
-    }, /*#__PURE__*/React.createElement(IconFont, {
-      type: "lm-player-PlaySource"
-    }));
+    return /*#__PURE__*/React.createElement(Empty, null);
   }
 
   return /*#__PURE__*/React.createElement("div", {
     className: "lm-player-ext-layout"
-  }, /*#__PURE__*/React.cloneElement(children, url ? {
+  }, /*#__PURE__*/React.cloneElement(children, {
     url: playUrl
-  } : {
-    segments: playSegments
   }));
 }
 export { ExtModel as default };

package/es/ScreenPlayer/PlayerWithExt.js

@@ -100,8 +100,7 @@ export function SegmentPlayerWithExt(_a) {
     onClick: onClick,
     onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
-    segments: segments,
-    mode: mode,
+    mode: 1,
     loading: httpLoading
   }, /*#__PURE__*/React.createElement(SegmentPlayer, Object.assign({}, props, {
     segments: segments,
@@ -144,10 +143,18 @@ export function FrontendPlayerWithExt(_ref) {
       return undefined;
     }
 
-    var _ref2 = [segments[0].beginTime, segments[segments.length - 1].endTime],
+    var index = segments.findIndex(function (v) {
+      return !!v.url;
+    });
+
+    if (index === -1) {
+      return undefined;
+    }
+
+    var _ref2 = [segments[index].beginTime, segments[segments.length - 1].endTime],
         begin = _ref2[0],
         end = _ref2[1];
-    var videoUrl = new URL(segments[0].url);
+    var videoUrl = new URL(segments[index].url);
     var url;
 
     if (getLocalRecordUrl) {
@@ -227,7 +234,7 @@ export function FrontendPlayerWithExt(_ref) {
     onClick: onClick,
     onDoubleClick: toggleFullscreen
   }, /*#__PURE__*/React.createElement(ExtModel, {
-    segments: segments,
+    url: state.url,
     mode: mode,
     pluginDownloadUrl: pluginDownloadUrl,
     loading: httpLoading

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.1.11",
+  "version": "3.1.13",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",