yootd 0.2.3 → 0.2.5

package/dist/tree/index.scss

@@ -1,34 +1,34 @@
-.yot-tree {
-  position: relative;
-  overflow: auto;
-  height: 100%;
-  .ant-tree-node-content-wrapper.ant-tree-node-selected {
-    background-color: var(--ant-color-primary-bg);
-    .ant-tree-title {
-      color: var(--ant-color-primary);
-    }
-  }
-  .ant-tree-node-content-wrapper {
-    .ant-tree-title {
-      color: var(--ant-color-text-secondary);
-    }
-  }
-  &__icon {
-    margin-top: 2px;
-    &.yot-is-selected {
-      .path-1 {
-        stroke: var(--ant-color-primary);
-      }
-      .path-2,
-      .rect-1 {
-        fill: var(--ant-color-primary);
-      }
-    }
-  }
-  &__search {
-    position: sticky;
-    top: 0px;
-    z-index: 1;
-    margin-bottom: 10px;
-  }
-}
+.yot-tree {
+  position: relative;
+  overflow: auto;
+  height: 100%;
+  .ant-tree-node-content-wrapper.ant-tree-node-selected {
+    background-color: var(--ant-color-primary-bg);
+    .ant-tree-title {
+      color: var(--ant-color-primary);
+    }
+  }
+  .ant-tree-node-content-wrapper {
+    .ant-tree-title {
+      color: var(--ant-color-text-secondary);
+    }
+  }
+  &__icon {
+    margin-top: 2px;
+    &.yot-is-selected {
+      .path-1 {
+        stroke: var(--ant-color-primary);
+      }
+      .path-2,
+      .rect-1 {
+        fill: var(--ant-color-primary);
+      }
+    }
+  }
+  &__search {
+    position: sticky;
+    top: 0px;
+    z-index: 1;
+    margin-bottom: 10px;
+  }
+}

package/dist/upload/index.scss

@@ -1,115 +1,115 @@
-.yot-upload {
-  .ant-upload-list-item {
-    padding: 0;
-  }
-  .ant-upload-list-item.ant-upload-list-item-done {
-    .ant-upload-icon {
-      .anticon.anticon-paper-clip {
-        color: var(--ant-color-primary);
-      }
-    }
-  }
-  .ant-upload-list-item-name {
-    display: flex;
-    align-items: center;
-  }
-
-  &-file {
-    &-btn {
-      &__icon {
-        width: 16px;
-        height: 16px;
-      }
-      &:hover &{
-        &__icon {
-          .path-1 {
-            fill: var(--ant-color-primary);
-            width: 20px;
-          }
-        }
-      }
-    }
-  }
-  &__icon {
-    &--success {
-      width: 16px;
-      height: 16px;
-      position: absolute;
-      top: 0px;
-      right: 24px;
-    }
-    &--again {
-      width: 16px;
-      height: 16px;
-      position: absolute;
-      top: 0px;
-      right: 24px;
-    }
-    &--delete {
-      width: 16px;
-      height: 16px;
-      position: absolute;
-      top: 0px;
-      right: 2px;
-    }
-  }
-
-  &-image {
-    &-btn {
-      width: 100px;
-      height: 100px;
-      border-radius: 8px;
-      background-color: var(--ant-color-border-secondary);
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      flex-direction: column;
-      &__text {
-        font-size: 12px;
-        color: var(--ant-color-text-quaternary);
-        margin-top: 8px;
-      }
-    }
-  }
-  &-video {
-    &-content {
-      position: relative;
-      width: 102px;
-      height: 102px;
-      border-radius: 4px;
-      cursor: pointer;
-      padding: 8px;
-      box-sizing: border-box;
-      border: 1px solid var(--ant-color-border-secondary);
-      &__video {
-        width: 100%;
-        height: 100%;
-      }
-      &:hover &{
-        &-icon {
-          z-index: 10;
-          transition: all;
-          box-sizing: border-box;
-          position: absolute;
-          top: 8px;
-          left: 8px;
-          height: 86px;
-          width: 86px;
-          /* 这里的背景色根据需求设置 */
-          background: rgba(0, 0, 0, 0.6) !important;
-          background-color: #000;
-          filter: Alpha(Opacity=60);
-          opacity: 0.6;
-          &--delete {
-            width: 16px;
-            height: 16px;
-            position: absolute;
-            top: 36px;
-            left: 40%;
-            cursor: pointer;
-          }
-        }
-      }
-    }
-  }
-}
+.yot-upload {
+  .ant-upload-list-item {
+    padding: 0;
+  }
+  .ant-upload-list-item.ant-upload-list-item-done {
+    .ant-upload-icon {
+      .anticon.anticon-paper-clip {
+        color: var(--ant-color-primary);
+      }
+    }
+  }
+  .ant-upload-list-item-name {
+    display: flex;
+    align-items: center;
+  }
+
+  &-file {
+    &-btn {
+      &__icon {
+        width: 16px;
+        height: 16px;
+      }
+      &:hover &{
+        &__icon {
+          .path-1 {
+            fill: var(--ant-color-primary);
+            width: 20px;
+          }
+        }
+      }
+    }
+  }
+  &__icon {
+    &--success {
+      width: 16px;
+      height: 16px;
+      position: absolute;
+      top: 0px;
+      right: 24px;
+    }
+    &--again {
+      width: 16px;
+      height: 16px;
+      position: absolute;
+      top: 0px;
+      right: 24px;
+    }
+    &--delete {
+      width: 16px;
+      height: 16px;
+      position: absolute;
+      top: 0px;
+      right: 2px;
+    }
+  }
+
+  &-image {
+    &-btn {
+      width: 100px;
+      height: 100px;
+      border-radius: 8px;
+      background-color: var(--ant-color-border-secondary);
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+      &__text {
+        font-size: 12px;
+        color: var(--ant-color-text-quaternary);
+        margin-top: 8px;
+      }
+    }
+  }
+  &-video {
+    &-content {
+      position: relative;
+      width: 102px;
+      height: 102px;
+      border-radius: 4px;
+      cursor: pointer;
+      padding: 8px;
+      box-sizing: border-box;
+      border: 1px solid var(--ant-color-border-secondary);
+      &__video {
+        width: 100%;
+        height: 100%;
+      }
+      &:hover &{
+        &-icon {
+          z-index: 10;
+          transition: all;
+          box-sizing: border-box;
+          position: absolute;
+          top: 8px;
+          left: 8px;
+          height: 86px;
+          width: 86px;
+          /* 这里的背景色根据需求设置 */
+          background: rgba(0, 0, 0, 0.6) !important;
+          background-color: #000;
+          filter: Alpha(Opacity=60);
+          opacity: 0.6;
+          &--delete {
+            width: 16px;
+            height: 16px;
+            position: absolute;
+            top: 36px;
+            left: 40%;
+            cursor: pointer;
+          }
+        }
+      }
+    }
+  }
+}

