From d2d88ecb5fd7407b768a314fb0f88d49c40abbe8 Mon Sep 17 00:00:00 2001
From: rain <167982779@qq.com>
Date: Tue, 30 Jul 2024 19:24:13 +0800
Subject: [PATCH] Merge branch 'ht-dev' of http://139.196.74.78:10010/r/drone/drone-java into ht-dev
---
src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java b/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
index cfe43a8..ca12a9b 100644
--- a/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
+++ b/src/main/java/com/dji/sample/speak/service/serviceImpl/SpeakVoiceServiceImpl.java
@@ -54,9 +54,9 @@
fileDto.setName(name);
dto.setPsdk_index(psdk_index);
dto.setFile(fileDto);
- double time = getAudioDuration(file);
+// double time = getAudioDuration(file);
voiceEntity.setMd5(md5);
- voiceEntity.setSecond(time);
+// voiceEntity.setSecond(time);
voiceEntity.setUrl(url);
voiceEntity.setName(name);
voiceMapper.insert(voiceEntity);
@@ -89,7 +89,7 @@
}
@Override
- public int awayRiver() {
+ public int awayRiver(String sn) {
SpeakVoiceStartDto dto = new SpeakVoiceStartDto();
SpeakVoiceFileDto fileDto = new SpeakVoiceFileDto();
fileDto.setUrl("http://dev.jxpskj.com:9000/cloud-bucket/请远离河道07151604");
@@ -98,7 +98,7 @@
fileDto.setName("河道危险");
dto.setPsdk_index(2);
dto.setFile(fileDto);
- return messageSenderService.publishServicesTopic("4TADKCM0010016", VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
+ return messageSenderService.publishServicesTopic(sn, VoiceEnums.SPEAKER_AUDIO_PLAY_START.getMethod(), dto).getResult();
}
@Override
@@ -121,7 +121,7 @@
String accessKey = pojo.getAccessKey();
String secretKey = pojo.getSecretKey();
String bucketName = pojo.getBucket();
- String objectName = "/" + fileName + getNowTimeName();
+ String objectName = "/" + fileName + getNowTimeName()+"pcm";
FileServiceImpl.uploadFile(endpoint, accessKey, secretKey, bucketName, objectName, file, "audio/mpeg");
return endpoint + "/" + bucketName + objectName;
}
@@ -132,12 +132,12 @@
return currentTime.format(DateTimeFormatter.ofPattern("MMddHHmm"));
}
- public static double getAudioDuration(File file) throws UnsupportedAudioFileException, IOException {
- AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(file);
- AudioFormat format = audioInputStream.getFormat();
- long audioFileLength = file.length();
- int frameSize = format.getFrameSize();
- float frameRate = format.getFrameRate();
- return Math.round(audioFileLength / (frameSize * frameRate));
- }
+// public static double getAudioDuration(File file) throws UnsupportedAudioFileException, IOException {
+// AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(file);
+// AudioFormat format = audioInputStream.getFormat();
+// long audioFileLength = file.length();
+// int frameSize = format.getFrameSize();
+// float frameRate = format.getFrameRate();
+// return Math.round(audioFileLength / (frameSize * frameRate));
+// }
}
--
Gitblit v1.9.3