Эх сурвалжийг харах

more easy to change models path

Michael Wang 6 жил өмнө
parent
commit
ab57e2a39d

+ 0 - 0
public/models/face_landmark_68_model-shard1 → public/models/20190620/face_landmark_68_model-shard1


+ 0 - 0
public/models/face_landmark_68_model-weights_manifest.json → public/models/20190620/face_landmark_68_model-weights_manifest.json


+ 0 - 0
public/models/tiny_face_detector_model-shard1 → public/models/20190620/tiny_face_detector_model-shard1


+ 0 - 0
public/models/tiny_face_detector_model-weights_manifest.json → public/models/20190620/tiny_face_detector_model-weights_manifest.json


+ 1 - 0
src/constants/constants.js

@@ -5,3 +5,4 @@ export const TK_SERVER_API_URL = process.env.VUE_APP_TK_SERVER_API_URL;
 export const VUE_APP_WK_SERVER_SOCKET = process.env.VUE_APP_WK_SERVER_SOCKET;
 export const VUE_APP_WK_SERVER_SOCKET_FOR_AUDIO =
   process.env.VUE_APP_WK_SERVER_SOCKET_FOR_AUDIO;
+export const FACE_API_MODEL_PATH = "/models/20190620/";

+ 5 - 2
src/features/Login/Login.vue

@@ -104,6 +104,7 @@
 <script>
 import moment from "moment";
 import { mapMutations } from "vuex";
+import { FACE_API_MODEL_PATH } from "@/constants/constants";
 /**
  * 在任何组件需要强制退出,做以下步骤
  * 1. this.$Message.info()
@@ -159,8 +160,10 @@ export default {
       location.reload(true);
     }
     // manual precache for models
-    fetch("/models/tiny_face_detector_model-weights_manifest.json");
-    fetch("/models/face_landmark_68_model-weights_manifest.json");
+    fetch(
+      FACE_API_MODEL_PATH + "tiny_face_detector_model-weights_manifest.json"
+    );
+    fetch(FACE_API_MODEL_PATH + "face_landmark_68_model-weights_manifest.json");
     // alread precached
     // fetch("/models/tiny_face_detector_model-shard1");
     // fetch("/models/face_landmark_68_model-shard1");

+ 3 - 5
src/features/OnlineExam/Examing/FaceTracking.vue

@@ -4,9 +4,7 @@
 
 <script>
 import * as faceapi from "face-api.js";
-
-// models path
-const modelsPath = "/models/";
+import { FACE_API_MODEL_PATH } from "@/constants/constants";
 
 function getFaceDetectorOptions() {
   window.____hideMe =
@@ -24,9 +22,9 @@ const detectTimeArray = [];
 export default {
   name: "FaceTracking",
   async created() {
-    await faceapi.nets.tinyFaceDetector.load(modelsPath);
+    await faceapi.nets.tinyFaceDetector.load(FACE_API_MODEL_PATH);
     // faceapi.nets.faceRecognitionNet.load(modelsPath);
-    await faceapi.loadFaceLandmarkModel(modelsPath);
+    await faceapi.loadFaceLandmarkModel(FACE_API_MODEL_PATH);
     faceapi.tf.ENV.set("WEBGL_PACK", false);
   },
   async mounted() {

+ 1 - 1
vue.config.js

@@ -123,7 +123,7 @@ module.exports = {
           },
         },
         {
-          urlPattern: /\/models\/.*\.json/,
+          urlPattern: /\/models\/.*\/.*\.json/,
           handler: "cacheFirst",
           options: {
             cacheableResponse: {