From 249d316e0b8c79b71b779b5716bc488e1d08a9b3 Mon Sep 17 00:00:00 2001
From: aix <vip_xiaobin810@163.com>
Date: Tue, 30 Jul 2024 14:48:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ht-dev' into ht-dev
---
src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java b/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java
index 5fef21a..157e000 100644
--- a/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java
+++ b/src/main/java/com/dji/sample/speak/service/SpeakVoiceService.java
@@ -16,8 +16,9 @@
import java.util.List;
public interface SpeakVoiceService {
- int takeVoice(String sn , Integer psdk_index, String name, File file,Integer volumn) throws UnsupportedAudioFileException, IOException;
+ SpeakVoiceEntity takeVoice(String name, File file) throws UnsupportedAudioFileException, IOException;
+ int takeVoicee(String sn , Integer psdk_index, String name, File file,Integer volumn,SpeakVoiceEntity entity);
int restartVoice(String sn ,Integer psdk_index);
int stopVoice(String sn,Integer psdk_index);
@@ -28,5 +29,7 @@
int awayRiver (String sn);
+ int awayCar (String sn);
+
PaginationData<SpeakVoiceEntity> getVoices(Integer pages,Integer page_size);
}
--
Gitblit v1.9.3