package/dist/user-dropdown/types/types.d.ts

@@ -1,45 +1,45 @@
-import { SelectProps } from 'yootd';
-
-export interface PageData<T> {
-  content: T[];
-  page: {
-    number: number;
-    size: number;
-    totalElements: number;
-    totalPages: number;
-  };
-}
-type LabelOptions =
-  | 'uniqueNumber'
-  | 'personalName'
-  | 'majorName'
-  | 'collegeMajorName'
-  | 'className'
-  | 'gradeName'
-  | 'genderName'
-  | 'deptName'
-  | 'credentialsNo'
-  | 'personalMobile';
-export type UserDropdownProps = SelectProps & {
-  type?: number; // 1:学生2:教师3:职工
-  label?: LabelOptions[];
-  connectors?: string;
-  teacher_id?: number;
-};
-export interface IuserItem {
-  userId: string; // ID
-  uniqueNumber?: string; // 学号/工号
-  personalName: string; // 姓名
-  personalPhoto?: string; // 照片
-  userFaceType?: number; // 人脸类型(1白名单2黑名单3红名单)
-  majorName?: string; // 专业名称
-  collegeMajorName?: string; // 院系名称
-  className?: string; // 班级名称
-  gradeName?: string; // 年级名称
-  genderName?: string; // 性别
-  deptId?: number; // 部门ID
-  deptName?: string; // 部门名称
-  gender?: number; // 性别
-  credentialsNo?: string; // 证件号
-  personalMobile?: string; // 手机号
-}
+import { SelectProps } from 'yootd';
+
+export interface PageData<T> {
+  content: T[];
+  page: {
+    number: number;
+    size: number;
+    totalElements: number;
+    totalPages: number;
+  };
+}
+type LabelOptions =
+  | 'uniqueNumber'
+  | 'personalName'
+  | 'majorName'
+  | 'collegeMajorName'
+  | 'className'
+  | 'gradeName'
+  | 'genderName'
+  | 'deptName'
+  | 'credentialsNo'
+  | 'personalMobile';
+export type UserDropdownProps = SelectProps & {
+  type?: number; // 1:学生2:教师3:职工
+  label?: LabelOptions[];
+  connectors?: string;
+  teacher_id?: number;
+};
+export interface IuserItem {
+  userId: string; // ID
+  uniqueNumber?: string; // 学号/工号
+  personalName: string; // 姓名
+  personalPhoto?: string; // 照片
+  userFaceType?: number; // 人脸类型(1白名单2黑名单3红名单)
+  majorName?: string; // 专业名称
+  collegeMajorName?: string; // 院系名称
+  className?: string; // 班级名称
+  gradeName?: string; // 年级名称
+  genderName?: string; // 性别
+  deptId?: number; // 部门ID
+  deptName?: string; // 部门名称
+  gender?: number; // 性别
+  credentialsNo?: string; // 证件号
+  personalMobile?: string; // 手机号
+}

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) {