Update DetectIPCPedestrian.

facebody/src/model/CompareFaceRequest.cc

@@ -27,6 +27,28 @@ CompareFaceRequest::CompareFaceRequest() :
 CompareFaceRequest::~CompareFaceRequest()
 {}
 
+std::string CompareFaceRequest::getImageDataA()const
+{
+	return imageDataA_;
+}
+
+void CompareFaceRequest::setImageDataA(const std::string& imageDataA)
+{
+	imageDataA_ = imageDataA;
+	setBodyParameter("ImageDataA", imageDataA);
+}
+
+std::string CompareFaceRequest::getImageDataB()const
+{
+	return imageDataB_;
+}
+
+void CompareFaceRequest::setImageDataB(const std::string& imageDataB)
+{
+	imageDataB_ = imageDataB;
+	setBodyParameter("ImageDataB", imageDataB);
+}
+
 float CompareFaceRequest::getQualityScoreThreshold()const
 {
 	return qualityScoreThreshold_;

facebody/src/model/DetectIPCPedestrianRequest.cc

@@ -27,33 +27,6 @@ DetectIPCPedestrianRequest::DetectIPCPedestrianRequest() :
 DetectIPCPedestrianRequest::~DetectIPCPedestrianRequest()
 {}
 
-std::string DetectIPCPedestrianRequest::getImageData()const
-{
-	return imageData_;
-}
-
-void DetectIPCPedestrianRequest::setImageData(const std::string& imageData)
-{
-	imageData_ = imageData;
-	setBodyParameter("ImageData", imageData);
-}
-
-std::vector<DetectIPCPedestrianRequest::URLList> DetectIPCPedestrianRequest::getURLList()const
-{
-	return uRLList_;
-}
-
-void DetectIPCPedestrianRequest::setURLList(const std::vector<URLList>& uRLList)
-{
-	uRLList_ = uRLList;
-	for(int dep1 = 0; dep1!= uRLList.size(); dep1++) {
-		auto uRLListObj = uRLList.at(dep1);
-		std::string uRLListObjStr = "URLList." + std::to_string(dep1 + 1);
-		setParameter(uRLListObjStr + ".DataId", uRLListObj.dataId);
-		setParameter(uRLListObjStr + ".ImageURL", uRLListObj.imageURL);
-	}
-}
-
 bool DetectIPCPedestrianRequest::getContinueOnError()const
 {
 	return continueOnError_;
@@ -65,17 +38,6 @@ void DetectIPCPedestrianRequest::setContinueOnError(bool continueOnError)
 	setBodyParameter("ContinueOnError", continueOnError ? "true" : "false");
 }
 
-int DetectIPCPedestrianRequest::getWidth()const
-{
-	return width_;
-}
-
-void DetectIPCPedestrianRequest::setWidth(int width)
-{
-	width_ = width;
-	setBodyParameter("Width", std::to_string(width));
-}
-
 int DetectIPCPedestrianRequest::getHeight()const
 {
 	return height_;
@@ -87,3 +49,47 @@ void DetectIPCPedestrianRequest::setHeight(int height)
 	setBodyParameter("Height", std::to_string(height));
 }
 
+std::string DetectIPCPedestrianRequest::getImageData()const
+{
+	return imageData_;
+}
+
+void DetectIPCPedestrianRequest::setImageData(const std::string& imageData)
+{
+	imageData_ = imageData;
+	setBodyParameter("ImageData", imageData);
+}
+
+std::string DetectIPCPedestrianRequest::getDataId()const
+{
+	return dataId_;
+}
+
+void DetectIPCPedestrianRequest::setDataId(const std::string& dataId)
+{
+	dataId_ = dataId;
+	setBodyParameter("DataId", dataId);
+}
+
+std::string DetectIPCPedestrianRequest::getImageURL()const
+{
+	return imageURL_;
+}
+
+void DetectIPCPedestrianRequest::setImageURL(const std::string& imageURL)
+{
+	imageURL_ = imageURL;
+	setBodyParameter("ImageURL", imageURL);
+}
+
+int DetectIPCPedestrianRequest::getWidth()const
+{
+	return width_;
+}
+
+void DetectIPCPedestrianRequest::setWidth(int width)
+{
+	width_ = width;
+	setBodyParameter("Width", std::to_string(width));
+}
+

facebody/src/model/DetectIPCPedestrianResult.cc

@@ -44,12 +44,12 @@ void DetectIPCPedestrianResult::parse(const std::string &payload)
 	for (auto dataNodeImageInfoListImageInfoListItem : allImageInfoListNode)
 	{
 		Data::ImageInfoListItem imageInfoListItemObject;
+		if(!dataNodeImageInfoListImageInfoListItem["DataId"].isNull())
+			imageInfoListItemObject.dataId = dataNodeImageInfoListImageInfoListItem["DataId"].asString();
 		if(!dataNodeImageInfoListImageInfoListItem["ErrorCode"].isNull())
 			imageInfoListItemObject.errorCode = dataNodeImageInfoListImageInfoListItem["ErrorCode"].asString();
 		if(!dataNodeImageInfoListImageInfoListItem["ErrorMessage"].isNull())
 			imageInfoListItemObject.errorMessage = dataNodeImageInfoListImageInfoListItem["ErrorMessage"].asString();
-		if(!dataNodeImageInfoListImageInfoListItem["DataId"].isNull())
-			imageInfoListItemObject.dataId = dataNodeImageInfoListImageInfoListItem["DataId"].asString();
 		auto allElementsNode = dataNodeImageInfoListImageInfoListItem["Elements"]["Element"];
 		for (auto dataNodeImageInfoListImageInfoListItemElementsElement : allElementsNode)
 		{

facebody/src/model/RecognizeActionRequest.cc

@@ -27,6 +27,28 @@ RecognizeActionRequest::RecognizeActionRequest() :
 RecognizeActionRequest::~RecognizeActionRequest()
 {}
 
+int RecognizeActionRequest::getType()const
+{
+	return type_;
+}
+
+void RecognizeActionRequest::setType(int type)
+{
+	type_ = type;
+	setBodyParameter("Type", std::to_string(type));
+}
+
+std::string RecognizeActionRequest::getVideoData()const
+{
+	return videoData_;
+}
+
+void RecognizeActionRequest::setVideoData(const std::string& videoData)
+{
+	videoData_ = videoData;
+	setBodyParameter("VideoData", videoData);
+}
+
 std::vector<RecognizeActionRequest::URLList> RecognizeActionRequest::getURLList()const
 {
 	return uRLList_;
@@ -38,21 +60,11 @@ void RecognizeActionRequest::setURLList(const std::vector<URLList>& uRLList)
 	for(int dep1 = 0; dep1!= uRLList.size(); dep1++) {
 		auto uRLListObj = uRLList.at(dep1);
 		std::string uRLListObjStr = "URLList." + std::to_string(dep1 + 1);
+		setParameter(uRLListObjStr + ".ImageData", uRLListObj.imageData);
 		setParameter(uRLListObjStr + ".URL", uRLListObj.uRL);
 	}
 }
 
-int RecognizeActionRequest::getType()const
-{
-	return type_;
-}
-
-void RecognizeActionRequest::setType(int type)
-{
-	type_ = type;
-	setBodyParameter("Type", std::to_string(type));
-}
-
 std::string RecognizeActionRequest::getVideoUrl()const
 {
 	return videoUrl_;

facebody/src/model/SwapFacialFeaturesRequest.cc

@@ -38,6 +38,17 @@ void SwapFacialFeaturesRequest::setTargetImageURL(const std::string& targetImage
 	setBodyParameter("TargetImageURL", targetImageURL);
 }
 
+std::string SwapFacialFeaturesRequest::getSourceImageData()const
+{
+	return sourceImageData_;
+}
+
+void SwapFacialFeaturesRequest::setSourceImageData(const std::string& sourceImageData)
+{
+	sourceImageData_ = sourceImageData;
+	setBodyParameter("SourceImageData", sourceImageData);
+}
+
 std::string SwapFacialFeaturesRequest::getSourceImageURL()const
 {
 	return sourceImageURL_;
@@ -49,6 +60,17 @@ void SwapFacialFeaturesRequest::setSourceImageURL(const std::string& sourceImage
 	setBodyParameter("SourceImageURL", sourceImageURL);
 }
 
+std::string SwapFacialFeaturesRequest::getTargetImageData()const
+{
+	return targetImageData_;
+}
+
+void SwapFacialFeaturesRequest::setTargetImageData(const std::string& targetImageData)
+{
+	targetImageData_ = targetImageData;
+	setBodyParameter("TargetImageData", targetImageData);
+}
+
 std::string SwapFacialFeaturesRequest::getEditPart()const
 {
 	return editPart_;

facebody/src/model/VerifyFaceMaskRequest.cc

@@ -27,6 +27,28 @@ VerifyFaceMaskRequest::VerifyFaceMaskRequest() :
 VerifyFaceMaskRequest::~VerifyFaceMaskRequest()
 {}
 
+std::string VerifyFaceMaskRequest::getRefData()const
+{
+	return refData_;
+}
+
+void VerifyFaceMaskRequest::setRefData(const std::string& refData)
+{
+	refData_ = refData;
+	setBodyParameter("RefData", refData);
+}
+
+std::string VerifyFaceMaskRequest::getImageData()const
+{
+	return imageData_;
+}
+
+void VerifyFaceMaskRequest::setImageData(const std::string& imageData)
+{
+	imageData_ = imageData;
+	setBodyParameter("ImageData", imageData);
+}
+
 std::string VerifyFaceMaskRequest::getImageURL()const
 {
 	return imageURL_;

facebody/src/model/VerifyFaceMaskResult.cc

@@ -46,15 +46,15 @@ void VerifyFaceMaskResult::parse(const std::string &payload)
 		data_.mask = std::stoi(dataNode["Mask"].asString());
 	if(!dataNode["MaskRef"].isNull())
 		data_.maskRef = std::stoi(dataNode["MaskRef"].asString());
+		auto allThresholds = dataNode["Thresholds"]["Thresholds"];
+		for (auto value : allThresholds)
+			data_.thresholds.push_back(value.asString());
 		auto allRectangle = dataNode["Rectangle"]["Rectangle"];
 		for (auto value : allRectangle)
 			data_.rectangle.push_back(value.asString());
 		auto allRectangleRef = dataNode["RectangleRef"]["RectangleRef"];
 		for (auto value : allRectangleRef)
 			data_.rectangleRef.push_back(value.asString());
-		auto allThresholds = dataNode["Thresholds"]["Thresholds"];
-		for (auto value : allThresholds)
-			data_.thresholds.push_back(value.asString());
 
 }