Explorar el Código

Update TaggingAdImage.

sdk-team hace 3 años
padre
commit
eb40626c68
Se han modificado 30 ficheros con 461 adiciones y 41 borrados
  1. 1 1
      VERSION
  2. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/ClassifyingRubbishRequest.h
  3. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/DetectFruitsRequest.h
  4. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/DetectImageElementsRequest.h
  5. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/EvaluateCertificateQualityRequest.h
  6. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/GetAsyncJobResultRequest.h
  7. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/RecognizeFoodRequest.h
  8. 12 3
      imagerecog/include/alibabacloud/imagerecog/model/RecognizeImageColorRequest.h
  9. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/RecognizeLogoRequest.h
  10. 1 1
      imagerecog/include/alibabacloud/imagerecog/model/RecognizeLogoResult.h
  11. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/RecognizeVehicleTypeRequest.h
  12. 9 0
      imagerecog/include/alibabacloud/imagerecog/model/TaggingAdImageRequest.h
  13. 3 3
      imagerecog/src/ImagerecogClient.cc
  14. 33 0
      imagerecog/src/model/ClassifyingRubbishRequest.cc
  15. 2 2
      imagerecog/src/model/ClassifyingRubbishResult.cc
  16. 33 0
      imagerecog/src/model/DetectFruitsRequest.cc
  17. 2 2
      imagerecog/src/model/DetectFruitsResult.cc
  18. 33 0
      imagerecog/src/model/DetectImageElementsRequest.cc
  19. 4 4
      imagerecog/src/model/DetectImageElementsResult.cc
  20. 33 0
      imagerecog/src/model/EvaluateCertificateQualityRequest.cc
  21. 33 0
      imagerecog/src/model/GetAsyncJobResultRequest.cc
  22. 4 4
      imagerecog/src/model/GetAsyncJobResultResult.cc
  23. 33 0
      imagerecog/src/model/RecognizeFoodRequest.cc
  24. 38 5
      imagerecog/src/model/RecognizeImageColorRequest.cc
  25. 2 2
      imagerecog/src/model/RecognizeImageColorResult.cc
  26. 33 0
      imagerecog/src/model/RecognizeLogoRequest.cc
  27. 12 12
      imagerecog/src/model/RecognizeLogoResult.cc
  28. 33 0
      imagerecog/src/model/RecognizeVehicleTypeRequest.cc
  29. 2 2
      imagerecog/src/model/RecognizeVehicleTypeResult.cc
  30. 33 0
      imagerecog/src/model/TaggingAdImageRequest.cc

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.1302
+1.36.1303

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/ClassifyingRubbishRequest.h

@@ -35,10 +35,19 @@ namespace AlibabaCloud
 				ClassifyingRubbishRequest();
 				~ClassifyingRubbishRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string imageURL_;
 
 			};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/DetectFruitsRequest.h

@@ -35,10 +35,19 @@ namespace AlibabaCloud
 				DetectFruitsRequest();
 				~DetectFruitsRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string imageURL_;
 
 			};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/DetectImageElementsRequest.h

@@ -35,10 +35,19 @@ namespace AlibabaCloud
 				DetectImageElementsRequest();
 				~DetectImageElementsRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getUrl()const;
 				void setUrl(const std::string& url);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string url_;
 
 			};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/EvaluateCertificateQualityRequest.h

@@ -35,13 +35,22 @@ namespace AlibabaCloud
 				EvaluateCertificateQualityRequest();
 				~EvaluateCertificateQualityRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
 				std::string getType()const;
 				void setType(const std::string& type);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 
             private:
+				bool formatResultToJson_;
 				std::string type_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string imageURL_;
 
 			};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/GetAsyncJobResultRequest.h

@@ -35,13 +35,22 @@ namespace AlibabaCloud
 				GetAsyncJobResultRequest();
 				~GetAsyncJobResultRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
 				std::string getJobId()const;
 				void setJobId(const std::string& jobId);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getAsync()const;
 				void setAsync(const std::string& async);
 
             private:
+				bool formatResultToJson_;
 				std::string jobId_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string async_;
 
 			};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/RecognizeFoodRequest.h

@@ -35,10 +35,19 @@ namespace AlibabaCloud
 				RecognizeFoodRequest();
 				~RecognizeFoodRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string imageURL_;
 
 			};

+ 12 - 3
imagerecog/include/alibabacloud/imagerecog/model/RecognizeImageColorRequest.h

