From 5913d9cfae97f9b15721c4facf9ceb8749da350e Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期二, 25 六月 2019 13:52:08 +0800
Subject: [PATCH] 占比乘以100

---
 ruleserver/ruleToformula.go |    1 +
 main.go                     |   36 ++++++++++++++++++------------------
 ruleserver/geoPolygon.go    |    2 +-
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/main.go b/main.go
index e148dff..8579e29 100644
--- a/main.go
+++ b/main.go
@@ -103,24 +103,24 @@
 			}
 
 		}
-		//if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
-		//	fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
-		//	if len(sdkinfo.Sdkdata) > 1 {
-		//		fmt.Println("----------------------------------------------------",m.Caddr)
-		//		faceParam := protomsg.ParamFacePos{}
-		//		err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
-		//		if err != nil {
-		//			fmt.Println("瑙f瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
-		//			continue
-		//		}
-		//		for _, info := range faceParam.Faces {
-		//			photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
-		//			arg.Photo = append(arg.Photo, photoMap)
-		//		}
-		//	} else {
-		//		continue
-		//	}
-		//}
+		if sdkinfo.Sdktype == "FaceDetect" { // 浜鸿劯妫�娴�
+			fmt.Println("鏁版嵁闀垮害涓猴細", len(sdkinfo.Sdkdata))
+			if len(sdkinfo.Sdkdata) > 1 {
+				fmt.Println("----------------------------------------------------",m.Caddr)
+				faceParam := protomsg.ParamFacePos{}
+				err = proto.Unmarshal(sdkinfo.Sdkdata, &faceParam)
+				if err != nil {
+					fmt.Println("瑙f瀽FACE sdk鏁版嵁鏃跺嚭鐜伴敊璇�", err)
+					continue
+				}
+				for _, info := range faceParam.Faces {
+					photoMap := ruleserver.PhotoMap{Rects: ruleserver.Rect{-1, -1, -1, -1}, Score: float64(info.Pos.Quality)}
+					arg.Photo = append(arg.Photo, photoMap)
+				}
+			} else {
+				continue
+			}
+		}
 		//if sdkinfo.Sdktype == "FaceExtract" { // 浜鸿劯鎻愬彇
 
 		//}
diff --git a/ruleserver/geoPolygon.go b/ruleserver/geoPolygon.go
index 0fe02db..97b2908 100644
--- a/ruleserver/geoPolygon.go
+++ b/ruleserver/geoPolygon.go
@@ -122,5 +122,5 @@
 	if perInterBox > perInterPg {
 		return perInterBox
 	}
-	return perInterPg
+	return perInterPg*100
 }
diff --git a/ruleserver/ruleToformula.go b/ruleserver/ruleToformula.go
index a49ba6c..820432a 100644
--- a/ruleserver/ruleToformula.go
+++ b/ruleserver/ruleToformula.go
@@ -509,6 +509,7 @@
 				return "false"
 			}
 		} else if rule.SdkId == "FaceCompare"{
+			// 鍙渶瑕佽繃婊ら槇鍊硷紝杩囨护瀹屽悗鏁扮粍闀垮害澶т簬0鍗充负鎶ヨ锛屼絾濡備綍瀵规瘡涓�寮犻兘鎶ヨ鍛�
 
 		}
 

--
Gitblit v1.8.0