Add DetectIPCVideoObject.

CHANGELOG

@@ -1,3 +1,6 @@
+2021-04-08 Version: 1.36.671
+- Add DetectIPCVideoObject.
+
 2021-04-08 Version: 1.36.670
 - Release DetectVideoIPCObject.
 

VERSION

@@ -1 +1 @@
-1.36.670
+1.36.671

objectdet/include/alibabacloud/objectdet/model/DetectVideoIPCObjectResult.h

@@ -51,6 +51,7 @@ namespace AlibabaCloud
 					std::vector<Frame> frames;
 					long height;
 					long width;
+					std::string inputFile;
 				};
 
 

objectdet/include/alibabacloud/objectdet/model/GetVehicleRepairPlanResult.h

@@ -40,8 +40,8 @@ namespace AlibabaCloud
 						std::string partsStdCode;
 						std::string outStandardPartsName;
 						std::string repairType;
-						std::string relationType;
 						std::string repairFee;
+						std::string relationType;
 						std::string garageType;
 						std::string partsStdName;
 						std::string outStandardPartsId;

objectdet/src/ObjectdetClient.cc

@@ -31,21 +31,21 @@ ObjectdetClient::ObjectdetClient(const Credentials &credentials, const ClientCon
 	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, "objectdet");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ObjectdetClient::ObjectdetClient(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, "objectdet");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ObjectdetClient::ObjectdetClient(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, "objectdet");
+	endpointProvider_ = std::make_shared<EndpointProvider>(locationClient, configuration.regionId(), SERVICE_NAME, "");
 }
 
 ObjectdetClient::~ObjectdetClient()

objectdet/src/model/DetectMainBodyResult.cc

@@ -45,10 +45,10 @@ void DetectMainBodyResult::parse(const std::string &payload)
 		data_.location.x = std::stoi(locationNode["X"].asString());
 	if(!locationNode["Y"].isNull())
 		data_.location.y = std::stoi(locationNode["Y"].asString());
-	if(!locationNode["Width"].isNull())
-		data_.location.width = std::stoi(locationNode["Width"].asString());
 	if(!locationNode["Height"].isNull())
 		data_.location.height = std::stoi(locationNode["Height"].asString());
+	if(!locationNode["Width"].isNull())
+		data_.location.width = std::stoi(locationNode["Width"].asString());
 
 }
 

objectdet/src/model/DetectObjectResult.cc

@@ -40,10 +40,10 @@ void DetectObjectResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Width"].isNull())
-		data_.width = std::stoi(dataNode["Width"].asString());
 	if(!dataNode["Height"].isNull())
 		data_.height = std::stoi(dataNode["Height"].asString());