@@ -35,14 +35,23 @@ namespace AlibabaCloud
 				RecognizeImageColorRequest();
 				~RecognizeImageColorRequest();
 
-				std::string getUrl()const;
-				void setUrl(const std::string& url);
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
 				int getColorCount()const;
 				void setColorCount(int colorCount);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
+				std::string getUrl()const;
+				void setUrl(const std::string& url);
 
             private:
-				std::string url_;
+				bool formatResultToJson_;
 				int colorCount_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
+				std::string url_;
 
 			};
 		}

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/RecognizeLogoRequest.h

@@ -40,11 +40,20 @@ namespace AlibabaCloud
 				RecognizeLogoRequest();
 				~RecognizeLogoRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
 				std::vector<Tasks> getTasks()const;
 				void setTasks(const std::vector<Tasks>& tasks);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
 				std::vector<Tasks> tasks_;
+				std::string requestProxyBy_;
 
 			};
 		}

+ 1 - 1
imagerecog/include/alibabacloud/imagerecog/model/RecognizeLogoResult.h

@@ -42,8 +42,8 @@ namespace AlibabaCloud
 							{
 								std::string type;
 								float w;
-								float x;
 								float h;
+								float x;
 								float y;
 								std::string name;
 							};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/RecognizeVehicleTypeRequest.h

@@ -35,10 +35,19 @@ namespace AlibabaCloud
 				RecognizeVehicleTypeRequest();
 				~RecognizeVehicleTypeRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
+				std::string requestProxyBy_;
 				std::string imageURL_;
 
 			};

+ 9 - 0
imagerecog/include/alibabacloud/imagerecog/model/TaggingAdImageRequest.h

@@ -35,15 +35,24 @@ namespace AlibabaCloud
 				TaggingAdImageRequest();
 				~TaggingAdImageRequest();
 
+				bool getFormatResultToJson()const;
+				void setFormatResultToJson(bool formatResultToJson);
+				std::string getOssFile()const;
+				void setOssFile(const std::string& ossFile);
 				int getImageType()const;
 				void setImageType(int imageType);
+				std::string getRequestProxyBy()const;
+				void setRequestProxyBy(const std::string& requestProxyBy);
 				bool getAsync()const;
 				void setAsync(bool async);
 				std::string getImageURL()const;
 				void setImageURL(const std::string& imageURL);
 
             private:
+				bool formatResultToJson_;
+				std::string ossFile_;
 				int imageType_;
+				std::string requestProxyBy_;
 				bool async_;
 				std::string imageURL_;
 

+ 3 - 3
imagerecog/src/ImagerecogClient.cc

