From efbc613a523324b49b536f9c657be11ac9f9ce28 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期二, 14 三月 2023 10:57:27 +0800
Subject: [PATCH] 人脸识别增值版接入

---
 src/main/java/com/whyc/util/FaceIdentifyUtil.java |   57 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/src/main/java/com/whyc/util/FaceIdentifyUtil.java b/src/main/java/com/whyc/util/FaceIdentifyUtil.java
index 1632ef9..8c41152 100644
--- a/src/main/java/com/whyc/util/FaceIdentifyUtil.java
+++ b/src/main/java/com/whyc/util/FaceIdentifyUtil.java
@@ -25,6 +25,7 @@
         String appId="";
         String sdkKey="";
         String activeKey = YamlProperties.activeKey;
+        Integer faceType = YamlProperties.faceType;
         FaceEngine faceEngine =null;
 
         /*//浠庡畼缃戞垜鐨勫簲鐢ㄤ腑鑾峰彇
@@ -46,31 +47,43 @@
         String realPath = CommonUtil.classesPath();
         System.out.println("========realPath=========:"+realPath);
         System.out.println("========faceEngine dll 璺緞=========:"+realPath+ File.separator+"lib"+File.separator+"WIN64");
-        //鍒ゆ柇鏄粈涔堢郴缁�
+        //FaceEngine鑾峰彇,鍒ゆ柇鏄粈涔堢郴缁熷拰浠�涔堢増鏈�
         if(System.getProperty("os.name").toLowerCase().contains("window")){
-            appId=appId4Win;
-            sdkKey=sdkKey4Win;
-            faceEngine = new FaceEngine(realPath+ File.separator+"lib"+File.separator+"WIN64");
-
+            appId = appId4Win;
+            sdkKey = sdkKey4Win;
+            if(faceType == 1 //鍏嶈垂鐗�
+            ) {
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "WIN64");
+            }else{ //浠樿垂鐗堟案涔�
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "WIN64PRO");
+            }
 
         }else{
             appId=appId4Linux;
             sdkKey=sdkKey4Linux;
-            faceEngine = new FaceEngine(realPath+ File.separator+"WEB-INF"+File.separator+"lib"+File.separator+"LINUX64");
+            if(faceType == 1 //鍏嶈垂鐗�
+            ) {
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "LINUX64");
+            }else{ //浠樿垂鐗堟案涔�
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "LINUX64PRO");
+            }
         }
         //婵�娲诲紩鎿�,鍙渶涓�娆″氨琛�,鍚庣画鏃犻渶鍐嶆縺娲�
         int errorCode = 666;
-        //闇�瑕佸厤璐圭増鐨勪緷璧栧寘鎵嶈兘璋冪敤
-        if(activeType == 1){
-            errorCode = faceEngine.activeOnline(appId, sdkKey);
-        }
-        //闇�瑕佸鍊肩増鐨勪緷璧栧寘鎵嶈兘璋冪敤
-        /*else if(activeType == 11){
+        /**========闇�瑕佸厤璐圭増鐨勪緷璧栧寘鎵嶈兘璋冪敤 Start========*/
+        errorCode = faceEngine.activeOnline(appId, sdkKey);
+        /**========闇�瑕佸厤璐圭増鐨勪緷璧栧寘鎵嶈兘璋冪敤 End========*/
+
+
+        /**========闇�瑕佸鍊肩増鐨勪緷璧栧寘鎵嶈兘璋冪敤 Start========*/
+        /*if(activeType == 1){ //鍦ㄧ嚎婵�娲�
             errorCode = faceEngine.activeOnline(appId,sdkKey,activeKey);
-        }else if(activeType == 12){
-            //绂荤嚎.dat鏂囦欢鍦ㄦ湇鍔″櫒鎸囧畾鐨凜鐩樹笅鍗冲彲
-            errorCode = faceEngine.activeOffline("C:\\"+activeKey+".dat");
+        }else if(activeType == 2){ //绂荤嚎婵�娲�
+            //鍏堟湇鍔″櫒鐢熸垚绂荤嚎鎺堟潈鏂囦欢,绂荤嚎.dat鏂囦欢鏀惧湪 lib涓嬪嵆鍙�
+            errorCode = faceEngine.activeOffline(realPath + File.separator + "lib" + File.separator + activeKey+".dat");
         }*/
+        /**========闇�瑕佸鍊肩増鐨勪緷璧栧寘鎵嶈兘璋冪敤 End========*/
+
         if (errorCode != ErrorInfo.MOK.getValue() && errorCode != ErrorInfo.MERR_ASF_ALREADY_ACTIVATED.getValue()) {
             //婵�娲诲け璐�
         }else{
@@ -85,9 +98,19 @@
         FaceEngine faceEngine=null;
         String realPath = CommonUtil.classesPath();
         if(System.getProperty("os.name").toLowerCase().contains("window")) {
-            faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "WIN64");
+            if(YamlProperties.faceType == 1 //鍏嶈垂鐗�
+            ) {
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "WIN64");
+            }else{ //浠樿垂鐗堟案涔�
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "WIN64PRO");
+            }
         }else{
-            faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "LINUX64");
+            if(YamlProperties.faceType == 1 //鍏嶈垂鐗�
+            ) {
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "LINUX64");
+            }else{ //浠樿垂鐗堟案涔�
+                faceEngine = new FaceEngine(realPath + File.separator + "lib" + File.separator + "LINUX64PRO");
+            }
         }
         //寮曟搸閰嶇疆
         EngineConfiguration engineConfiguration = new EngineConfiguration();

--
Gitblit v1.9.1