support unbind device

VERSION

@@ -1 +1 @@
-1.36.1850
+1.36.1851

avatar/CMakeLists.txt

@@ -27,6 +27,8 @@ set(avatar_public_header_model
 	include/alibabacloud/avatar/model/ClientAuthResult.h
 	include/alibabacloud/avatar/model/ClientStartRequest.h
 	include/alibabacloud/avatar/model/ClientStartResult.h
+	include/alibabacloud/avatar/model/ClientUnbindDeviceRequest.h
+	include/alibabacloud/avatar/model/ClientUnbindDeviceResult.h
 	include/alibabacloud/avatar/model/CloseTimedResetOperateRequest.h
 	include/alibabacloud/avatar/model/CloseTimedResetOperateResult.h
 	include/alibabacloud/avatar/model/ConfirmAvatar2dTrainRequest.h
@@ -88,6 +90,8 @@ set(avatar_src
 	src/model/ClientAuthResult.cc
 	src/model/ClientStartRequest.cc
 	src/model/ClientStartResult.cc
+	src/model/ClientUnbindDeviceRequest.cc
+	src/model/ClientUnbindDeviceResult.cc
 	src/model/CloseTimedResetOperateRequest.cc
 	src/model/CloseTimedResetOperateResult.cc
 	src/model/ConfirmAvatar2dTrainRequest.cc

avatar/include/alibabacloud/avatar/AvatarClient.h

@@ -28,6 +28,8 @@
 #include "model/ClientAuthResult.h"
 #include "model/ClientStartRequest.h"
 #include "model/ClientStartResult.h"
+#include "model/ClientUnbindDeviceRequest.h"
+#include "model/ClientUnbindDeviceResult.h"
 #include "model/CloseTimedResetOperateRequest.h"
 #include "model/CloseTimedResetOperateResult.h"
 #include "model/ConfirmAvatar2dTrainRequest.h"
@@ -98,6 +100,9 @@ namespace AlibabaCloud
 			typedef Outcome<Error, Model::ClientStartResult> ClientStartOutcome;
 			typedef std::future<ClientStartOutcome> ClientStartOutcomeCallable;
 			typedef std::function<void(const AvatarClient*, const Model::ClientStartRequest&, const ClientStartOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ClientStartAsyncHandler;
+			typedef Outcome<Error, Model::ClientUnbindDeviceResult> ClientUnbindDeviceOutcome;
+			typedef std::future<ClientUnbindDeviceOutcome> ClientUnbindDeviceOutcomeCallable;
+			typedef std::function<void(const AvatarClient*, const Model::ClientUnbindDeviceRequest&, const ClientUnbindDeviceOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> ClientUnbindDeviceAsyncHandler;
 			typedef Outcome<Error, Model::CloseTimedResetOperateResult> CloseTimedResetOperateOutcome;
 			typedef std::future<CloseTimedResetOperateOutcome> CloseTimedResetOperateOutcomeCallable;
 			typedef std::function<void(const AvatarClient*, const Model::CloseTimedResetOperateRequest&, const CloseTimedResetOperateOutcome&, const std::shared_ptr<const AsyncCallerContext>&)> CloseTimedResetOperateAsyncHandler;
@@ -190,6 +195,9 @@ namespace AlibabaCloud
 			ClientStartOutcome clientStart(const Model::ClientStartRequest &request)const;
 			void clientStartAsync(const Model::ClientStartRequest& request, const ClientStartAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			ClientStartOutcomeCallable clientStartCallable(const Model::ClientStartRequest& request) const;
+			ClientUnbindDeviceOutcome clientUnbindDevice(const Model::ClientUnbindDeviceRequest &request)const;
+			void clientUnbindDeviceAsync(const Model::ClientUnbindDeviceRequest& request, const ClientUnbindDeviceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
+			ClientUnbindDeviceOutcomeCallable clientUnbindDeviceCallable(const Model::ClientUnbindDeviceRequest& request) const;
 			CloseTimedResetOperateOutcome closeTimedResetOperate(const Model::CloseTimedResetOperateRequest &request)const;
 			void closeTimedResetOperateAsync(const Model::CloseTimedResetOperateRequest& request, const CloseTimedResetOperateAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context = nullptr) const;
 			CloseTimedResetOperateOutcomeCallable closeTimedResetOperateCallable(const Model::CloseTimedResetOperateRequest& request) const;

avatar/include/alibabacloud/avatar/model/ClientUnbindDeviceRequest.h

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_AVATAR_MODEL_CLIENTUNBINDDEVICEREQUEST_H_
+#define ALIBABACLOUD_AVATAR_MODEL_CLIENTUNBINDDEVICEREQUEST_H_
+
+#include <alibabacloud/avatar/AvatarExport.h>
+#include <alibabacloud/core/RpcServiceRequest.h>
+#include <string>
+#include <vector>
+#include <map>
+
+namespace AlibabaCloud {
+namespace Avatar {
+namespace Model {
+class ALIBABACLOUD_AVATAR_EXPORT ClientUnbindDeviceRequest : public RpcServiceRequest {
+public:
+	ClientUnbindDeviceRequest();
+	~ClientUnbindDeviceRequest();
+	long getTenantId() const;
+	void setTenantId(long tenantId);
+	std::string getDeviceId() const;
+	void setDeviceId(const std::string &deviceId);
+
+private:
+	long tenantId_;
+	std::string deviceId_;
+};
+} // namespace Model
+} // namespace Avatar
+} // namespace AlibabaCloud
+#endif // !ALIBABACLOUD_AVATAR_MODEL_CLIENTUNBINDDEVICEREQUEST_H_

avatar/include/alibabacloud/avatar/model/ClientUnbindDeviceResult.h

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ALIBABACLOUD_AVATAR_MODEL_CLIENTUNBINDDEVICERESULT_H_
+#define ALIBABACLOUD_AVATAR_MODEL_CLIENTUNBINDDEVICERESULT_H_
+
+#include <string>
+#include <vector>
+#include <utility>
+#include <alibabacloud/core/ServiceResult.h>
+#include <alibabacloud/avatar/AvatarExport.h>
+
+namespace AlibabaCloud
+{
+	namespace Avatar
+	{
+		namespace Model
+		{
+			class ALIBABACLOUD_AVATAR_EXPORT ClientUnbindDeviceResult : public ServiceResult
+			{
+			public:
+
+
+				ClientUnbindDeviceResult();
+				explicit ClientUnbindDeviceResult(const std::string &payload);
+				~ClientUnbindDeviceResult();
+				std::string getMessage()const;
+				std::string getCode()const;
+				bool getSuccess()const;
+
+			protected:
+				void parse(const std::string &payload);
+			private:
+				std::string message_;
+				std::string code_;
+				bool success_;
+
+			};
+		}
+	}
+}
+#endif // !ALIBABACLOUD_AVATAR_MODEL_CLIENTUNBINDDEVICERESULT_H_

avatar/include/alibabacloud/avatar/model/SubmitAudioTo2DAvatarVideoTaskRequest.h

@@ -31,6 +31,9 @@ public:
 	struct App {
 		std::string appId;
 	};
+	struct AudioInfo {
+		int sampleRate;
+	};
 	struct AvatarInfo {
 		std::string code;
 		int x;
@@ -48,6 +51,8 @@ public:
 	~SubmitAudioTo2DAvatarVideoTaskRequest();
 	App getApp() const;
 	void setApp(const App &app);
+	AudioInfo getAudioInfo() const;
+	void setAudioInfo(const AudioInfo &audioInfo);
 	AvatarInfo getAvatarInfo() const;
 	void setAvatarInfo(const AvatarInfo &avatarInfo);
 	std::string getTitle() const;
@@ -71,6 +76,7 @@ public:
 
 private:
 	App app_;
+	AudioInfo audioInfo_;
 	AvatarInfo avatarInfo_;
 	std::string title_;
 	std::string extParams_;

avatar/include/alibabacloud/avatar/model/SubmitAudioTo3DAvatarVideoTaskRequest.h

@@ -31,6 +31,9 @@ public:
 	struct App {
 		std::string appId;
 	};
+	struct AudioInfo {
+		int sampleRate;
+	};
 	struct AvatarInfo {
 		std::string code;
 		int locate;
@@ -47,6 +50,8 @@ public:
 	~SubmitAudioTo3DAvatarVideoTaskRequest();
 	App getApp() const;
 	void setApp(const App &app);
+	AudioInfo getAudioInfo() const;
+	void setAudioInfo(const AudioInfo &audioInfo);
 	AvatarInfo getAvatarInfo() const;
 	void setAvatarInfo(const AvatarInfo &avatarInfo);
 	std::string getTitle() const;
@@ -70,6 +75,7 @@ public:
 
 private:
 	App app_;
+	AudioInfo audioInfo_;
 	AvatarInfo avatarInfo_;
 	std::string title_;
 	std::string extParams_;

avatar/include/alibabacloud/avatar/model/SubmitTextTo2DAvatarVideoTaskRequest.h

@@ -36,6 +36,7 @@ public:
 		int volume;
 		int speechRate;
 		int pitchRate;
+		int sampleRate;
 	};
 	struct AvatarInfo {
 		std::string code;
@@ -49,6 +50,14 @@ public:
 		std::string backgroundImageUrl;
 		bool isSubtitles;
 		bool subtitleEmbedded;
+		struct SubtitleStyle {
+			std::string color;
+			int size;
+			std::string name;
+			int y;
+			std::string outlineColor;
+		};
+		SubtitleStyle subtitleStyle;
 		int resolution;
 		int alphaFormat;
 	};

avatar/include/alibabacloud/avatar/model/SubmitTextTo3DAvatarVideoTaskRequest.h

@@ -36,6 +36,7 @@ public:
 		int volume;
 		int speechRate;
 		int pitchRate;
+		int sampleRate;
 	};
 	struct AvatarInfo {
 		std::string code;
@@ -48,6 +49,14 @@ public:
 		std::string backgroundImageUrl;
 		bool isSubtitles;
 		bool subtitleEmbedded;
+		struct SubtitleStyle {
+			std::string color;
+			int size;
+			std::string name;
+			int y;
+			std::string outlineColor;
+		};
+		SubtitleStyle subtitleStyle;
 		int resolution;
 		int alphaFormat;
 	};

avatar/src/AvatarClient.cc

@@ -159,6 +159,42 @@ AvatarClient::ClientStartOutcomeCallable AvatarClient::clientStartCallable(const
 	return task->get_future();
 }
 
+AvatarClient::ClientUnbindDeviceOutcome AvatarClient::clientUnbindDevice(const ClientUnbindDeviceRequest &request) const
+{
+	auto endpointOutcome = endpointProvider_->getEndpoint();
+	if (!endpointOutcome.isSuccess())
+		return ClientUnbindDeviceOutcome(endpointOutcome.error());
+
+	auto outcome = makeRequest(endpointOutcome.result(), request);
+
+	if (outcome.isSuccess())
+		return ClientUnbindDeviceOutcome(ClientUnbindDeviceResult(outcome.result()));
+	else
+		return ClientUnbindDeviceOutcome(outcome.error());
+}
+
+void AvatarClient::clientUnbindDeviceAsync(const ClientUnbindDeviceRequest& request, const ClientUnbindDeviceAsyncHandler& handler, const std::shared_ptr<const AsyncCallerContext>& context) const
+{
+	auto fn = [this, request, handler, context]()
+	{
+		handler(this, request, clientUnbindDevice(request), context);
+	};
+
+	asyncExecute(new Runnable(fn));
+}
+
+AvatarClient::ClientUnbindDeviceOutcomeCallable AvatarClient::clientUnbindDeviceCallable(const ClientUnbindDeviceRequest &request) const
+{
+	auto task = std::make_shared<std::packaged_task<ClientUnbindDeviceOutcome()>>(
+			[this, request]()
+			{
+			return this->clientUnbindDevice(request);
+			});
+
+	asyncExecute(new Runnable([task]() { (*task)(); }));
+	return task->get_future();
+}
+
 AvatarClient::CloseTimedResetOperateOutcome AvatarClient::closeTimedResetOperate(const CloseTimedResetOperateRequest &request) const
 {
 	auto endpointOutcome = endpointProvider_->getEndpoint();

avatar/src/model/ClientUnbindDeviceRequest.cc

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/avatar/model/ClientUnbindDeviceRequest.h>
+
+using AlibabaCloud::Avatar::Model::ClientUnbindDeviceRequest;
+
+ClientUnbindDeviceRequest::ClientUnbindDeviceRequest()
+    : RpcServiceRequest("avatar", "2022-01-30", "ClientUnbindDevice") {
+  setMethod(HttpRequest::Method::Post);
+}
+
+ClientUnbindDeviceRequest::~ClientUnbindDeviceRequest() {}
+
+long ClientUnbindDeviceRequest::getTenantId() const {
+  return tenantId_;
+}
+
+void ClientUnbindDeviceRequest::setTenantId(long tenantId) {
+  tenantId_ = tenantId;
+  setParameter(std::string("TenantId"), std::to_string(tenantId));
+}
+
+std::string ClientUnbindDeviceRequest::getDeviceId() const {
+  return deviceId_;
+}
+
+void ClientUnbindDeviceRequest::setDeviceId(const std::string &deviceId) {
+  deviceId_ = deviceId;
+  setParameter(std::string("DeviceId"), deviceId);
+}
+

avatar/src/model/ClientUnbindDeviceResult.cc

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2009-2017 Alibaba Cloud All rights reserved.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <alibabacloud/avatar/model/ClientUnbindDeviceResult.h>
+#include <json/json.h>
+
+using namespace AlibabaCloud::Avatar;
+using namespace AlibabaCloud::Avatar::Model;
+
+ClientUnbindDeviceResult::ClientUnbindDeviceResult() :
+	ServiceResult()
+{}
+
+ClientUnbindDeviceResult::ClientUnbindDeviceResult(const std::string &payload) :
+	ServiceResult()
+{
+	parse(payload);
+}
+
+ClientUnbindDeviceResult::~ClientUnbindDeviceResult()
+{}
+
+void ClientUnbindDeviceResult::parse(const std::string &payload)
+{
+	Json::Reader reader;
+	Json::Value value;
+	reader.parse(payload, value);
+	setRequestId(value["RequestId"].asString());
+	if(!value["Success"].isNull())
+		success_ = value["Success"].asString() == "true";
+	if(!value["Code"].isNull())
+		code_ = value["Code"].asString();
+	if(!value["Message"].isNull())
+		message_ = value["Message"].asString();
+
+}
+
+std::string ClientUnbindDeviceResult::getMessage()const
+{
+	return message_;
+}
+
+std::string ClientUnbindDeviceResult::getCode()const
+{
+	return code_;
+}
+
+bool ClientUnbindDeviceResult::getSuccess()const
+{
+	return success_;
+}
+

avatar/src/model/SubmitAudioTo2DAvatarVideoTaskRequest.cc

@@ -34,6 +34,15 @@ void SubmitAudioTo2DAvatarVideoTaskRequest::setApp(const SubmitAudioTo2DAvatarVi
   setParameter(std::string("App") + ".AppId", app.appId);
 }
 
+SubmitAudioTo2DAvatarVideoTaskRequest::AudioInfo SubmitAudioTo2DAvatarVideoTaskRequest::getAudioInfo() const {
+  return audioInfo_;
+}
+
+void SubmitAudioTo2DAvatarVideoTaskRequest::setAudioInfo(const SubmitAudioTo2DAvatarVideoTaskRequest::AudioInfo &audioInfo) {
+  audioInfo_ = audioInfo;
+  setParameter(std::string("AudioInfo") + ".SampleRate", std::to_string(audioInfo.sampleRate));
+}
+
 SubmitAudioTo2DAvatarVideoTaskRequest::AvatarInfo SubmitAudioTo2DAvatarVideoTaskRequest::getAvatarInfo() const {
   return avatarInfo_;
 }

avatar/src/model/SubmitAudioTo3DAvatarVideoTaskRequest.cc

@@ -34,6 +34,15 @@ void SubmitAudioTo3DAvatarVideoTaskRequest::setApp(const SubmitAudioTo3DAvatarVi
   setParameter(std::string("App") + ".AppId", app.appId);
 }
 
+SubmitAudioTo3DAvatarVideoTaskRequest::AudioInfo SubmitAudioTo3DAvatarVideoTaskRequest::getAudioInfo() const {
+  return audioInfo_;
+}
+
+void SubmitAudioTo3DAvatarVideoTaskRequest::setAudioInfo(const SubmitAudioTo3DAvatarVideoTaskRequest::AudioInfo &audioInfo) {
+  audioInfo_ = audioInfo;
+  setParameter(std::string("AudioInfo") + ".SampleRate", std::to_string(audioInfo.sampleRate));
+}
+
 SubmitAudioTo3DAvatarVideoTaskRequest::AvatarInfo SubmitAudioTo3DAvatarVideoTaskRequest::getAvatarInfo() const {
   return avatarInfo_;
 }

avatar/src/model/SubmitTextTo2DAvatarVideoTaskRequest.cc

@@ -44,6 +44,7 @@ void SubmitTextTo2DAvatarVideoTaskRequest::setAudioInfo(const SubmitTextTo2DAvat
   setParameter(std::string("AudioInfo") + ".Volume", std::to_string(audioInfo.volume));
   setParameter(std::string("AudioInfo") + ".SpeechRate", std::to_string(audioInfo.speechRate));
   setParameter(std::string("AudioInfo") + ".PitchRate", std::to_string(audioInfo.pitchRate));
+  setParameter(std::string("AudioInfo") + ".SampleRate", std::to_string(audioInfo.sampleRate));
 }
 
 SubmitTextTo2DAvatarVideoTaskRequest::AvatarInfo SubmitTextTo2DAvatarVideoTaskRequest::getAvatarInfo() const {
@@ -87,6 +88,11 @@ void SubmitTextTo2DAvatarVideoTaskRequest::setVideoInfo(const SubmitTextTo2DAvat
   setParameter(std::string("VideoInfo") + ".BackgroundImageUrl", videoInfo.backgroundImageUrl);
   setParameter(std::string("VideoInfo") + ".IsSubtitles", videoInfo.isSubtitles ? "true" : "false");
   setParameter(std::string("VideoInfo") + ".SubtitleEmbedded", videoInfo.subtitleEmbedded ? "true" : "false");
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Color", videoInfo.subtitleStyle.color);
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Size", std::to_string(videoInfo.subtitleStyle.size));
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Name", videoInfo.subtitleStyle.name);
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Y", std::to_string(videoInfo.subtitleStyle.y));
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.OutlineColor", videoInfo.subtitleStyle.outlineColor);
   setParameter(std::string("VideoInfo") + ".Resolution", std::to_string(videoInfo.resolution));
   setParameter(std::string("VideoInfo") + ".AlphaFormat", std::to_string(videoInfo.alphaFormat));
 }

avatar/src/model/SubmitTextTo3DAvatarVideoTaskRequest.cc

@@ -44,6 +44,7 @@ void SubmitTextTo3DAvatarVideoTaskRequest::setAudioInfo(const SubmitTextTo3DAvat
   setParameter(std::string("AudioInfo") + ".Volume", std::to_string(audioInfo.volume));
   setParameter(std::string("AudioInfo") + ".SpeechRate", std::to_string(audioInfo.speechRate));
   setParameter(std::string("AudioInfo") + ".PitchRate", std::to_string(audioInfo.pitchRate));
+  setParameter(std::string("AudioInfo") + ".SampleRate", std::to_string(audioInfo.sampleRate));
 }
 
 SubmitTextTo3DAvatarVideoTaskRequest::AvatarInfo SubmitTextTo3DAvatarVideoTaskRequest::getAvatarInfo() const {
@@ -86,6 +87,11 @@ void SubmitTextTo3DAvatarVideoTaskRequest::setVideoInfo(const SubmitTextTo3DAvat
   setParameter(std::string("VideoInfo") + ".BackgroundImageUrl", videoInfo.backgroundImageUrl);
   setParameter(std::string("VideoInfo") + ".IsSubtitles", videoInfo.isSubtitles ? "true" : "false");
   setParameter(std::string("VideoInfo") + ".SubtitleEmbedded", videoInfo.subtitleEmbedded ? "true" : "false");
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Color", videoInfo.subtitleStyle.color);
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Size", std::to_string(videoInfo.subtitleStyle.size));
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Name", videoInfo.subtitleStyle.name);
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.Y", std::to_string(videoInfo.subtitleStyle.y));
+  setParameter(std::string("VideoInfo") + ".SubtitleStyle.OutlineColor", videoInfo.subtitleStyle.outlineColor);
   setParameter(std::string("VideoInfo") + ".Resolution", std::to_string(videoInfo.resolution));
   setParameter(std::string("VideoInfo") + ".AlphaFormat", std::to_string(videoInfo.alphaFormat));
 }