@@ -31,21 +31,21 @@ ImagerecogClient::ImagerecogClient(const Credentials &credentials, const ClientC
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(credentials), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentials, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "imagerecog");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ImagerecogClient::ImagerecogClient(const std::shared_ptr<CredentialsProvider>& credentialsProvider, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, credentialsProvider, configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(credentialsProvider, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "imagerecog");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ImagerecogClient::ImagerecogClient(const std::string & accessKeyId, const std::string & accessKeySecret, const ClientConfiguration & configuration) :
 	RpcServiceClient(SERVICE_NAME, std::make_shared<SimpleCredentialsProvider>(accessKeyId, accessKeySecret), configuration)
 {
 	auto locationClient = std::make_shared<LocationClient>(accessKeyId, accessKeySecret, configuration);
-	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "imagerecog");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ImagerecogClient::~ImagerecogClient()

+ 33 - 0
imagerecog/src/model/ClassifyingRubbishRequest.cc

@@ -27,6 +27,39 @@ ClassifyingRubbishRequest::ClassifyingRubbishRequest() :
 ClassifyingRubbishRequest::~ClassifyingRubbishRequest()
 {}
 
+bool ClassifyingRubbishRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void ClassifyingRubbishRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string ClassifyingRubbishRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void ClassifyingRubbishRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string ClassifyingRubbishRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void ClassifyingRubbishRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string ClassifyingRubbishRequest::getImageURL()const
 {
 	return imageURL_;

+ 2 - 2
imagerecog/src/model/ClassifyingRubbishResult.cc

@@ -46,14 +46,14 @@ void ClassifyingRubbishResult::parse(const std::string &payload)
 	for (auto dataNodeElementsElement : allElementsNode)
 	{
 		Data::Element elementObject;
-		if(!dataNodeElementsElement["Category"].isNull())
-			elementObject.category = dataNodeElementsElement["Category"].asString();
 		if(!dataNodeElementsElement["CategoryScore"].isNull())
 			elementObject.categoryScore = std::stof(dataNodeElementsElement["CategoryScore"].asString());
 		if(!dataNodeElementsElement["Rubbish"].isNull())
 			elementObject.rubbish = dataNodeElementsElement["Rubbish"].asString();
 		if(!dataNodeElementsElement["RubbishScore"].isNull())
 			elementObject.rubbishScore = std::stof(dataNodeElementsElement["RubbishScore"].asString());
+		if(!dataNodeElementsElement["Category"].isNull())
+			elementObject.category = dataNodeElementsElement["Category"].asString();
 		data_.elements.push_back(elementObject);
 	}
 

+ 33 - 0
imagerecog/src/model/DetectFruitsRequest.cc

@@ -27,6 +27,39 @@ DetectFruitsRequest::DetectFruitsRequest() :
 DetectFruitsRequest::~DetectFruitsRequest()
 {}
 
+bool DetectFruitsRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void DetectFruitsRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string DetectFruitsRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void DetectFruitsRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string DetectFruitsRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void DetectFruitsRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string DetectFruitsRequest::getImageURL()const
 {
 	return imageURL_;

+ 2 - 2
imagerecog/src/model/DetectFruitsResult.cc

@@ -44,10 +44,10 @@ void DetectFruitsResult::parse(const std::string &payload)
 	for (auto dataNodeElementsElement : allElementsNode)
 	{
 		Data::Element elementObject;
-		if(!dataNodeElementsElement["Name"].isNull())
-			elementObject.name = dataNodeElementsElement["Name"].asString();
 		if(!dataNodeElementsElement["Score"].isNull())
 			elementObject.score = std::stof(dataNodeElementsElement["Score"].asString());
+		if(!dataNodeElementsElement["Name"].isNull())
+			elementObject.name = dataNodeElementsElement["Name"].asString();
 		auto allBox = value["Box"]["Box"];
 		for (auto value : allBox)
 			elementObject.box.push_back(value.asString());

+ 33 - 0
imagerecog/src/model/DetectImageElementsRequest.cc

@@ -27,6 +27,39 @@ DetectImageElementsRequest::DetectImageElementsRequest() :
 DetectImageElementsRequest::~DetectImageElementsRequest()
 {}
 
+bool DetectImageElementsRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void DetectImageElementsRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string DetectImageElementsRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void DetectImageElementsRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string DetectImageElementsRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void DetectImageElementsRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string DetectImageElementsRequest::getUrl()const
 {
 	return url_;

+ 4 - 4
imagerecog/src/model/DetectImageElementsResult.cc

@@ -46,16 +46,16 @@ void DetectImageElementsResult::parse(const std::string &payload)
 		Data::Element elementObject;
 		if(!dataNodeElementsElement["Type"].isNull())
 			elementObject.type = dataNodeElementsElement["Type"].asString();
-		if(!dataNodeElementsElement["X"].isNull())
-			elementObject.x = std::stoi(dataNodeElementsElement["X"].asString());
-		if(!dataNodeElementsElement["Y"].isNull())
-			elementObject.y = std::stoi(dataNodeElementsElement["Y"].asString());
 		if(!dataNodeElementsElement["Width"].isNull())
 			elementObject.width = std::stoi(dataNodeElementsElement["Width"].asString());
 		if(!dataNodeElementsElement["Height"].isNull())
 			elementObject.height = std::stoi(dataNodeElementsElement["Height"].asString());
+		if(!dataNodeElementsElement["Y"].isNull())
+			elementObject.y = std::stoi(dataNodeElementsElement["Y"].asString());
 		if(!dataNodeElementsElement["Score"].isNull())
 			elementObject.score = std::stof(dataNodeElementsElement["Score"].asString());
+		if(!dataNodeElementsElement["X"].isNull())
+			elementObject.x = std::stoi(dataNodeElementsElement["X"].asString());
 		data_.elements.push_back(elementObject);
 	}
 

+ 33 - 0
imagerecog/src/model/EvaluateCertificateQualityRequest.cc

@@ -27,6 +27,17 @@ EvaluateCertificateQualityRequest::EvaluateCertificateQualityRequest() :
 EvaluateCertificateQualityRequest::~EvaluateCertificateQualityRequest()
 {}
 
+bool EvaluateCertificateQualityRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void EvaluateCertificateQualityRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
 std::string EvaluateCertificateQualityRequest::getType()const
 {
 	return type_;
@@ -38,6 +49,28 @@ void EvaluateCertificateQualityRequest::setType(const std::string& type)
 	setBodyParameter("Type", type);
 }
 
+std::string EvaluateCertificateQualityRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void EvaluateCertificateQualityRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string EvaluateCertificateQualityRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void EvaluateCertificateQualityRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string EvaluateCertificateQualityRequest::getImageURL()const
 {
 	return imageURL_;

+ 33 - 0
imagerecog/src/model/GetAsyncJobResultRequest.cc

@@ -27,6 +27,17 @@ GetAsyncJobResultRequest::GetAsyncJobResultRequest() :
 GetAsyncJobResultRequest::~GetAsyncJobResultRequest()
 {}
 
+bool GetAsyncJobResultRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void GetAsyncJobResultRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
 std::string GetAsyncJobResultRequest::getJobId()const
 {
 	return jobId_;
@@ -38,6 +49,28 @@ void GetAsyncJobResultRequest::setJobId(const std::string& jobId)
 	setParameter("JobId", jobId);
 }
 
+std::string GetAsyncJobResultRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void GetAsyncJobResultRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string GetAsyncJobResultRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void GetAsyncJobResultRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string GetAsyncJobResultRequest::getAsync()const
 {
 	return async_;

+ 4 - 4
imagerecog/src/model/GetAsyncJobResultResult.cc

@@ -42,14 +42,14 @@ void GetAsyncJobResultResult::parse(const std::string &payload)
 	auto dataNode = value["Data"];
 	if(!dataNode["Status"].isNull())
 		data_.status = dataNode["Status"].asString();
-	if(!dataNode["ErrorCode"].isNull())
-		data_.errorCode = dataNode["ErrorCode"].asString();
 	if(!dataNode["ErrorMessage"].isNull())
 		data_.errorMessage = dataNode["ErrorMessage"].asString();
-	if(!dataNode["JobId"].isNull())
-		data_.jobId = dataNode["JobId"].asString();
 	if(!dataNode["Result"].isNull())
 		data_.result = dataNode["Result"].asString();
+	if(!dataNode["ErrorCode"].isNull())
+		data_.errorCode = dataNode["ErrorCode"].asString();
+	if(!dataNode["JobId"].isNull())
+		data_.jobId = dataNode["JobId"].asString();
 
 }
 

+ 33 - 0
imagerecog/src/model/RecognizeFoodRequest.cc

@@ -27,6 +27,39 @@ RecognizeFoodRequest::RecognizeFoodRequest() :
 RecognizeFoodRequest::~RecognizeFoodRequest()
 {}
 
+bool RecognizeFoodRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void RecognizeFoodRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string RecognizeFoodRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void RecognizeFoodRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string RecognizeFoodRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void RecognizeFoodRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string RecognizeFoodRequest::getImageURL()const
 {
 	return imageURL_;

+ 38 - 5
imagerecog/src/model/RecognizeImageColorRequest.cc

@@ -27,15 +27,15 @@ RecognizeImageColorRequest::RecognizeImageColorRequest() :
 RecognizeImageColorRequest::~RecognizeImageColorRequest()
 {}
 
-std::string RecognizeImageColorRequest::getUrl()const
+bool RecognizeImageColorRequest::getFormatResultToJson()const
 {
-	return url_;
+	return formatResultToJson_;
 }
 
-void RecognizeImageColorRequest::setUrl(const std::string& url)
+void RecognizeImageColorRequest::setFormatResultToJson(bool formatResultToJson)
 {
-	url_ = url;
-	setBodyParameter("Url", url);
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
 }
 
 int RecognizeImageColorRequest::getColorCount()const
@@ -49,3 +49,36 @@ void RecognizeImageColorRequest::setColorCount(int colorCount)
 	setBodyParameter("ColorCount", std::to_string(colorCount));
 }
 
+std::string RecognizeImageColorRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void RecognizeImageColorRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string RecognizeImageColorRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void RecognizeImageColorRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
+std::string RecognizeImageColorRequest::getUrl()const
+{
+	return url_;
+}
+
+void RecognizeImageColorRequest::setUrl(const std::string& url)
+{
+	url_ = url;
+	setBodyParameter("Url", url);
+}
+

+ 2 - 2
imagerecog/src/model/RecognizeImageColorResult.cc

@@ -46,10 +46,10 @@ void RecognizeImageColorResult::parse(const std::string &payload)
 		Data::ColorTemplate colorTemplateObject;
 		if(!dataNodeColorTemplateListColorTemplate["Color"].isNull())
 			colorTemplateObject.color = dataNodeColorTemplateListColorTemplate["Color"].asString();
-		if(!dataNodeColorTemplateListColorTemplate["Label"].isNull())
-			colorTemplateObject.label = dataNodeColorTemplateListColorTemplate["Label"].asString();
 		if(!dataNodeColorTemplateListColorTemplate["Percentage"].isNull())
 			colorTemplateObject.percentage = std::stof(dataNodeColorTemplateListColorTemplate["Percentage"].asString());
+		if(!dataNodeColorTemplateListColorTemplate["Label"].isNull())
+			colorTemplateObject.label = dataNodeColorTemplateListColorTemplate["Label"].asString();
 		data_.colorTemplateList.push_back(colorTemplateObject);
 	}
 

+ 33 - 0
imagerecog/src/model/RecognizeLogoRequest.cc

@@ -27,6 +27,28 @@ RecognizeLogoRequest::RecognizeLogoRequest() :
 RecognizeLogoRequest::~RecognizeLogoRequest()
 {}
 
+bool RecognizeLogoRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void RecognizeLogoRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string RecognizeLogoRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void RecognizeLogoRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
 std::vector<RecognizeLogoRequest::Tasks> RecognizeLogoRequest::getTasks()const
 {
 	return tasks_;
@@ -42,3 +64,14 @@ void RecognizeLogoRequest::setTasks(const std::vector<Tasks>& tasks)
 	}
 }
 
+std::string RecognizeLogoRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void RecognizeLogoRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+

+ 12 - 12
imagerecog/src/model/RecognizeLogoResult.cc

@@ -44,36 +44,36 @@ void RecognizeLogoResult::parse(const std::string &payload)
 	for (auto dataNodeElementsElement : allElementsNode)
 	{
 		Data::Element elementObject;
-		if(!dataNodeElementsElement["TaskId"].isNull())
-			elementObject.taskId = dataNodeElementsElement["TaskId"].asString();
 		if(!dataNodeElementsElement["ImageURL"].isNull())
 			elementObject.imageURL = dataNodeElementsElement["ImageURL"].asString();
+		if(!dataNodeElementsElement["TaskId"].isNull())
+			elementObject.taskId = dataNodeElementsElement["TaskId"].asString();
 		auto allResultsNode = dataNodeElementsElement["Results"]["Result"];
 		for (auto dataNodeElementsElementResultsResult : allResultsNode)
 		{
 			Data::Element::Result resultsObject;
-			if(!dataNodeElementsElementResultsResult["Label"].isNull())
-				resultsObject.label = dataNodeElementsElementResultsResult["Label"].asString();
 			if(!dataNodeElementsElementResultsResult["Suggestion"].isNull())
 				resultsObject.suggestion = dataNodeElementsElementResultsResult["Suggestion"].asString();
+			if(!dataNodeElementsElementResultsResult["Label"].isNull())
+				resultsObject.label = dataNodeElementsElementResultsResult["Label"].asString();
 			if(!dataNodeElementsElementResultsResult["Rate"].isNull())
 				resultsObject.rate = std::stof(dataNodeElementsElementResultsResult["Rate"].asString());
 			auto allLogosDataNode = dataNodeElementsElementResultsResult["LogosData"]["LogoData"];
 			for (auto dataNodeElementsElementResultsResultLogosDataLogoData : allLogosDataNode)
 			{
 				Data::Element::Result::LogoData logosDataObject;
-				if(!dataNodeElementsElementResultsResultLogosDataLogoData["Name"].isNull())
-					logosDataObject.name = dataNodeElementsElementResultsResultLogosDataLogoData["Name"].asString();
 				if(!dataNodeElementsElementResultsResultLogosDataLogoData["Type"].isNull())
 					logosDataObject.type = dataNodeElementsElementResultsResultLogosDataLogoData["Type"].asString();
-				if(!dataNodeElementsElementResultsResultLogosDataLogoData["X"].isNull())
-					logosDataObject.x = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["X"].asString());
-				if(!dataNodeElementsElementResultsResultLogosDataLogoData["Y"].isNull())
-					logosDataObject.y = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["Y"].asString());
-				if(!dataNodeElementsElementResultsResultLogosDataLogoData["H"].isNull())
-					logosDataObject.h = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["H"].asString());
 				if(!dataNodeElementsElementResultsResultLogosDataLogoData["W"].isNull())
 					logosDataObject.w = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["W"].asString());
+				if(!dataNodeElementsElementResultsResultLogosDataLogoData["H"].isNull())
+					logosDataObject.h = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["H"].asString());
+				if(!dataNodeElementsElementResultsResultLogosDataLogoData["Y"].isNull())
+					logosDataObject.y = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["Y"].asString());
+				if(!dataNodeElementsElementResultsResultLogosDataLogoData["Name"].isNull())
+					logosDataObject.name = dataNodeElementsElementResultsResultLogosDataLogoData["Name"].asString();
+				if(!dataNodeElementsElementResultsResultLogosDataLogoData["X"].isNull())
+					logosDataObject.x = std::stof(dataNodeElementsElementResultsResultLogosDataLogoData["X"].asString());
 				resultsObject.logosData.push_back(logosDataObject);
 			}
 			elementObject.results.push_back(resultsObject);

