@cloud-app-dev/vidc 3.1.14 → 3.1.16

package/es/ScreenPlayer/Live.js

@@ -158,7 +158,7 @@ function LivePlayer(_a) {
     var _a;
 
     return /*#__PURE__*/React.createElement(LivePlayerWithExt, Object.assign({}, item, {
-      mode: (_a = item.mode) !== null && _a !== void 0 ? _a : state.modes[index],
+      mode: (_a = state.modes[index]) !== null && _a !== void 0 ? _a : item.mode,
       key: "".concat(item.url, "-").concat(index),
       updatePlayer: function updatePlayer(player) {
         return playerRef.current[index] = player;

package/es/ScreenPlayer/LiveTools.js

@@ -26,7 +26,8 @@ function LiveTools(_ref) {
       updateState = _ref.updateState,
       screenNum = _ref.screenNum,
       getPlayerItem = _ref.getPlayerItem,
-      mode = _ref.mode,
+      _ref$mode = _ref.mode,
+      mode = _ref$mode === void 0 ? 1 : _ref$mode,
       toggleFit = _ref.toggleFit,
       fit = _ref.fit,
       onClose = _ref.onClose,
@@ -99,6 +100,9 @@ function LiveTools(_ref) {
   }, /*#__PURE__*/React.createElement(IconFont, {
     type: "lm-player-S_Device_shezhi",
     className: "icon-chajian",
+    style: mode === 2 ? {
+      color: 'var(--primary)'
+    } : null,
     title: "\u5207\u6362".concat(mode === 1 ? '插件' : '浏览器', "\u6A21\u5F0F")
   })), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-item",

package/es/ScreenPlayer/Record.js

@@ -432,7 +432,7 @@ function RecordPlayer(_a) {
         width: screenType.width,
         height: screenType.height
       },
-      mode: (_d = item.mode) !== null && _d !== void 0 ? _d : state.modes[index],
+      mode: (_d = state.modes[index]) !== null && _d !== void 0 ? _d : item.mode,
       fps: fps,
       fpsDelay: fpsDelay,
       httpLoading: state.winLoadingStatus[index]
@@ -449,7 +449,7 @@ function RecordPlayer(_a) {
           });
         });
       },
-      mode: (_f = item.mode) !== null && _f !== void 0 ? _f : state.modes[index],
+      mode: (_f = state.modes[index]) !== null && _f !== void 0 ? _f : item.mode,
       key: "".concat((_g = item === null || item === void 0 ? void 0 : item.date) !== null && _g !== void 0 ? _g : '', "-").concat((_h = item.cid) !== null && _h !== void 0 ? _h : '', "-").concat(index),
       style: {
         width: screenType.width,

package/es/ScreenPlayer/RecordTools.js

@@ -31,7 +31,8 @@ function RecordTools(_ref) {
       screenNum = _ref.screenNum,
       timeMode = _ref.timeMode,
       getPlayerItem = _ref.getPlayerItem,
-      mode = _ref.mode,
+      _ref$mode = _ref.mode,
+      mode = _ref$mode === void 0 ? 1 : _ref$mode,
       toggleFit = _ref.toggleFit,
       fit = _ref.fit,
       time = _ref.time,

package/es/ScreenPlayer/demo2.js

@@ -27,20 +27,28 @@ import { __rest } from "tslib";
 import React, { useMemo, useState } from 'react';
 import RecordPlayer from './Record';
 import moment from 'moment';
-import Service from '../Service';
 import { completionSegments } from './utils';
-var token = "eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2NTc0ODU1OTg5MSwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2NTQ4OTM1OTg5MX0.zxxxxoaKjyO6CJhi2cs06gTOtjdLgPA9UI7zAQ0zzss";
 var cids = ['538509097', '539172446'];
 
 var query = function query(_a) {
-  // return new Promise((reslove) => {
-  //   setTimeout(() => reslove([]), 2000);
-  // });
   var cid = _a.cid,
       date = _a.date,
       recordType = _a.recordType,
       props = __rest(_a, ["cid", "date", "recordType"]);
 
+  var json = {
+    code: 0,
+    codeRemark: '操作成功',
+    data: [{
+      begin: 1666627615,
+      end: 1666697789,
+      play_url: 'http://192.168.2.63:18092/flv/vod/2834d2b1be2ca7056_1/1bd7e2db944e0c87f.flv?origin_url=sdk%3A%2F%2Fadmin%3Alingyang123%40192.168.2.200%3A8000%2Fcam%2Fplayback%3Ffactory%3Dhikvision%26channel%3D1%26subType%3D0%26startTime%3D1666627615%26endTime%3D1666697789'
+    }, {
+      begin: 1666697792,
+      end: 1666713420,
+      play_url: 'http://192.168.2.63:18092/flv/vod/2834d2b1be2ca7056_1/1a151c645418ceec0.flv?origin_url=sdk%3A%2F%2Fadmin%3Alingyang123%40192.168.2.200%3A8000%2Fcam%2Fplayback%3Ffactory%3Dhikvision%26channel%3D1%26subType%3D0%26startTime%3D1666697792%26endTime%3D1666713420'
+    }]
+  };
   console.log(cid, date, recordType, props);
   var m = moment(date);
   var beginTime = m.set({
@@ -53,40 +61,13 @@ var query = function query(_a) {
     minutes: 59,
     seconds: 59
   }).unix();
-  var promise = recordType === 2 ? Service.http({
-    url: '/api/staticResource/v1/localRecord/url',
-    data: {
-      cid: cid,
-      beginTime: beginTime,
-      endTime: endTime
-    },
-    method: 'post',
-    headers: {
-      Authorization: token
-    }
-  }).then(function (res) {
-    return res.data.map(function (v) {
-      return {
-        url: v.play_url,
-        beginTime: v.begin,
-        endTime: v.end
-      };
-    });
-  }) : Service.http({
-    url: "/api/staticResource/v2/video/queryHistoryAddress?Authorization=".concat(token),
-    data: {
-      cid: cid,
-      beginTime: beginTime,
-      endTime: endTime,
-      mediaType: 'hls'
-    },
-    method: 'post',
-    headers: {
-      Authorization: token
-    }
-  }).then(function (res) {
-    return res.data;
-  });
+  var promise = Promise.resolve(json.data.map(function (v) {
+    return {
+      url: v.play_url,
+      beginTime: v.begin,
+      endTime: v.end
+    };
+  }));
   return promise.then(function (res) {
     return completionSegments(beginTime, endTime, res).map(function (v) {
       return Object.assign(Object.assign({}, v), {
@@ -120,7 +101,11 @@ export default function App() {
   console.log(state.list);
   return /*#__PURE__*/React.createElement(_ConfigProvider, {
     prefixCls: "cloudapp"
-  }, /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement(_DatePicker, {
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%'
+    }
+  }, /*#__PURE__*/React.createElement(_DatePicker, {
     value: value,
     onChange: function onChange(v) {
       var flag = state.idx % 2 === 0;
@@ -144,8 +129,9 @@ export default function App() {
     }
   }), /*#__PURE__*/React.createElement("div", {
     style: {
-      minWidth: 1200,
-      height: 800
+      minWidth: 900,
+      height: 800,
+      width: '100%'
     }
   }, /*#__PURE__*/React.createElement(RecordPlayer, {
     list: state.list,

package/es/ScreenPlayer/useTimeSlider.js

@@ -308,7 +308,7 @@ function useTimeSlider(canvasRef, _ref2) {
       state.hover.time && drawHoverLine();
     } // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  }, [canvas, state.begin, state.currentTime, state.hoursPer, segments, state.hover]);
+  }, [canvas, state.begin, state.currentTime, state.hoursPer, segments, state.hover, size]);
 
   _useUpdateEffect(function () {
     return update({

package/es/ScreenPlayer/utils.d.ts

@@ -26,4 +26,4 @@ export declare function differenceWithIndexs(arr1: any[], arr2: any[]): {
  * @param end
  * @param segments
  */
-export declare function completionSegments(start: number, end: number, segments: ISegmentType[]): ISegmentType[];
+export declare const completionSegments: (start: number, end: number, segments: ISegmentType[]) => ISegmentType[];

package/es/ScreenPlayer/utils.js

@@ -66,20 +66,20 @@ export function differenceWithIndexs(arr1, arr2) {
  * @param segments
  */
 
-export function completionSegments(start, end, segments) {
+export var completionSegments = function completionSegments(start, end, segments) {
   var arr = [];
 
   if (segments.length > 0 && start < +segments[0].beginTime) {
     arr.push({
       beginTime: start,
-      endTime: +segments[0].beginTime - start
+      endTime: +segments[0].beginTime
     });
   }
 
   segments.reduce(function (prev, current, idx) {
-    if (arr.length === 0) {
+    if (arr.length === 0 && idx === 0) {
       prev.push(current);
-    } else if (segments[idx - 1].endTime !== current.beginTime) {
+    } else if (idx > 0 && segments[idx - 1].endTime !== current.beginTime) {
       prev.push({
         beginTime: segments[idx - 1].endTime,
         endTime: current.beginTime
@@ -99,4 +99,4 @@ export function completionSegments(start, end, segments) {
   }
 
   return arr;
-}
+};

package/package.json

@@ -2,19 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.1.14",
-  "scripts": {
-    "start": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "npm run entry && father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage",
-    "entry": "node ./scripts/entry.js"
-  },
+  "version": "3.1.16",
   "main": "es/index.js",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -75,5 +63,17 @@
     "url": "git+http://git.topvdn.com/cloudapp/vidc.git",
     "branch": "master",
     "platform": "github"
+  },
+  "scripts": {
+    "start": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "npm run entry && father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage",
+    "entry": "node ./scripts/entry.js"
   }
-}
+}