sdk-team 5 лет назад
Родитель
Сommit
75b14a0c8b

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2021-03-11 Version: patch
+- Update DetectIPCPedestrian.
+
 2021-03-10 Version: patch
 - Generated 2020-05-18 for `dataworks-public`.
 

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/CompareFace.xml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/DetectIPCPedestrian.xml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/DetectLivingFace.xml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/RecognizeAction.xml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/RecognizePublicFace.xml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/SwapFacialFeatures.xml


Разница между файлами не показана из-за своего большого размера
+ 0 - 0
facebody/2019-12-30/VerifyFaceMask.xml


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

@@ -35,6 +35,10 @@ namespace AlibabaCloud
 				CompareFaceRequest();
 				~CompareFaceRequest();
 
+				std::string getImageDataA()const;
+				void setImageDataA(const std::string& imageDataA);
+				std::string getImageDataB()const;
+				void setImageDataB(const std::string& imageDataB);
 				float getQualityScoreThreshold()const;
 				void setQualityScoreThreshold(float qualityScoreThreshold);
 				std::string getImageURLB()const;
@@ -45,6 +49,8 @@ namespace AlibabaCloud
 				void setImageType(int imageType);
 
             private:
+				std::string imageDataA_;
+				std::string imageDataB_;
 				float qualityScoreThreshold_;
 				std::string imageURLB_;
 				std::string imageURLA_;

+ 12 - 15
facebody/include/alibabacloud/facebody/model/DetectIPCPedestrianRequest.h

@@ -30,34 +30,31 @@ namespace AlibabaCloud
 		{
 			class ALIBABACLOUD_FACEBODY_EXPORT DetectIPCPedestrianRequest : public RpcServiceRequest
 			{
-			public:
-				struct URLList
-				{
-					std::string dataId;
-					std::string imageURL;
-				};
 
 			public:
 				DetectIPCPedestrianRequest();
 				~DetectIPCPedestrianRequest();
 
-				std::string getImageData()const;
-				void setImageData(const std::string& imageData);
-				std::vector<URLList> getURLList()const;
-				void setURLList(const std::vector<URLList>& uRLList);
 				bool getContinueOnError()const;
 				void setContinueOnError(bool continueOnError);
-				int getWidth()const;
-				void setWidth(int width);
 				int getHeight()const;
 				void setHeight(int height);
+				std::string getImageData()const;
+				void setImageData(const std::string& imageData);
+				std::string getDataId()const;
+				void setDataId(const std::string& dataId);
+				std::string getImageURL()const;
+				void setImageURL(const std::string& imageURL);
+				int getWidth()const;
+				void setWidth(int width);
 
             private:
-				std::string imageData_;
-				std::vector<URLList> uRLList_;
 				bool continueOnError_;
-				int width_;
 				int height_;
+				std::string imageData_;
+				std::string dataId_;
+				std::string imageURL_;
+				int width_;
 
 			};
 		}

+ 7 - 3
facebody/include/alibabacloud/facebody/model/RecognizeActionRequest.h

@@ -33,6 +33,7 @@ namespace AlibabaCloud
 			public:
 				struct URLList
 				{
+					std::string imageData;
 					std::string uRL;
 				};
 
@@ -40,16 +41,19 @@ namespace AlibabaCloud
 				RecognizeActionRequest();
 				~RecognizeActionRequest();
 
-				std::vector<URLList> getURLList()const;
-				void setURLList(const std::vector<URLList>& uRLList);
 				int getType()const;
 				void setType(int type);
+				std::string getVideoData()const;
+				void setVideoData(const std::string& videoData);
+				std::vector<URLList> getURLList()const;
+				void setURLList(const std::vector<URLList>& uRLList);
 				std::string getVideoUrl()const;
 				void setVideoUrl(const std::string& videoUrl);
 
             private:
-				std::vector<URLList> uRLList_;
 				int type_;
+				std::string videoData_;
+				std::vector<URLList> uRLList_;
 				std::string videoUrl_;
 
 			};

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

@@ -37,14 +37,20 @@ namespace AlibabaCloud
 
 				std::string getTargetImageURL()const;
 				void setTargetImageURL(const std::string& targetImageURL);
