yootd 0.2.4 → 0.2.5

package/dist/video-player/index.js

@@ -13,9 +13,11 @@ import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useRef,
 import { EndPoint } from 'yootd-webrtc-sdk';
 import { useBem } from "../hooks/useBem";
 import "./index.scss";
+import { useQuery } from '@tanstack/react-query';
 import { throttle } from 'lodash';
 import { Spin } from "./..";
 import { useOSS } from "../hooks/useOSS";
+import { useRequest } from "../hooks/useRequest";
 import controlBottomBg from "./assets/control-background.png";
 var PROGRESS_BAR_HEIGHT = 63;
 var MIN_SCORE = 0.5; // minimum score
@@ -60,6 +62,7 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
   var poseCanvasRef = useRef(null);
   var detectAllFacesRef = useRef();
   var getAdjacentPairsRef = useRef();
+  var request = useRequest();
   var _useState = useState(null),
     _useState2 = _slicedToArray(_useState, 2),
     poseDetector = _useState2[0],
@@ -163,6 +166,13 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
     _useState46 = _slicedToArray(_useState45, 2),
     features = _useState46[0],
     setFeatures = _useState46[1];
+  var _useQuery = useQuery({
+      queryKey: ['config'],
+      queryFn: function queryFn() {
+        return request.get('/v1/education/analysis/analyse/instance/config');
+      }
+    }),
+    configData = _useQuery.data;
   useImperativeHandle(ref, function () {
     return {
       play: function play() {
@@ -371,8 +381,32 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
     var _iterator = _createForOfIteratorHelper(detections),
       _step;
     try {
-      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _loop = function _loop() {
         var person = _step.value;
+        var emotionConfigMap = {
+          neutral: 'calm',
+          happy: 'happy',
+          sad: 'depressed',
+          angry: 'angry',
+          fearful: 'dread',
+          disgusted: 'detest',
+          surprised: 'surprised'
+        };
+        var expression = Object.entries(person.expressions).sort(function (a, b) {
+          return b[1] - a[1];
+        });
+        if ((configData === null || configData === void 0 ? void 0 : configData.content) != null && configData.content.length > 0) {
+          var _configData$content$f;
+          var threshold = (_configData$content$f = configData.content.find(function (item) {
+            return item.configKey === emotionConfigMap[expression[0][0]];
+          })) === null || _configData$content$f === void 0 ? void 0 : _configData$content$f.threshold;
+          if (threshold != null) {
+            if (Math.round(100 * expression[0][1]) < threshold) {
+              return 1; // continue
+            }
+          }
+        }
+
         // draw box around each face
         ctx.lineWidth = 3;
         ctx.strokeStyle = '#7aff00';
@@ -383,9 +417,6 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
         ctx.stroke();
         ctx.globalAlpha = 1;
         // draw text labels
-        var expression = Object.entries(person.expressions).sort(function (a, b) {
-          return b[1] - a[1];
-        });
         ctx.fillStyle = 'black';
         // if (faceFeature.character) {
         //   ctx.fillText(
@@ -419,6 +450,15 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
           male: '男',
           female: '女'
         };
+        /* neutral: 'calm',
+          happy: 'happy',
+          sad: 'depressed',
+          angry: 'angry',
+          fearful: 'dread',
+          disgusted: 'detest',
+          surprised: 'surprised',
+        */
+
         var emotionMap = {
           neutral: '平静',
           happy: '开心',
@@ -460,13 +500,16 @@ export var VideoPlayer = /*#__PURE__*/forwardRef(function (_ref, ref) {
             ctx.fill();
           }
         }
+      };
+      for (_iterator.s(); !(_step = _iterator.n()).done;) {
+        if (_loop()) continue;
       }
     } catch (err) {
       _iterator.e(err);
     } finally {
       _iterator.f();
     }
-  }, []);
+  }, [configData]);
   var detectFaces = useCallback(function () {
     return new Promise(function (resolve, reject) {
       if (videoRef.current != null && detectAllFacesRef.current != null && options != null && faceApiInitialized) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yootd",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "基于 Antd 二次开发的组件库",
   "license": "MIT",
   "module": "dist/index.js",