+ 33 - 0
imagerecog/src/model/RecognizeVehicleTypeRequest.cc

@@ -27,6 +27,39 @@ RecognizeVehicleTypeRequest::RecognizeVehicleTypeRequest() :
 RecognizeVehicleTypeRequest::~RecognizeVehicleTypeRequest()
 {}
 
+bool RecognizeVehicleTypeRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void RecognizeVehicleTypeRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string RecognizeVehicleTypeRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void RecognizeVehicleTypeRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
+std::string RecognizeVehicleTypeRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void RecognizeVehicleTypeRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 std::string RecognizeVehicleTypeRequest::getImageURL()const
 {
 	return imageURL_;

+ 2 - 2
imagerecog/src/model/RecognizeVehicleTypeResult.cc

@@ -46,10 +46,10 @@ void RecognizeVehicleTypeResult::parse(const std::string &payload)
 	for (auto dataNodeElementsElement : allElementsNode)
 	{
 		Data::Element elementObject;
-		if(!dataNodeElementsElement["Name"].isNull())
-			elementObject.name = dataNodeElementsElement["Name"].asString();
 		if(!dataNodeElementsElement["Score"].isNull())
 			elementObject.score = std::stof(dataNodeElementsElement["Score"].asString());
+		if(!dataNodeElementsElement["Name"].isNull())
+			elementObject.name = dataNodeElementsElement["Name"].asString();
 		data_.elements.push_back(elementObject);
 	}
 

+ 33 - 0
imagerecog/src/model/TaggingAdImageRequest.cc

@@ -27,6 +27,28 @@ TaggingAdImageRequest::TaggingAdImageRequest() :
 TaggingAdImageRequest::~TaggingAdImageRequest()
 {}
 
+bool TaggingAdImageRequest::getFormatResultToJson()const
+{
+	return formatResultToJson_;
+}
+
+void TaggingAdImageRequest::setFormatResultToJson(bool formatResultToJson)
+{
+	formatResultToJson_ = formatResultToJson;
+	setParameter("FormatResultToJson", formatResultToJson ? "true" : "false");
+}
+
+std::string TaggingAdImageRequest::getOssFile()const
+{
+	return ossFile_;
+}
+
+void TaggingAdImageRequest::setOssFile(const std::string& ossFile)
+{
+	ossFile_ = ossFile;
+	setParameter("OssFile", ossFile);
+}
+
 int TaggingAdImageRequest::getImageType()const
 {
 	return imageType_;
@@ -38,6 +60,17 @@ void TaggingAdImageRequest::setImageType(int imageType)
 	setBodyParameter("ImageType", std::to_string(imageType));
 }
 
+std::string TaggingAdImageRequest::getRequestProxyBy()const
+{
+	return requestProxyBy_;
+}
+
+void TaggingAdImageRequest::setRequestProxyBy(const std::string& requestProxyBy)
+{
+	requestProxyBy_ = requestProxyBy;
+	setParameter("RequestProxyBy", requestProxyBy);
+}
+
 bool TaggingAdImageRequest::getAsync()const
 {
 	return async_;