Procházet zdrojové kódy

Supported Video Abstract for IMM.

sdk-team před 7 roky
rodič
revize
a744629799

+ 3 - 0
CHANGELOG

@@ -1,3 +1,6 @@
+2019-09-19 Version 1.36.141
+- Supported Video Abstract for IMM.
+
 2019-09-19 Version 1.36.140
 2019-09-19 Version 1.36.140
 - Generated 2018-01-20 for `Iot`.
 - Generated 2018-01-20 for `Iot`.
 
 

+ 1 - 1
VERSION

@@ -1 +1 @@
-1.36.140
+1.36.141

+ 13 - 0
imm/include/alibabacloud/imm/model/FindImagesByTagNamesResult.h

@@ -34,6 +34,15 @@ namespace AlibabaCloud
 			public:
 			public:
 				struct Frames
 				struct Frames
 				{
 				{
+					struct Address
+					{
+						std::string township;
+						std::string addressLine;
+						std::string country;
+						std::string city;
+						std::string district;
+						std::string province;
+					};
 					struct FacesItem
 					struct FacesItem
 					{
 					{
 						struct EmotionDetails
 						struct EmotionDetails
@@ -121,11 +130,14 @@ namespace AlibabaCloud
 						float celebrityConfidence;
 						float celebrityConfidence;
 					};
 					};
 					std::string modifyTime;
 					std::string modifyTime;
+					Address address;
 					std::string sourceType;
 					std::string sourceType;
 					std::string sourceUri;
 					std::string sourceUri;
 					std::string facesFailReason;
 					std::string facesFailReason;
 					std::string remarksA;
 					std::string remarksA;
+					std::string addressFailReason;
 					std::string remarksB;
 					std::string remarksB;
+					std::string addressModifyTime;
 					std::string imageFormat;
 					std::string imageFormat;
 					std::string tagsFailReason;
 					std::string tagsFailReason;
 					std::string facesModifyTime;
 					std::string facesModifyTime;
@@ -137,6 +149,7 @@ namespace AlibabaCloud
 					std::string sourcePosition;
 					std::string sourcePosition;
 					std::vector<Frames::FacesItem> faces;
 					std::vector<Frames::FacesItem> faces;
 					std::vector<Frames::TagsItem> tags;
 					std::vector<Frames::TagsItem> tags;
+					std::string addressStatus;
 					std::string facesStatus;
 					std::string facesStatus;
 					std::string createTime;
 					std::string createTime;
 					std::string tagsModifyTime;
 					std::string tagsModifyTime;

+ 39 - 36
imm/include/alibabacloud/imm/model/FindImagesRequest.h

@@ -35,89 +35,92 @@ namespace AlibabaCloud
 				FindImagesRequest();
 				FindImagesRequest();
 				~FindImagesRequest();
 				~FindImagesRequest();
 
 
-				std::string getGender()const;
-				void setGender(const std::string& gender);
 				std::string getProject()const;
 				std::string getProject()const;
 				void setProject(const std::string& project);
 				void setProject(const std::string& project);
 				std::string getExternalId()const;
 				std::string getExternalId()const;
 				void setExternalId(const std::string& externalId);
 				void setExternalId(const std::string& externalId);
 				std::string getFacesModifyTimeRange()const;
 				std::string getFacesModifyTimeRange()const;
 				void setFacesModifyTimeRange(const std::string& facesModifyTimeRange);
 				void setFacesModifyTimeRange(const std::string& facesModifyTimeRange);
-				std::string getImageSizeRange()const;
-				void setImageSizeRange(const std::string& imageSizeRange);
-				std::string getRemarksBPrefix()const;
-				void setRemarksBPrefix(const std::string& remarksBPrefix);
-				std::string getAccessKeyId()const;
-				void setAccessKeyId(const std::string& accessKeyId);
-				std::string getLocationBoundary()const;
-				void setLocationBoundary(const std::string& locationBoundary);
-				std::string getImageTimeRange()const;
-				void setImageTimeRange(const std::string& imageTimeRange);
 				std::string getOCRContentsMatch()const;
 				std::string getOCRContentsMatch()const;
 				void setOCRContentsMatch(const std::string& oCRContentsMatch);
 				void setOCRContentsMatch(const std::string& oCRContentsMatch);
 				int getLimit()const;
 				int getLimit()const;
 				void setLimit(int limit);
 				void setLimit(int limit);
 				std::string getRemarksDPrefix()const;
 				std::string getRemarksDPrefix()const;
 				void setRemarksDPrefix(const std::string& remarksDPrefix);
 				void setRemarksDPrefix(const std::string& remarksDPrefix);
-				std::string getTagsModifyTimeRange()const;
-				void setTagsModifyTimeRange(const std::string& tagsModifyTimeRange);
 				std::string getSourceType()const;
 				std::string getSourceType()const;
 				void setSourceType(const std::string& sourceType);
 				void setSourceType(const std::string& sourceType);
-				std::string getAgeRange()const;
-				void setAgeRange(const std::string& ageRange);
 				std::string getOrder()const;
 				std::string getOrder()const;
 				void setOrder(const std::string& order);
 				void setOrder(const std::string& order);
-				std::string getRemarksAPrefix()const;
-				void setRemarksAPrefix(const std::string& remarksAPrefix);
 				std::string getGroupId()const;
 				std::string getGroupId()const;
 				void setGroupId(const std::string& groupId);
 				void setGroupId(const std::string& groupId);
 				std::string getOrderBy()const;
 				std::string getOrderBy()const;
 				void setOrderBy(const std::string& orderBy);
 				void setOrderBy(const std::string& orderBy);
 				std::string getTagNames()const;
 				std::string getTagNames()const;
 				void setTagNames(const std::string& tagNames);
 				void setTagNames(const std::string& tagNames);
-				std::string getSourceUriPrefix()const;
-				void setSourceUriPrefix(const std::string& sourceUriPrefix);
-				std::string getEmotion()const;
-				void setEmotion(const std::string& emotion);
 				std::string getMarker()const;
 				std::string getMarker()const;
 				void setMarker(const std::string& marker);
 				void setMarker(const std::string& marker);
 				std::string getRemarksCPrefix()const;
 				std::string getRemarksCPrefix()const;
 				void setRemarksCPrefix(const std::string& remarksCPrefix);
 				void setRemarksCPrefix(const std::string& remarksCPrefix);
+				std::string getModifyTimeRange()const;
+				void setModifyTimeRange(const std::string& modifyTimeRange);
+				std::string getAddressLineContentsMatch()const;
+				void setAddressLineContentsMatch(const std::string& addressLineContentsMatch);
+				std::string getGender()const;
+				void setGender(const std::string& gender);
+				std::string getImageSizeRange()const;
+				void setImageSizeRange(const std::string& imageSizeRange);
+				std::string getRemarksBPrefix()const;
+				void setRemarksBPrefix(const std::string& remarksBPrefix);
+				std::string getAccessKeyId()const;
+				void setAccessKeyId(const std::string& accessKeyId);
+				std::string getLocationBoundary()const;
+				void setLocationBoundary(const std::string& locationBoundary);
+				std::string getImageTimeRange()const;
+				void setImageTimeRange(const std::string& imageTimeRange);
+				std::string getTagsModifyTimeRange()const;
+				void setTagsModifyTimeRange(const std::string& tagsModifyTimeRange);
+				std::string getAgeRange()const;
+				void setAgeRange(const std::string& ageRange);
+				std::string getRemarksAPrefix()const;
+				void setRemarksAPrefix(const std::string& remarksAPrefix);
+				std::string getSourceUriPrefix()const;
+				void setSourceUriPrefix(const std::string& sourceUriPrefix);
+				std::string getEmotion()const;
+				void setEmotion(const std::string& emotion);
 				std::string getCreateTimeRange()const;
 				std::string getCreateTimeRange()const;
 				void setCreateTimeRange(const std::string& createTimeRange);
 				void setCreateTimeRange(const std::string& createTimeRange);
 				std::string getSetId()const;
 				std::string getSetId()const;
 				void setSetId(const std::string& setId);
 				void setSetId(const std::string& setId);
-				std::string getModifyTimeRange()const;
-				void setModifyTimeRange(const std::string& modifyTimeRange);
 
 
             private:
             private:
-				std::string gender_;
 				std::string project_;
 				std::string project_;
 				std::string externalId_;
 				std::string externalId_;
 				std::string facesModifyTimeRange_;
 				std::string facesModifyTimeRange_;
-				std::string imageSizeRange_;
-				std::string remarksBPrefix_;
-				std::string accessKeyId_;
-				std::string locationBoundary_;
-				std::string imageTimeRange_;
 				std::string oCRContentsMatch_;
 				std::string oCRContentsMatch_;
 				int limit_;
 				int limit_;
 				std::string remarksDPrefix_;
 				std::string remarksDPrefix_;
-				std::string tagsModifyTimeRange_;
 				std::string sourceType_;
 				std::string sourceType_;
-				std::string ageRange_;
 				std::string order_;
 				std::string order_;
-				std::string remarksAPrefix_;
 				std::string groupId_;
 				std::string groupId_;
 				std::string orderBy_;
 				std::string orderBy_;
 				std::string tagNames_;
 				std::string tagNames_;
-				std::string sourceUriPrefix_;
-				std::string emotion_;
 				std::string marker_;
 				std::string marker_;
 				std::string remarksCPrefix_;
 				std::string remarksCPrefix_;
+				std::string modifyTimeRange_;
+				std::string addressLineContentsMatch_;
+				std::string gender_;
+				std::string imageSizeRange_;
+				std::string remarksBPrefix_;
+				std::string accessKeyId_;
+				std::string locationBoundary_;
+				std::string imageTimeRange_;
+				std::string tagsModifyTimeRange_;
+				std::string ageRange_;
+				std::string remarksAPrefix_;
+				std::string sourceUriPrefix_;
+				std::string emotion_;
 				std::string createTimeRange_;
 				std::string createTimeRange_;
 				std::string setId_;
 				std::string setId_;
-				std::string modifyTimeRange_;
 
 
 			};
 			};
 		}
 		}