+	if(!dataNode["Width"].isNull())
+		data_.width = std::stoi(dataNode["Width"].asString());
 	auto allElementsNode = dataNode["Elements"]["Element"];
 	for (auto dataNodeElementsElement : allElementsNode)
 	{

objectdet/src/model/DetectVehicleICongestionRequest.cc

@@ -35,7 +35,28 @@ Array DetectVehicleICongestionRequest::getRoadRegions()const
 void DetectVehicleICongestionRequest::setRoadRegions(const Array& roadRegions)
 {
 	roadRegions_ = roadRegions;
-	setBodyParameter("RoadRegions", std::to_string(roadRegions));
+	for(int dep1 = 0; dep1!= roadRegions.size(); dep1++) {
+		auto roadRegionsObj = roadRegions.at(dep1);
+		std::string roadRegionsObjStr = "RoadRegions." + std::to_string(dep1 + 1);
+		for(int dep2 = 0; dep2!= roadRegionsObj.roadRegions.size(); dep2++) {
+			auto roadRegionsObj = roadRegionsObj.roadRegions.at(dep2);
+			std::string roadRegionsObjStr = roadRegionsObjStr + "RoadRegions." + std::to_string(dep2 + 1);
+			for(int dep3 = 0; dep3!= roadRegionsObj.roadRegion.size(); dep3++) {
+				auto roadRegionObj = roadRegionsObj.roadRegion.at(dep3);
+				std::string roadRegionObjStr = roadRegionsObjStr + "RoadRegion." + std::to_string(dep3 + 1);
+				for(int dep4 = 0; dep4!= roadRegionObj.roadRegionItem.size(); dep4++) {
+					auto roadRegionItemObj = roadRegionObj.roadRegionItem.at(dep4);
+					std::string roadRegionItemObjStr = roadRegionObjStr + "RoadRegionItem." + std::to_string(dep4 + 1);
+					for(int dep5 = 0; dep5!= roadRegionItemObj.point.size(); dep5++) {
+						auto pointObj = roadRegionItemObj.point.at(dep5);
+						std::string pointObjStr = roadRegionItemObjStr + "Point." + std::to_string(dep5 + 1);
+						setParameter(pointObjStr + ".X", std::to_string(pointObj.x));
+						setParameter(pointObjStr + ".Y", std::to_string(pointObj.y));
+					}
+				}
+			}
+		}
+	}
 }
 
 Array DetectVehicleICongestionRequest::getPreRegionIntersectFeatures()const
@@ -46,7 +67,19 @@ Array DetectVehicleICongestionRequest::getPreRegionIntersectFeatures()const
 void DetectVehicleICongestionRequest::setPreRegionIntersectFeatures(const Array& preRegionIntersectFeatures)
 {
 	preRegionIntersectFeatures_ = preRegionIntersectFeatures;
-	setBodyParameter("PreRegionIntersectFeatures", std::to_string(preRegionIntersectFeatures));
+	for(int dep1 = 0; dep1!= preRegionIntersectFeatures.size(); dep1++) {
+		auto preRegionIntersectFeaturesObj = preRegionIntersectFeatures.at(dep1);
+		std::string preRegionIntersectFeaturesObjStr = "PreRegionIntersectFeatures." + std::to_string(dep1 + 1);
+		for(int dep2 = 0; dep2!= preRegionIntersectFeaturesObj.preRegionIntersectFeatures.size(); dep2++) {
+			auto preRegionIntersectFeaturesObj = preRegionIntersectFeaturesObj.preRegionIntersectFeatures.at(dep2);
+			std::string preRegionIntersectFeaturesObjStr = preRegionIntersectFeaturesObjStr + "PreRegionIntersectFeatures." + std::to_string(dep2 + 1);
+			for(int dep3 = 0; dep3!= preRegionIntersectFeaturesObj.features.size(); dep3++) {
+				auto featuresObj = preRegionIntersectFeaturesObj.features.at(dep3);
+				std::string featuresObjStr = preRegionIntersectFeaturesObjStr + "Features." + std::to_string(dep3 + 1);
+				setParameter(featuresObjStr + ".String", featuresObj.string);
+			}
+		}
+	}
 }
 
 std::string DetectVehicleICongestionRequest::getImageURL()const

objectdet/src/model/DetectVehicleIllegalParkingRequest.cc

@@ -35,7 +35,28 @@ Array DetectVehicleIllegalParkingRequest::getRoadRegions()const
 void DetectVehicleIllegalParkingRequest::setRoadRegions(const Array& roadRegions)
 {
 	roadRegions_ = roadRegions;
-	setBodyParameter("RoadRegions", std::to_string(roadRegions));
+	for(int dep1 = 0; dep1!= roadRegions.size(); dep1++) {
+		auto roadRegionsObj = roadRegions.at(dep1);
+		std::string roadRegionsObjStr = "RoadRegions." + std::to_string(dep1 + 1);
+		for(int dep2 = 0; dep2!= roadRegionsObj.roadRegions.size(); dep2++) {
+			auto roadRegionsObj = roadRegionsObj.roadRegions.at(dep2);
+			std::string roadRegionsObjStr = roadRegionsObjStr + "RoadRegions." + std::to_string(dep2 + 1);
+			for(int dep3 = 0; dep3!= roadRegionsObj.roadRegion.size(); dep3++) {
+				auto roadRegionObj = roadRegionsObj.roadRegion.at(dep3);
+				std::string roadRegionObjStr = roadRegionsObjStr + "RoadRegion." + std::to_string(dep3 + 1);
+				for(int dep4 = 0; dep4!= roadRegionObj.roadRegionItem.size(); dep4++) {
+					auto roadRegionItemObj = roadRegionObj.roadRegionItem.at(dep4);
+					std::string roadRegionItemObjStr = roadRegionObjStr + "RoadRegionItem." + std::to_string(dep4 + 1);
+					for(int dep5 = 0; dep5!= roadRegionItemObj.point.size(); dep5++) {
+						auto pointObj = roadRegionItemObj.point.at(dep5);
+						std::string pointObjStr = roadRegionItemObjStr + "Point." + std::to_string(dep5 + 1);
+						setParameter(pointObjStr + ".X", std::to_string(pointObj.x));
+						setParameter(pointObjStr + ".Y", std::to_string(pointObj.y));
+					}
+				}
+			}
+		}
+	}
 }
 
 std::string DetectVehicleIllegalParkingRequest::getImageURL()const

objectdet/src/model/DetectVehicleResult.cc

@@ -40,10 +40,10 @@ void DetectVehicleResult::parse(const std::string &payload)
 	reader.parse(payload, value);
 	setRequestId(value["RequestId"].asString());
 	auto dataNode = value["Data"];
-	if(!dataNode["Width"].isNull())
-		data_.width = std::stoi(dataNode["Width"].asString());
 	if(!dataNode["Height"].isNull())
 		data_.height = std::stoi(dataNode["Height"].asString());
+	if(!dataNode["Width"].isNull())
+		data_.width = std::stoi(dataNode["Width"].asString());
 	auto allDetectObjectInfoListNode = dataNode["DetectObjectInfoList"]["DetectObjectInfo"];
 	for (auto dataNodeDetectObjectInfoListDetectObjectInfo : allDetectObjectInfoListNode)
 	{

objectdet/src/model/DetectVideoIPCObjectResult.cc

@@ -44,6 +44,8 @@ void DetectVideoIPCObjectResult::parse(const std::string &payload)
 		data_.height = std::stol(dataNode["Height"].asString());
 	if(!dataNode["Width"].isNull())
 		data_.width = std::stol(dataNode["Width"].asString());
+	if(!dataNode["InputFile"].isNull())
+		data_.inputFile = dataNode["InputFile"].asString();
 	auto allFramesNode = dataNode["Frames"]["Frame"];
 	for (auto dataNodeFramesFrame : allFramesNode)
 	{

objectdet/src/model/GenerateVehicleRepairPlanResult.cc

@@ -44,10 +44,10 @@ void GenerateVehicleRepairPlanResult::parse(const std::string &payload)
 		data_.taskId = dataNode["TaskId"].asString();
 	if(!value["HttpCode"].isNull())
 		httpCode_ = std::stoi(value["HttpCode"].asString());
-	if(!value["Code"].isNull())
-		code_ = value["Code"].asString();
 	if(!value["ErrorMessage"].isNull())
 		errorMessage_ = value["ErrorMessage"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
 	if(!value["Success"].isNull())
 		success_ = value["Success"].asString() == "true";
 

objectdet/src/model/GetVehicleRepairPlanResult.cc

@@ -46,38 +46,38 @@ void GetVehicleRepairPlanResult::parse(const std::string &payload)
 	for (auto dataNodeRepairPartsRepairItems : allRepairPartsNode)
 	{
 		Data::RepairItems repairItemsObject;
-		if(!dataNodeRepairPartsRepairItems["GarageType"].isNull())
-			repairItemsObject.garageType = dataNodeRepairPartsRepairItems["GarageType"].asString();
-		if(!dataNodeRepairPartsRepairItems["OeMatch"].isNull())
-			repairItemsObject.oeMatch = dataNodeRepairPartsRepairItems["OeMatch"].asString() == "true";
-		if(!dataNodeRepairPartsRepairItems["OutStandardPartsId"].isNull())
-			repairItemsObject.outStandardPartsId = dataNodeRepairPartsRepairItems["OutStandardPartsId"].asString();
-		if(!dataNodeRepairPartsRepairItems["OutStandardPartsName"].isNull())
-			repairItemsObject.outStandardPartsName = dataNodeRepairPartsRepairItems["OutStandardPartsName"].asString();
 		if(!dataNodeRepairPartsRepairItems["PartNameMatch"].isNull())
 			repairItemsObject.partNameMatch = dataNodeRepairPartsRepairItems["PartNameMatch"].asString() == "true";
 		if(!dataNodeRepairPartsRepairItems["PartsStdCode"].isNull())
 			repairItemsObject.partsStdCode = dataNodeRepairPartsRepairItems["PartsStdCode"].asString();
-		if(!dataNodeRepairPartsRepairItems["PartsStdName"].isNull())
-			repairItemsObject.partsStdName = dataNodeRepairPartsRepairItems["PartsStdName"].asString();
-		if(!dataNodeRepairPartsRepairItems["RelationType"].isNull())
-			repairItemsObject.relationType = dataNodeRepairPartsRepairItems["RelationType"].asString();
-		if(!dataNodeRepairPartsRepairItems["RepairFee"].isNull())
-			repairItemsObject.repairFee = dataNodeRepairPartsRepairItems["RepairFee"].asString();
+		if(!dataNodeRepairPartsRepairItems["OutStandardPartsName"].isNull())
+			repairItemsObject.outStandardPartsName = dataNodeRepairPartsRepairItems["OutStandardPartsName"].asString();
 		if(!dataNodeRepairPartsRepairItems["RepairType"].isNull())
 			repairItemsObject.repairType = dataNodeRepairPartsRepairItems["RepairType"].asString();
+		if(!dataNodeRepairPartsRepairItems["RepairFee"].isNull())
+			repairItemsObject.repairFee = dataNodeRepairPartsRepairItems["RepairFee"].asString();
+		if(!dataNodeRepairPartsRepairItems["RelationType"].isNull())
+			repairItemsObject.relationType = dataNodeRepairPartsRepairItems["RelationType"].asString();
+		if(!dataNodeRepairPartsRepairItems["GarageType"].isNull())
+			repairItemsObject.garageType = dataNodeRepairPartsRepairItems["GarageType"].asString();
+		if(!dataNodeRepairPartsRepairItems["PartsStdName"].isNull())
+			repairItemsObject.partsStdName = dataNodeRepairPartsRepairItems["PartsStdName"].asString();
+		if(!dataNodeRepairPartsRepairItems["OutStandardPartsId"].isNull())
+			repairItemsObject.outStandardPartsId = dataNodeRepairPartsRepairItems["OutStandardPartsId"].asString();
 		if(!dataNodeRepairPartsRepairItems["RepairTypeName"].isNull())
 			repairItemsObject.repairTypeName = dataNodeRepairPartsRepairItems["RepairTypeName"].asString();
+		if(!dataNodeRepairPartsRepairItems["OeMatch"].isNull())
+			repairItemsObject.oeMatch = dataNodeRepairPartsRepairItems["OeMatch"].asString() == "true";
 		data_.repairParts.push_back(repairItemsObject);
 	}
-	if(!value["Code"].isNull())
-		code_ = value["Code"].asString();
+	if(!value["HttpCode"].isNull())
+		httpCode_ = std::stoi(value["HttpCode"].asString());
 	if(!value["ErrorMessage"].isNull())
 		errorMessage_ = value["ErrorMessage"].asString();
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
 	if(!value["Success"].isNull())
 		success_ = value["Success"].asString() == "true";
-	if(!value["HttpCode"].isNull())
-		httpCode_ = std::stoi(value["HttpCode"].asString());
 
 }
 

objectdet/version-2019-12-30.xml

@@ -1 +1,2 @@
-<?xml version='1.0' encoding='UTF-8'?><Version product="objectdet" apiStyle="RPC" name="2019-12-30" isolationType="outer"><ErrorMapping exceptionExpress=""><ErrorCodes /></ErrorMapping><Apis><Api name="DetectVideoIPCObject" /><Api name="GetAsyncJobResult" /><Api name="DetectIPCObject" /><Api name="DetectVehicleIllegalParking" /><Api name="DetectVehicleICongestion" /><Api name="GenerateVehicleRepairPlan" /><Api name="GetVehicleRepairPlan" /><Api name="DetectTransparentImage" /><Api name="DetectObject" /><Api name="DetectWhiteBaseImage" /><Api name="ClassifyVehicleInsurance" /><Api name="RecognizeVehicleDashboard" /><Api name="RecognizeVehicleDamage" /><Api name="RecognizeVehicleParts" /><Api name="DetectVehicle" /><Api name="DetectMainBody" /></Apis></Version>
+<?xml version="1.0" encoding="utf-8"?>
+<Version name="2019-12-30" product="objectdet" apiStyle="RPC" isolationType="outer"><Parameters/><ErrorMapping/><Apis><Api name="DetectTransparentImage"/><Api name="DetectVehicleICongestion"/><Api name="ClassifyVehicleInsurance"/><Api name="DetectIPCObject"/><Api name="GetVehicleRepairPlan"/><Api name="DetectWhiteBaseImage"/><Api name="DetectVideoIPCObject"/><Api name="GetAsyncJobResult"/><Api name="DetectMainBody"/><Api name="DetectVehicle"/><Api name="DetectVehicleIllegalParking"/><Api name="RecognizeVehicleDamage"/><Api name="RecognizeVehicleDashboard"/><Api name="RecognizeVehicleParts"/><Api name="GenerateVehicleRepairPlan"/><Api name="DetectObject"/></Apis></Version>