Sfoglia il codice sorgente

Update RecognizeFace.

sdk-team 5 anni fa
parent
commit
0a9554513b

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-04-29 Version: 1.36.705
+- Update RecognizeFace.
+
 2021-04-29 Version: 1.36.704
 - Support sag reseller.
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.704
+1.36.705

File diff suppressed because it is too large
+ 0 - 0
facebody/2019-12-30/ExtractPedestrianFeatureAttr.xml


File diff suppressed because it is too large
+ 0 - 0
facebody/2019-12-30/RecognizeFace.xml


+ 6 - 0
facebody/include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttrResult.h

@@ -40,7 +40,9 @@ namespace AlibabaCloud
 					std::string lowerColor;
 					float qualityScore;
 					std::string gender;
+					std::string orientation;
 					std::string feature;
+					float orientationScore;
 					float upperColorScore;
 					float genderScore;
 					float lowerColorScore;
@@ -58,12 +60,16 @@ namespace AlibabaCloud
 				ExtractPedestrianFeatureAttrResult();
 				explicit ExtractPedestrianFeatureAttrResult(const std::string &payload);
 				~ExtractPedestrianFeatureAttrResult();
+				std::string getMessage()const;
 				Data getData()const;
+				std::string getCode()const;
 
 			protected:
 				void parse(const std::string &payload);
 			private:
+				std::string message_;
 				Data data_;
+				std::string code_;
 
 			};
 		}

+ 2 - 1
facebody/include/alibabacloud/facebody/model/RecognizeFaceResult.h

@@ -45,10 +45,11 @@ namespace AlibabaCloud
 						std::vector<std::string> poseList1;
 						std::vector<std::string> illuList;
 					};
-					std::vector<std::string> beuatyList;
+					std::vector<std::string> beautyList;
 					std::vector<std::string> faceRectangles;
 					Qualities qualities;
 					int denseFeatureLength;
+					std::vector<std::string> masks;
 					std::vector<std::string> poseList;
 					std::vector<std::string> genderList;
 					std::vector<std::string> pupils;

+ 18 - 0
facebody/src/model/ExtractPedestrianFeatureAttrResult.cc

@@ -52,8 +52,12 @@ void ExtractPedestrianFeatureAttrResult::parse(const std::string &payload)
 		data_.qualityScore = std::stof(dataNode["QualityScore"].asString());
 	if(!dataNode["Gender"].isNull())
 		data_.gender = dataNode["Gender"].asString();
+	if(!dataNode["Orientation"].isNull())
+		data_.orientation = dataNode["Orientation"].asString();
 	if(!dataNode["Feature"].isNull())
 		data_.feature = dataNode["Feature"].asString();
+	if(!dataNode["OrientationScore"].isNull())
+		data_.orientationScore = std::stof(dataNode["OrientationScore"].asString());
 	if(!dataNode["UpperColorScore"].isNull())
 		data_.upperColorScore = std::stof(dataNode["UpperColorScore"].asString());
 	if(!dataNode["GenderScore"].isNull())
@@ -76,11 +80,25 @@ void ExtractPedestrianFeatureAttrResult::parse(const std::string &payload)
 		data_.objTypeScore = std::stof(dataNode["ObjTypeScore"].asString());
 	if(!dataNode["Age"].isNull())
 		data_.age = dataNode["Age"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
 
 }
 
+std::string ExtractPedestrianFeatureAttrResult::getMessage()const
+{
+	return message_;
+}
+
 ExtractPedestrianFeatureAttrResult::Data ExtractPedestrianFeatureAttrResult::getData()const
 {
 	return data_;
 }
 
+std::string ExtractPedestrianFeatureAttrResult::getCode()const
+{
+	return code_;
+}
+

+ 6 - 3
facebody/src/model/RecognizeFaceResult.cc

@@ -77,15 +77,15 @@ void RecognizeFaceResult::parse(const std::string &payload)
 		auto allFaceProbabilityList = dataNode["FaceProbabilityList"]["FaceProbability"];
 		for (auto value : allFaceProbabilityList)
 			data_.faceProbabilityList.push_back(value.asString());
+		auto allBeautyList = dataNode["BeautyList"]["Beauty"];
+		for (auto value : allBeautyList)
+			data_.beautyList.push_back(value.asString());
 		auto allHatList = dataNode["HatList"]["Hat"];
 		for (auto value : allHatList)
 			data_.hatList.push_back(value.asString());
 		auto allAgeList = dataNode["AgeList"]["Age"];
 		for (auto value : allAgeList)
 			data_.ageList.push_back(value.asString());
-		auto allBeuatyList = dataNode["BeuatyList"]["Beauty"];
-		for (auto value : allBeuatyList)
-			data_.beuatyList.push_back(value.asString());
 		auto allFaceRectangles = dataNode["FaceRectangles"]["FaceRectangle"];
 		for (auto value : allFaceRectangles)
 			data_.faceRectangles.push_back(value.asString());
@@ -98,6 +98,9 @@ void RecognizeFaceResult::parse(const std::string &payload)
 		auto allExpressions = dataNode["Expressions"]["Expression"];
 		for (auto value : allExpressions)
 			data_.expressions.push_back(value.asString());
+		auto allMasks = dataNode["Masks"]["Mask"];
+		for (auto value : allMasks)
+			data_.masks.push_back(value.asString());
 		auto allPoseList = dataNode["PoseList"]["Pose"];
 		for (auto value : allPoseList)
 			data_.poseList.push_back(value.asString());

Some files were not shown because too many files changed in this diff