+ 13 - 0
imm/include/alibabacloud/imm/model/FindImagesResult.h

@@ -34,6 +34,15 @@ namespace AlibabaCloud
 			public:
 			public:
 				struct ImagesItem
 				struct ImagesItem
 				{
 				{
+					struct Address
+					{
+						std::string township;
+						std::string addressLine;
+						std::string country;
+						std::string city;
+						std::string district;
+						std::string province;
+					};
 					struct FacesItem
 					struct FacesItem
 					{
 					{
 						struct EmotionDetails
 						struct EmotionDetails
@@ -121,11 +130,14 @@ namespace AlibabaCloud
 						float celebrityConfidence;
 						float celebrityConfidence;
 					};
 					};
 					std::string modifyTime;
 					std::string modifyTime;
+					Address address;
 					std::string sourceType;
 					std::string sourceType;
 					std::string sourceUri;
 					std::string sourceUri;
 					std::string facesFailReason;
 					std::string facesFailReason;
 					std::string remarksA;
 					std::string remarksA;
+					std::string addressFailReason;
 					std::string remarksB;
 					std::string remarksB;
+					std::string addressModifyTime;
 					std::string imageFormat;
 					std::string imageFormat;
 					std::string tagsFailReason;
 					std::string tagsFailReason;
 					std::string facesModifyTime;
 					std::string facesModifyTime;
@@ -137,6 +149,7 @@ namespace AlibabaCloud
 					std::string sourcePosition;
 					std::string sourcePosition;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::TagsItem> tags;
 					std::vector<ImagesItem::TagsItem> tags;
+					std::string addressStatus;
 					std::string facesStatus;
 					std::string facesStatus;
 					std::string createTime;
 					std::string createTime;
 					std::string tagsModifyTime;
 					std::string tagsModifyTime;

+ 17 - 0
imm/include/alibabacloud/imm/model/GetImageResult.h

@@ -32,6 +32,15 @@ namespace AlibabaCloud
 			class ALIBABACLOUD_IMM_EXPORT GetImageResult : public ServiceResult
 			class ALIBABACLOUD_IMM_EXPORT GetImageResult : public ServiceResult
 			{
 			{
 			public:
 			public:
+				struct Address
+				{
+					std::string township;
+					std::string addressLine;
+					std::string country;
+					std::string city;
+					std::string district;
+					std::string province;
+				};
 				struct FacesItem
 				struct FacesItem
 				{
 				{
 					struct FaceAttributes
 					struct FaceAttributes
@@ -123,11 +132,14 @@ namespace AlibabaCloud
 				explicit GetImageResult(const std::string &payload);
 				explicit GetImageResult(const std::string &payload);
 				~GetImageResult();
 				~GetImageResult();
 				std::string getModifyTime()const;
 				std::string getModifyTime()const;
+				Address getAddress()const;
 				std::string getSourceType()const;
 				std::string getSourceType()const;
 				std::string getSourceUri()const;
 				std::string getSourceUri()const;
 				std::string getFacesFailReason()const;
 				std::string getFacesFailReason()const;
 				std::string getRemarksA()const;
 				std::string getRemarksA()const;
+				std::string getAddressFailReason()const;
 				std::string getRemarksB()const;
 				std::string getRemarksB()const;
+				std::string getAddressModifyTime()const;
 				std::string getImageFormat()const;
 				std::string getImageFormat()const;
 				std::string getTagsFailReason()const;
 				std::string getTagsFailReason()const;
 				std::string getExif()const;
 				std::string getExif()const;
@@ -139,6 +151,7 @@ namespace AlibabaCloud
 				std::string getSourcePosition()const;
 				std::string getSourcePosition()const;
 				std::vector<FacesItem> getFaces()const;
 				std::vector<FacesItem> getFaces()const;
 				std::vector<TagsItem> getTags()const;
 				std::vector<TagsItem> getTags()const;
+				std::string getAddressStatus()const;
 				std::string getFacesStatus()const;
 				std::string getFacesStatus()const;
 				std::string getCreateTime()const;
 				std::string getCreateTime()const;
 				std::string getTagsModifyTime()const;
 				std::string getTagsModifyTime()const;
@@ -163,11 +176,14 @@ namespace AlibabaCloud
 				void parse(const std::string &payload);
 				void parse(const std::string &payload);
 			private:
 			private:
 				std::string modifyTime_;
 				std::string modifyTime_;
+				Address address_;
 				std::string sourceType_;
 				std::string sourceType_;
 				std::string sourceUri_;
 				std::string sourceUri_;
 				std::string facesFailReason_;
 				std::string facesFailReason_;
 				std::string remarksA_;
 				std::string remarksA_;
+				std::string addressFailReason_;
 				std::string remarksB_;
 				std::string remarksB_;
+				std::string addressModifyTime_;
 				std::string imageFormat_;
 				std::string imageFormat_;
 				std::string tagsFailReason_;
 				std::string tagsFailReason_;
 				std::string exif_;
 				std::string exif_;
@@ -179,6 +195,7 @@ namespace AlibabaCloud
 				std::string sourcePosition_;
 				std::string sourcePosition_;
 				std::vector<FacesItem> faces_;
 				std::vector<FacesItem> faces_;
 				std::vector<TagsItem> tags_;
 				std::vector<TagsItem> tags_;
+				std::string addressStatus_;
 				std::string facesStatus_;
 				std::string facesStatus_;
 				std::string createTime_;
 				std::string createTime_;
 				std::string tagsModifyTime_;
 				std::string tagsModifyTime_;

+ 13 - 0
imm/include/alibabacloud/imm/model/ListImagesResult.h

@@ -34,6 +34,15 @@ namespace AlibabaCloud
 			public:
 			public:
 				struct ImagesItem
 				struct ImagesItem
 				{
 				{
+					struct Address
+					{
+						std::string township;
+						std::string addressLine;
+						std::string country;
+						std::string city;
+						std::string district;
+						std::string province;
+					};
 					struct FacesItem
 					struct FacesItem
 					{
 					{
 						struct EmotionDetails
 						struct EmotionDetails
@@ -121,11 +130,14 @@ namespace AlibabaCloud
 						float celebrityConfidence;
 						float celebrityConfidence;
 					};
 					};
 					std::string modifyTime;
 					std::string modifyTime;
+					Address address;
 					std::string sourceType;
 					std::string sourceType;
 					std::string sourceUri;
 					std::string sourceUri;
 					std::string facesFailReason;
 					std::string facesFailReason;
 					std::string remarksA;
 					std::string remarksA;
+					std::string addressFailReason;
 					std::string remarksB;
 					std::string remarksB;
+					std::string addressModifyTime;
 					std::string imageFormat;
 					std::string imageFormat;
 					std::string tagsFailReason;
 					std::string tagsFailReason;
 					std::string facesModifyTime;
 					std::string facesModifyTime;
@@ -137,6 +149,7 @@ namespace AlibabaCloud
 					std::string sourcePosition;
 					std::string sourcePosition;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::FacesItem> faces;
 					std::vector<ImagesItem::TagsItem> tags;
 					std::vector<ImagesItem::TagsItem> tags;
+					std::string addressStatus;
 					std::string facesStatus;
 					std::string facesStatus;
 					std::string createTime;
 					std::string createTime;
 					std::string tagsModifyTime;
 					std::string tagsModifyTime;

+ 19 - 0
imm/src/model/FindImagesByTagNamesResult.cc

@@ -105,6 +105,12 @@ void FindImagesByTagNamesResult::parse(const std::string &payload)
 			imagesObject.remarksC = valueImagesFrames["RemarksC"].asString();
 			imagesObject.remarksC = valueImagesFrames["RemarksC"].asString();
 		if(!valueImagesFrames["RemarksD"].isNull())
 		if(!valueImagesFrames["RemarksD"].isNull())
 			imagesObject.remarksD = valueImagesFrames["RemarksD"].asString();
 			imagesObject.remarksD = valueImagesFrames["RemarksD"].asString();
+		if(!valueImagesFrames["AddressModifyTime"].isNull())
+			imagesObject.addressModifyTime = valueImagesFrames["AddressModifyTime"].asString();
+		if(!valueImagesFrames["AddressStatus"].isNull())
+			imagesObject.addressStatus = valueImagesFrames["AddressStatus"].asString();
+		if(!valueImagesFrames["AddressFailReason"].isNull())
+			imagesObject.addressFailReason = valueImagesFrames["AddressFailReason"].asString();
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		{
 		{
@@ -235,6 +241,19 @@ void FindImagesByTagNamesResult::parse(const std::string &payload)
 				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 			imagesObject.celebrity.push_back(celebrityObject);
 			imagesObject.celebrity.push_back(celebrityObject);
 		}
 		}
+		auto addressNode = value["Address"];
+		if(!addressNode["AddressLine"].isNull())
+			imagesObject.address.addressLine = addressNode["AddressLine"].asString();
+		if(!addressNode["Country"].isNull())
+			imagesObject.address.country = addressNode["Country"].asString();
+		if(!addressNode["Province"].isNull())
+			imagesObject.address.province = addressNode["Province"].asString();
+		if(!addressNode["City"].isNull())
+			imagesObject.address.city = addressNode["City"].asString();
+		if(!addressNode["District"].isNull())
+			imagesObject.address.district = addressNode["District"].asString();
+		if(!addressNode["Township"].isNull())
+			imagesObject.address.township = addressNode["Township"].asString();
 		images_.push_back(imagesObject);
 		images_.push_back(imagesObject);
 	}
 	}
 	if(!value["SetId"].isNull())
 	if(!value["SetId"].isNull())

+ 133 - 122
imm/src/model/FindImagesRequest.cc

@@ -25,17 +25,6 @@ FindImagesRequest::FindImagesRequest() :
 FindImagesRequest::~FindImagesRequest()
 FindImagesRequest::~FindImagesRequest()
 {}
 {}
 
 
-std::string FindImagesRequest::getGender()const
-{
-	return gender_;
-}
-
-void FindImagesRequest::setGender(const std::string& gender)
-{
-	gender_ = gender;
-	setCoreParameter("Gender", gender);
-}
-
 std::string FindImagesRequest::getProject()const
 std::string FindImagesRequest::getProject()const
 {
 {
 	return project_;
 	return project_;
@@ -69,224 +58,257 @@ void FindImagesRequest::setFacesModifyTimeRange(const std::string& facesModifyTi
 	setCoreParameter("FacesModifyTimeRange", facesModifyTimeRange);
 	setCoreParameter("FacesModifyTimeRange", facesModifyTimeRange);
 }
 }
 
 
-std::string FindImagesRequest::getImageSizeRange()const
+std::string FindImagesRequest::getOCRContentsMatch()const
 {
 {
-	return imageSizeRange_;
+	return oCRContentsMatch_;
 }
 }
 
 
-void FindImagesRequest::setImageSizeRange(const std::string& imageSizeRange)
+void FindImagesRequest::setOCRContentsMatch(const std::string& oCRContentsMatch)
 {
 {
-	imageSizeRange_ = imageSizeRange;
-	setCoreParameter("ImageSizeRange", imageSizeRange);
+	oCRContentsMatch_ = oCRContentsMatch;
+	setCoreParameter("OCRContentsMatch", oCRContentsMatch);
 }
 }
 
 
-std::string FindImagesRequest::getRemarksBPrefix()const
+int FindImagesRequest::getLimit()const
 {
 {
-	return remarksBPrefix_;
+	return limit_;
 }
 }
 
 
-void FindImagesRequest::setRemarksBPrefix(const std::string& remarksBPrefix)
+void FindImagesRequest::setLimit(int limit)
 {
 {
-	remarksBPrefix_ = remarksBPrefix;
-	setCoreParameter("RemarksBPrefix", remarksBPrefix);
+	limit_ = limit;
+	setCoreParameter("Limit", std::to_string(limit));
 }
 }
 
 
-std::string FindImagesRequest::getAccessKeyId()const
+std::string FindImagesRequest::getRemarksDPrefix()const
 {
 {
-	return accessKeyId_;
+	return remarksDPrefix_;
 }
 }
 
 
-void FindImagesRequest::setAccessKeyId(const std::string& accessKeyId)
+void FindImagesRequest::setRemarksDPrefix(const std::string& remarksDPrefix)
 {
 {
-	accessKeyId_ = accessKeyId;
-	setCoreParameter("AccessKeyId", accessKeyId);
+	remarksDPrefix_ = remarksDPrefix;
+	setCoreParameter("RemarksDPrefix", remarksDPrefix);
 }
 }
 
 
-std::string FindImagesRequest::getLocationBoundary()const
+std::string FindImagesRequest::getSourceType()const
 {
 {
-	return locationBoundary_;
+	return sourceType_;
 }
 }
 
 
-void FindImagesRequest::setLocationBoundary(const std::string& locationBoundary)
+void FindImagesRequest::setSourceType(const std::string& sourceType)
 {
 {
-	locationBoundary_ = locationBoundary;
-	setCoreParameter("LocationBoundary", locationBoundary);
+	sourceType_ = sourceType;
+	setCoreParameter("SourceType", sourceType);
 }
 }
 
 
-std::string FindImagesRequest::getImageTimeRange()const
+std::string FindImagesRequest::getOrder()const
 {
 {
-	return imageTimeRange_;
+	return order_;
 }
 }
 
 
-void FindImagesRequest::setImageTimeRange(const std::string& imageTimeRange)
+void FindImagesRequest::setOrder(const std::string& order)
 {
 {
-	imageTimeRange_ = imageTimeRange;
-	setCoreParameter("ImageTimeRange", imageTimeRange);
+	order_ = order;
+	setCoreParameter("Order", order);
 }
 }
 
 
-std::string FindImagesRequest::getOCRContentsMatch()const
+std::string FindImagesRequest::getGroupId()const
 {
 {
-	return oCRContentsMatch_;
+	return groupId_;
 }
 }
 
 
-void FindImagesRequest::setOCRContentsMatch(const std::string& oCRContentsMatch)
+void FindImagesRequest::setGroupId(const std::string& groupId)
 {
 {
-	oCRContentsMatch_ = oCRContentsMatch;
-	setCoreParameter("OCRContentsMatch", oCRContentsMatch);
+	groupId_ = groupId;
+	setCoreParameter("GroupId", groupId);
 }
 }
 
 
-int FindImagesRequest::getLimit()const
+std::string FindImagesRequest::getOrderBy()const
 {
 {
-	return limit_;
+	return orderBy_;
 }
 }
 
 
-void FindImagesRequest::setLimit(int limit)
+void FindImagesRequest::setOrderBy(const std::string& orderBy)
 {
 {
-	limit_ = limit;
-	setCoreParameter("Limit", std::to_string(limit));
+	orderBy_ = orderBy;
+	setCoreParameter("OrderBy", orderBy);
 }
 }
 
 
-std::string FindImagesRequest::getRemarksDPrefix()const
+std::string FindImagesRequest::getTagNames()const
 {
 {
-	return remarksDPrefix_;
+	return tagNames_;
 }
 }
 
 
-void FindImagesRequest::setRemarksDPrefix(const std::string& remarksDPrefix)
+void FindImagesRequest::setTagNames(const std::string& tagNames)
 {
 {
-	remarksDPrefix_ = remarksDPrefix;
-	setCoreParameter("RemarksDPrefix", remarksDPrefix);
+	tagNames_ = tagNames;
+	setCoreParameter("TagNames", tagNames);
 }
 }
 
 
-std::string FindImagesRequest::getTagsModifyTimeRange()const
+std::string FindImagesRequest::getMarker()const
 {
 {
-	return tagsModifyTimeRange_;
+	return marker_;
 }
 }
 
 
-void FindImagesRequest::setTagsModifyTimeRange(const std::string& tagsModifyTimeRange)
+void FindImagesRequest::setMarker(const std::string& marker)
 {
 {
-	tagsModifyTimeRange_ = tagsModifyTimeRange;
-	setCoreParameter("TagsModifyTimeRange", tagsModifyTimeRange);
+	marker_ = marker;
+	setCoreParameter("Marker", marker);
 }
 }
 
 
-std::string FindImagesRequest::getSourceType()const
+std::string FindImagesRequest::getRemarksCPrefix()const
 {
 {
-	return sourceType_;
+	return remarksCPrefix_;
 }
 }
 
 
-void FindImagesRequest::setSourceType(const std::string& sourceType)
+void FindImagesRequest::setRemarksCPrefix(const std::string& remarksCPrefix)
 {
 {
-	sourceType_ = sourceType;
-	setCoreParameter("SourceType", sourceType);
+	remarksCPrefix_ = remarksCPrefix;
+	setCoreParameter("RemarksCPrefix", remarksCPrefix);
 }
 }
 
 
-std::string FindImagesRequest::getAgeRange()const
+std::string FindImagesRequest::getModifyTimeRange()const
 {
 {
-	return ageRange_;
+	return modifyTimeRange_;
 }
 }
 
 
-void FindImagesRequest::setAgeRange(const std::string& ageRange)
+void FindImagesRequest::setModifyTimeRange(const std::string& modifyTimeRange)
 {
 {
-	ageRange_ = ageRange;
-	setCoreParameter("AgeRange", ageRange);
+	modifyTimeRange_ = modifyTimeRange;
+	setCoreParameter("ModifyTimeRange", modifyTimeRange);
 }
 }
 
 
-std::string FindImagesRequest::getOrder()const
+std::string FindImagesRequest::getAddressLineContentsMatch()const
 {
 {
-	return order_;
+	return addressLineContentsMatch_;
 }
 }
 
 
-void FindImagesRequest::setOrder(const std::string& order)
+void FindImagesRequest::setAddressLineContentsMatch(const std::string& addressLineContentsMatch)
 {
 {
-	order_ = order;
-	setCoreParameter("Order", order);
+	addressLineContentsMatch_ = addressLineContentsMatch;
+	setCoreParameter("AddressLineContentsMatch", addressLineContentsMatch);
 }
 }
 
 
-std::string FindImagesRequest::getRemarksAPrefix()const
+std::string FindImagesRequest::getGender()const
 {
 {
-	return remarksAPrefix_;
+	return gender_;
 }
 }
 
 
-void FindImagesRequest::setRemarksAPrefix(const std::string& remarksAPrefix)
+void FindImagesRequest::setGender(const std::string& gender)
 {
 {
-	remarksAPrefix_ = remarksAPrefix;
-	setCoreParameter("RemarksAPrefix", remarksAPrefix);
+	gender_ = gender;
+	setCoreParameter("Gender", gender);
 }
 }
 
 
-std::string FindImagesRequest::getGroupId()const
+std::string FindImagesRequest::getImageSizeRange()const
 {
 {
-	return groupId_;
+	return imageSizeRange_;
 }
 }
 
 
-void FindImagesRequest::setGroupId(const std::string& groupId)
+void FindImagesRequest::setImageSizeRange(const std::string& imageSizeRange)
 {
 {
-	groupId_ = groupId;
-	setCoreParameter("GroupId", groupId);
+	imageSizeRange_ = imageSizeRange;
+	setCoreParameter("ImageSizeRange", imageSizeRange);
 }
 }
 
 
-std::string FindImagesRequest::getOrderBy()const
+std::string FindImagesRequest::getRemarksBPrefix()const
 {
 {
-	return orderBy_;
+	return remarksBPrefix_;
 }
 }
 
 
-void FindImagesRequest::setOrderBy(const std::string& orderBy)
+void FindImagesRequest::setRemarksBPrefix(const std::string& remarksBPrefix)
 {
 {
-	orderBy_ = orderBy;
-	setCoreParameter("OrderBy", orderBy);
+	remarksBPrefix_ = remarksBPrefix;
+	setCoreParameter("RemarksBPrefix", remarksBPrefix);
 }
 }
 
 
-std::string FindImagesRequest::getTagNames()const
+std::string FindImagesRequest::getAccessKeyId()const
 {
 {
-	return tagNames_;
+	return accessKeyId_;
 }
 }
 
 
-void FindImagesRequest::setTagNames(const std::string& tagNames)
+void FindImagesRequest::setAccessKeyId(const std::string& accessKeyId)
 {
 {
-	tagNames_ = tagNames;
-	setCoreParameter("TagNames", tagNames);
+	accessKeyId_ = accessKeyId;
+	setCoreParameter("AccessKeyId", accessKeyId);
 }
 }
 
 
-std::string FindImagesRequest::getSourceUriPrefix()const
+std::string FindImagesRequest::getLocationBoundary()const
 {
 {
-	return sourceUriPrefix_;
+	return locationBoundary_;
 }
 }
 
 
-void FindImagesRequest::setSourceUriPrefix(const std::string& sourceUriPrefix)
+void FindImagesRequest::setLocationBoundary(const std::string& locationBoundary)
 {
 {
-	sourceUriPrefix_ = sourceUriPrefix;
-	setCoreParameter("SourceUriPrefix", sourceUriPrefix);
+	locationBoundary_ = locationBoundary;
+	setCoreParameter("LocationBoundary", locationBoundary);
 }
 }
 
 
-std::string FindImagesRequest::getEmotion()const
+std::string FindImagesRequest::getImageTimeRange()const
 {
 {
-	return emotion_;
+	return imageTimeRange_;
 }
 }
 
 
-void FindImagesRequest::setEmotion(const std::string& emotion)
+void FindImagesRequest::setImageTimeRange(const std::string& imageTimeRange)
 {
 {
-	emotion_ = emotion;
-	setCoreParameter("Emotion", emotion);
+	imageTimeRange_ = imageTimeRange;
+	setCoreParameter("ImageTimeRange", imageTimeRange);
 }
 }
 
 
-std::string FindImagesRequest::getMarker()const
+std::string FindImagesRequest::getTagsModifyTimeRange()const
 {
 {
-	return marker_;
+	return tagsModifyTimeRange_;
 }
 }
 
 
-void FindImagesRequest::setMarker(const std::string& marker)
+void FindImagesRequest::setTagsModifyTimeRange(const std::string& tagsModifyTimeRange)
 {
 {
-	marker_ = marker;
-	setCoreParameter("Marker", marker);
+	tagsModifyTimeRange_ = tagsModifyTimeRange;
+	setCoreParameter("TagsModifyTimeRange", tagsModifyTimeRange);
 }
 }
 
 
-std::string FindImagesRequest::getRemarksCPrefix()const
+std::string FindImagesRequest::getAgeRange()const
 {
 {
-	return remarksCPrefix_;
+	return ageRange_;
 }
 }
 
 
-void FindImagesRequest::setRemarksCPrefix(const std::string& remarksCPrefix)
+void FindImagesRequest::setAgeRange(const std::string& ageRange)
 {
 {
-	remarksCPrefix_ = remarksCPrefix;
-	setCoreParameter("RemarksCPrefix", remarksCPrefix);
+	ageRange_ = ageRange;
+	setCoreParameter("AgeRange", ageRange);
+}
+
+std::string FindImagesRequest::getRemarksAPrefix()const
+{
+	return remarksAPrefix_;
+}
+
+void FindImagesRequest::setRemarksAPrefix(const std::string& remarksAPrefix)
+{
+	remarksAPrefix_ = remarksAPrefix;
+	setCoreParameter("RemarksAPrefix", remarksAPrefix);
+}
+
+std::string FindImagesRequest::getSourceUriPrefix()const
+{
+	return sourceUriPrefix_;
+}
+
+void FindImagesRequest::setSourceUriPrefix(const std::string& sourceUriPrefix)
+{
+	sourceUriPrefix_ = sourceUriPrefix;
+	setCoreParameter("SourceUriPrefix", sourceUriPrefix);
+}
+
+std::string FindImagesRequest::getEmotion()const
+{
+	return emotion_;
+}
+
+void FindImagesRequest::setEmotion(const std::string& emotion)
+{
+	emotion_ = emotion;
+	setCoreParameter("Emotion", emotion);
 }
 }
 
 
 std::string FindImagesRequest::getCreateTimeRange()const
 std::string FindImagesRequest::getCreateTimeRange()const
@@ -311,14 +333,3 @@ void FindImagesRequest::setSetId(const std::string& setId)
 	setCoreParameter("SetId", setId);
 	setCoreParameter("SetId", setId);
 }
 }
 
 
-std::string FindImagesRequest::getModifyTimeRange()const
-{
-	return modifyTimeRange_;
-}
-
-void FindImagesRequest::setModifyTimeRange(const std::string& modifyTimeRange)
-{
-	modifyTimeRange_ = modifyTimeRange;
-	setCoreParameter("ModifyTimeRange", modifyTimeRange);
-}
-

+ 19 - 0
imm/src/model/FindImagesResult.cc

@@ -105,6 +105,12 @@ void FindImagesResult::parse(const std::string &payload)
 			imagesObject.remarksD = valueImagesImagesItem["RemarksD"].asString();
 			imagesObject.remarksD = valueImagesImagesItem["RemarksD"].asString();
 		if(!valueImagesImagesItem["ExternalId"].isNull())
 		if(!valueImagesImagesItem["ExternalId"].isNull())
 			imagesObject.externalId = valueImagesImagesItem["ExternalId"].asString();
 			imagesObject.externalId = valueImagesImagesItem["ExternalId"].asString();
+		if(!valueImagesImagesItem["AddressModifyTime"].isNull())
+			imagesObject.addressModifyTime = valueImagesImagesItem["AddressModifyTime"].asString();
+		if(!valueImagesImagesItem["AddressStatus"].isNull())
+			imagesObject.addressStatus = valueImagesImagesItem["AddressStatus"].asString();
+		if(!valueImagesImagesItem["AddressFailReason"].isNull())
+			imagesObject.addressFailReason = valueImagesImagesItem["AddressFailReason"].asString();
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		{
 		{
@@ -235,6 +241,19 @@ void FindImagesResult::parse(const std::string &payload)
 				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 			imagesObject.celebrity.push_back(celebrityObject);
 			imagesObject.celebrity.push_back(celebrityObject);
 		}
 		}
+		auto addressNode = value["Address"];
+		if(!addressNode["AddressLine"].isNull())
+			imagesObject.address.addressLine = addressNode["AddressLine"].asString();
+		if(!addressNode["Country"].isNull())
+			imagesObject.address.country = addressNode["Country"].asString();
+		if(!addressNode["Province"].isNull())
+			imagesObject.address.province = addressNode["Province"].asString();
+		if(!addressNode["City"].isNull())
+			imagesObject.address.city = addressNode["City"].asString();
+		if(!addressNode["District"].isNull())
+			imagesObject.address.district = addressNode["District"].asString();
+		if(!addressNode["Township"].isNull())
+			imagesObject.address.township = addressNode["Township"].asString();
 		images_.push_back(imagesObject);
 		images_.push_back(imagesObject);
 	}
 	}
 	if(!value["SetId"].isNull())
 	if(!value["SetId"].isNull())

+ 39 - 0
imm/src/model/GetImageResult.cc

@@ -167,6 +167,19 @@ void GetImageResult::parse(const std::string &payload)
 			celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 			celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 		celebrity_.push_back(celebrityObject);
 		celebrity_.push_back(celebrityObject);
 	}
 	}
+	auto addressNode = value["Address"];
+	if(!addressNode["AddressLine"].isNull())
+		address_.addressLine = addressNode["AddressLine"].asString();
+	if(!addressNode["Country"].isNull())
+		address_.country = addressNode["Country"].asString();
+	if(!addressNode["Province"].isNull())
+		address_.province = addressNode["Province"].asString();
+	if(!addressNode["City"].isNull())
+		address_.city = addressNode["City"].asString();
+	if(!addressNode["District"].isNull())
+		address_.district = addressNode["District"].asString();
+	if(!addressNode["Township"].isNull())
+		address_.township = addressNode["Township"].asString();
 	if(!value["SetId"].isNull())
 	if(!value["SetId"].isNull())
 		setId_ = value["SetId"].asString();
 		setId_ = value["SetId"].asString();
 	if(!value["ImageUri"].isNull())
 	if(!value["ImageUri"].isNull())
@@ -231,6 +244,12 @@ void GetImageResult::parse(const std::string &payload)
 		remarksD_ = value["RemarksD"].asString();
 		remarksD_ = value["RemarksD"].asString();
 	if(!value["ExternalId"].isNull())
 	if(!value["ExternalId"].isNull())
 		externalId_ = value["ExternalId"].asString();
 		externalId_ = value["ExternalId"].asString();
+	if(!value["AddressModifyTime"].isNull())
+		addressModifyTime_ = value["AddressModifyTime"].asString();
+	if(!value["AddressStatus"].isNull())
+		addressStatus_ = value["AddressStatus"].asString();
+	if(!value["AddressFailReason"].isNull())
+		addressFailReason_ = value["AddressFailReason"].asString();
 
 
 }
 }
 
 