+				std::string getSourceImageData()const;
+				void setSourceImageData(const std::string& sourceImageData);
 				std::string getSourceImageURL()const;
 				void setSourceImageURL(const std::string& sourceImageURL);
+				std::string getTargetImageData()const;
+				void setTargetImageData(const std::string& targetImageData);
 				std::string getEditPart()const;
 				void setEditPart(const std::string& editPart);
 
             private:
 				std::string targetImageURL_;
+				std::string sourceImageData_;
 				std::string sourceImageURL_;
+				std::string targetImageData_;
 				std::string editPart_;
 
 			};

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

@@ -35,12 +35,18 @@ namespace AlibabaCloud
 				VerifyFaceMaskRequest();
 				~VerifyFaceMaskRequest();
 
+				std::string getRefData()const;
+				void setRefData(const std::string& refData);
+				std::string getImageData()const;
+				void setImageData(const std::string& imageData);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 				std::string getRefUrl()const;
 				void setRefUrl(const std::string& refUrl);
 
             private:
+				std::string refData_;
+				std::string imageData_;
 				std::string imageURL_;
 				std::string refUrl_;
 

+ 22 - 0
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_;

+ 32 - 26
facebody/src/model/DetectIPCPedestrianRequest.cc

@@ -27,6 +27,28 @@ DetectIPCPedestrianRequest::DetectIPCPedestrianRequest() :
 DetectIPCPedestrianRequest::~DetectIPCPedestrianRequest()
 {}
 
+bool DetectIPCPedestrianRequest::getContinueOnError()const
+{
+	return continueOnError_;
+}
+
+void DetectIPCPedestrianRequest::setContinueOnError(bool continueOnError)
+{
+	continueOnError_ = continueOnError;
+	setBodyParameter("ContinueOnError", continueOnError ? "true" : "false");
+}
+
+int DetectIPCPedestrianRequest::getHeight()const
+{
+	return height_;
+}
+
+void DetectIPCPedestrianRequest::setHeight(int height)
+{
+	height_ = height;
+	setBodyParameter("Height", std::to_string(height));
+}
+
 std::string DetectIPCPedestrianRequest::getImageData()const
 {
 	return imageData_;
@@ -38,31 +60,26 @@ void DetectIPCPedestrianRequest::setImageData(const std::string& imageData)
 	setBodyParameter("ImageData", imageData);
 }
 
-std::vector<DetectIPCPedestrianRequest::URLList> DetectIPCPedestrianRequest::getURLList()const
+std::string DetectIPCPedestrianRequest::getDataId()const
 {
-	return uRLList_;
+	return dataId_;
 }
 
-void DetectIPCPedestrianRequest::setURLList(const std::vector<URLList>& uRLList)
+void DetectIPCPedestrianRequest::setDataId(const std::string& dataId)
 {
-	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);
-	}
+	dataId_ = dataId;
+	setBodyParameter("DataId", dataId);
 }
 
-bool DetectIPCPedestrianRequest::getContinueOnError()const
+std::string DetectIPCPedestrianRequest::getImageURL()const
 {
-	return continueOnError_;
+	return imageURL_;
 }
 
-void DetectIPCPedestrianRequest::setContinueOnError(bool continueOnError)
+void DetectIPCPedestrianRequest::setImageURL(const std::string& imageURL)
 {
-	continueOnError_ = continueOnError;
-	setBodyParameter("ContinueOnError", continueOnError ? "true" : "false");
+	imageURL_ = imageURL;
+	setBodyParameter("ImageURL", imageURL);
 }
 
 int DetectIPCPedestrianRequest::getWidth()const
@@ -76,14 +93,3 @@ void DetectIPCPedestrianRequest::setWidth(int width)
 	setBodyParameter("Width", std::to_string(width));
 }
 
-int DetectIPCPedestrianRequest::getHeight()const
-{
-	return height_;
-}
-
-void DetectIPCPedestrianRequest::setHeight(int height)
-{
-	height_ = height;
-	setBodyParameter("Height", std::to_string(height));
-}
-

+ 2 - 2
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)
 		{

+ 23 - 11
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_;

+ 22 - 0
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_;

+ 22 - 0
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_;

+ 3 - 3
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());
 
 }
 

Некоторые файлы не были показаны из-за большого количества измененных файлов