Skip to content

Commit bc9938b

Browse files
sdk-teamsdk-team
committed
Publish Swift.
1 parent 5d3f641 commit bc9938b

10 files changed

+24
-416
lines changed

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.36.1338
1+
1.36.1339

‎facebody/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ set(facebody_public_header_model
8383
include/alibabacloud/facebody/model/ExtractFingerPrintResult.h
8484
include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttrRequest.h
8585
include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttrResult.h
86-
include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttributeRequest.h
87-
include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttributeResult.h
8886
include/alibabacloud/facebody/model/FaceBeautyRequest.h
8987
include/alibabacloud/facebody/model/FaceBeautyResult.h
9088
include/alibabacloud/facebody/model/FaceFilterRequest.h
@@ -214,8 +212,6 @@ set(facebody_src
214212
src/model/ExtractFingerPrintResult.cc
215213
src/model/ExtractPedestrianFeatureAttrRequest.cc
216214
src/model/ExtractPedestrianFeatureAttrResult.cc
217-
src/model/ExtractPedestrianFeatureAttributeRequest.cc
218-
src/model/ExtractPedestrianFeatureAttributeResult.cc
219215
src/model/FaceBeautyRequest.cc
220216
src/model/FaceBeautyResult.cc
221217
src/model/FaceFilterRequest.cc

‎facebody/include/alibabacloud/facebody/FacebodyClient.h‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,6 @@
8484
#include "model/ExtractFingerPrintResult.h"
8585
#include "model/ExtractPedestrianFeatureAttrRequest.h"
8686
#include "model/ExtractPedestrianFeatureAttrResult.h"
87-
#include "model/ExtractPedestrianFeatureAttributeRequest.h"
88-
#include "model/ExtractPedestrianFeatureAttributeResult.h"
8987
#include "model/FaceBeautyRequest.h"
9088
#include "model/FaceBeautyResult.h"
9189
#include "model/FaceFilterRequest.h"
@@ -252,9 +250,6 @@ namespace AlibabaCloud
252250
typedef Outcome<Error, Model::ExtractPedestrianFeatureAttrResult> ExtractPedestrianFeatureAttrOutcome;
253251
typedef std::future<ExtractPedestrianFeatureAttrOutcome> ExtractPedestrianFeatureAttrOutcomeCallable;
254252
typedef std::function<void(const FacebodyClient*, const Model::ExtractPedestrianFeatureAttrRequest&, const ExtractPedestrianFeatureAttrOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExtractPedestrianFeatureAttrAsyncHandler;
255-
typedef Outcome<Error, Model::ExtractPedestrianFeatureAttributeResult> ExtractPedestrianFeatureAttributeOutcome;
256-
typedef std::future<ExtractPedestrianFeatureAttributeOutcome> ExtractPedestrianFeatureAttributeOutcomeCallable;
257-
typedef std::function<void(const FacebodyClient*, const Model::ExtractPedestrianFeatureAttributeRequest&, const ExtractPedestrianFeatureAttributeOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ExtractPedestrianFeatureAttributeAsyncHandler;
258253
typedef Outcome<Error, Model::FaceBeautyResult> FaceBeautyOutcome;
259254
typedef std::future<FaceBeautyOutcome> FaceBeautyOutcomeCallable;
260255
typedef std::function<void(const FacebodyClient*, const Model::FaceBeautyRequest&, const FaceBeautyOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> FaceBeautyAsyncHandler;
@@ -449,9 +444,6 @@ namespace AlibabaCloud
449444
ExtractPedestrianFeatureAttrOutcome extractPedestrianFeatureAttr(const Model::ExtractPedestrianFeatureAttrRequest &request)const;
450445
void extractPedestrianFeatureAttrAsync(const Model::ExtractPedestrianFeatureAttrRequest& request, const ExtractPedestrianFeatureAttrAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
451446
ExtractPedestrianFeatureAttrOutcomeCallable extractPedestrianFeatureAttrCallable(const Model::ExtractPedestrianFeatureAttrRequest& request) const;
452-
ExtractPedestrianFeatureAttributeOutcome extractPedestrianFeatureAttribute(const Model::ExtractPedestrianFeatureAttributeRequest &request)const;
453-
void extractPedestrianFeatureAttributeAsync(const Model::ExtractPedestrianFeatureAttributeRequest& request, const ExtractPedestrianFeatureAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
454-
ExtractPedestrianFeatureAttributeOutcomeCallable extractPedestrianFeatureAttributeCallable(const Model::ExtractPedestrianFeatureAttributeRequest& request) const;
455447
FaceBeautyOutcome faceBeauty(const Model::FaceBeautyRequest &request)const;
456448
void faceBeautyAsync(const Model::FaceBeautyRequest& request, const FaceBeautyAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
457449
FaceBeautyOutcomeCallable faceBeautyCallable(const Model::FaceBeautyRequest& request) const;

‎facebody/include/alibabacloud/facebody/model/DetectLivingFaceResult.h‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,29 @@ namespace AlibabaCloud
3838
{
3939
struct Result
4040
{
41+
struct Rect
42+
{
43+
long left;
44+
long top;
45+
long height;
46+
long width;
47+
};
4148
struct Frame
4249
{
4350
float rate;
4451
std::string url;
4552
};
53+
std::string messageTips;
4654
std::vector<Result::Frame> frames;
4755
std::string suggestion;
56+
Rect rect;
4857
float rate;
4958
std::string label;
5059
};
5160
std::string taskId;
5261
std::vector<Element::Result> results;
5362
std::string imageURL;
63+
long faceNumber;
5464
};
5565
std::vector<Element> elements;
5666
};

‎facebody/include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttributeRequest.h‎

Lines changed: 0 additions & 60 deletions
This file was deleted.

‎facebody/include/alibabacloud/facebody/model/ExtractPedestrianFeatureAttributeResult.h‎

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎facebody/src/FacebodyClient.cc‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,42 +1167,6 @@ FacebodyClient::ExtractPedestrianFeatureAttrOutcomeCallable FacebodyClient::extr
11671167
return task->get_future();
11681168
}
11691169

1170-
FacebodyClient::ExtractPedestrianFeatureAttributeOutcome FacebodyClient::extractPedestrianFeatureAttribute(const ExtractPedestrianFeatureAttributeRequest &request) const
1171-
{
1172-
auto endpointOutcome = endpointProvider_->getEndpoint();
1173-
if (!endpointOutcome.isSuccess())
1174-
return ExtractPedestrianFeatureAttributeOutcome(endpointOutcome.error());
1175-
1176-
auto outcome = makeRequest(endpointOutcome.result(), request);
1177-
1178-
if (outcome.isSuccess())
1179-
return ExtractPedestrianFeatureAttributeOutcome(ExtractPedestrianFeatureAttributeResult(outcome.result()));
1180-
else
1181-
return ExtractPedestrianFeatureAttributeOutcome(outcome.error());
1182-
}
1183-
1184-
void FacebodyClient::extractPedestrianFeatureAttributeAsync(const ExtractPedestrianFeatureAttributeRequest& request, const ExtractPedestrianFeatureAttributeAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
1185-
{
1186-
auto fn = [this, request, handler, context]()
1187-
{
1188-
handler(this, request, extractPedestrianFeatureAttribute(request), context);
1189-
};
1190-
1191-
asyncExecute(new Runnable(fn));
1192-
}
1193-
1194-
FacebodyClient::ExtractPedestrianFeatureAttributeOutcomeCallable FacebodyClient::extractPedestrianFeatureAttributeCallable(const ExtractPedestrianFeatureAttributeRequest &request) const
1195-
{
1196-
auto task = std::make_shared<std::packaged_task<ExtractPedestrianFeatureAttributeOutcome()>>(
1197-
[this, request]()
1198-
{
1199-
return this->extractPedestrianFeatureAttribute(request);
1200-
});
1201-
1202-
asyncExecute(new Runnable([task]() { (*task)(); }));
1203-
return task->get_future();
1204-
}
1205-
12061170
FacebodyClient::FaceBeautyOutcome FacebodyClient::faceBeauty(const FaceBeautyRequest &request) const
12071171
{
12081172
auto endpointOutcome = endpointProvider_->getEndpoint();

‎facebody/src/model/DetectLivingFaceResult.cc‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ void DetectLivingFaceResult::parse(const std::string &payload)
4848
elementObject.imageURL = dataNodeElementsElement["ImageURL"].asString();
4949
if(!dataNodeElementsElement["TaskId"].isNull())
5050
elementObject.taskId = dataNodeElementsElement["TaskId"].asString();
51+
if(!dataNodeElementsElement["FaceNumber"].isNull())
52+
elementObject.faceNumber = std::stol(dataNodeElementsElement["FaceNumber"].asString());
5153
auto allResultsNode = dataNodeElementsElement["Results"]["Result"];
5254
for (auto dataNodeElementsElementResultsResult : allResultsNode)
5355
{
@@ -58,6 +60,8 @@ void DetectLivingFaceResult::parse(const std::string &payload)
5860
resultsObject.label = dataNodeElementsElementResultsResult["Label"].asString();
5961
if(!dataNodeElementsElementResultsResult["Rate"].isNull())
6062
resultsObject.rate = std::stof(dataNodeElementsElementResultsResult["Rate"].asString());
63+
if(!dataNodeElementsElementResultsResult["MessageTips"].isNull())
64+
resultsObject.messageTips = dataNodeElementsElementResultsResult["MessageTips"].asString();
6165
auto allFramesNode = dataNodeElementsElementResultsResult["Frames"]["Frame"];
6266
for (auto dataNodeElementsElementResultsResultFramesFrame : allFramesNode)
6367
{
@@ -68,6 +72,15 @@ void DetectLivingFaceResult::parse(const std::string &payload)
6872
framesObject.rate = std::stof(dataNodeElementsElementResultsResultFramesFrame["Rate"].asString());
6973
resultsObject.frames.push_back(framesObject);
7074
}
75+
auto rectNode = value["Rect"];
76+
if(!rectNode["Left"].isNull())
77+
resultsObject.rect.left = std::stol(rectNode["Left"].asString());
78+
if(!rectNode["Top"].isNull())
79+
resultsObject.rect.top = std::stol(rectNode["Top"].asString());
80+
if(!rectNode["Width"].isNull())
81+
resultsObject.rect.width = std::stol(rectNode["Width"].asString());
82+
if(!rectNode["Height"].isNull())
83+
resultsObject.rect.height = std::stol(rectNode["Height"].asString());
7184
elementObject.results.push_back(resultsObject);
7285
}
7386
data_.elements.push_back(elementObject);

0 commit comments

Comments
 (0)