@@ -239,6 +258,11 @@ std::string GetImageResult::getModifyTime()const
 	return modifyTime_;
 	return modifyTime_;
 }
 }
 
 
+GetImageResult::Address GetImageResult::getAddress()const
+{
+	return address_;
+}
+
 std::string GetImageResult::getSourceType()const
 std::string GetImageResult::getSourceType()const
 {
 {
 	return sourceType_;
 	return sourceType_;
@@ -259,11 +283,21 @@ std::string GetImageResult::getRemarksA()const
 	return remarksA_;
 	return remarksA_;
 }
 }
 
 
+std::string GetImageResult::getAddressFailReason()const
+{
+	return addressFailReason_;
+}
+
 std::string GetImageResult::getRemarksB()const
 std::string GetImageResult::getRemarksB()const
 {
 {
 	return remarksB_;
 	return remarksB_;
 }
 }
 
 
+std::string GetImageResult::getAddressModifyTime()const
+{
+	return addressModifyTime_;
+}
+
 std::string GetImageResult::getImageFormat()const
 std::string GetImageResult::getImageFormat()const
 {
 {
 	return imageFormat_;
 	return imageFormat_;
@@ -319,6 +353,11 @@ std::vector<GetImageResult::TagsItem> GetImageResult::getTags()const
 	return tags_;
 	return tags_;
 }
 }
 
 
+std::string GetImageResult::getAddressStatus()const
+{
+	return addressStatus_;
+}
+
 std::string GetImageResult::getFacesStatus()const
 std::string GetImageResult::getFacesStatus()const
 {
 {
 	return facesStatus_;
 	return facesStatus_;

+ 19 - 0
imm/src/model/ListImagesResult.cc

@@ -105,6 +105,12 @@ void ListImagesResult::parse(const std::string &payload)
 			imagesObject.remarksD = valueImagesImagesItem["RemarksD"].asString();
 			imagesObject.remarksD = valueImagesImagesItem["RemarksD"].asString();
 		if(!valueImagesImagesItem["ExternalId"].isNull())
 		if(!valueImagesImagesItem["ExternalId"].isNull())
 			imagesObject.externalId = valueImagesImagesItem["ExternalId"].asString();
 			imagesObject.externalId = valueImagesImagesItem["ExternalId"].asString();
+		if(!valueImagesImagesItem["AddressModifyTime"].isNull())
+			imagesObject.addressModifyTime = valueImagesImagesItem["AddressModifyTime"].asString();
+		if(!valueImagesImagesItem["AddressStatus"].isNull())
+			imagesObject.addressStatus = valueImagesImagesItem["AddressStatus"].asString();
+		if(!valueImagesImagesItem["AddressFailReason"].isNull())
+			imagesObject.addressFailReason = valueImagesImagesItem["AddressFailReason"].asString();
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		auto allFacesNode = allImagesNode["Faces"]["FacesItem"];
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		for (auto allImagesNodeFacesFacesItem : allFacesNode)
 		{
 		{
@@ -235,6 +241,19 @@ void ListImagesResult::parse(const std::string &payload)
 				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 				celebrityObject.celebrityBoundary.height = std::stoi(celebrityBoundaryNode["Height"].asString());
 			imagesObject.celebrity.push_back(celebrityObject);
 			imagesObject.celebrity.push_back(celebrityObject);
 		}
 		}
+		auto addressNode = value["Address"];
+		if(!addressNode["AddressLine"].isNull())
+			imagesObject.address.addressLine = addressNode["AddressLine"].asString();
+		if(!addressNode["Country"].isNull())
+			imagesObject.address.country = addressNode["Country"].asString();
+		if(!addressNode["Province"].isNull())
+			imagesObject.address.province = addressNode["Province"].asString();
+		if(!addressNode["City"].isNull())
+			imagesObject.address.city = addressNode["City"].asString();
+		if(!addressNode["District"].isNull())
+			imagesObject.address.district = addressNode["District"].asString();
+		if(!addressNode["Township"].isNull())
+			imagesObject.address.township = addressNode["Township"].asString();
 		images_.push_back(imagesObject);
 		images_.push_back(imagesObject);
 	}
 	}
 	if(!value["SetId"].isNull())
 	if(!value["SetId"].isNull())