|
|
@@ -123,7 +123,6 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
|
|
|
dispatcher.addAudioProcessor(new PitchProcessor(algo, 44100, 256, (pitchDetectionResult, audioEvent) -> {
|
|
|
int timeStamp = (int) (userMeasureStartTimeMap.get(phone) + audioEvent.getTimeStamp()*1000);
|
|
|
float pitch = pitchDetectionResult.getPitch();
|
|
|
- LOGGER.info("时间：{}，频率：{}", timeStamp, pitch);
|
|
|
recordInfo.add(new MusicPitchDetailDto(timeStamp, pitch));
|
|
|
}));
|
|
|
dispatcher.run();
|
|
|
@@ -282,13 +281,13 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
|
|
|
}
|
|
|
|
|
|
if(userTotalScoreMap.get(phone).containsKey("cadence")){
|
|
|
- userTotalScoreMap.get(phone).put("cadence", intonation.add(userTotalScoreMap.get(phone).get("cadence")));
|
|
|
+ userTotalScoreMap.get(phone).put("cadence", cadence.add(userTotalScoreMap.get(phone).get("cadence")));
|
|
|
}else{
|
|
|
userTotalScoreMap.get(phone).put("cadence", cadence);
|
|
|
}
|
|
|
|
|
|
if(userTotalScoreMap.get(phone).containsKey("integrity")){
|
|
|
- userTotalScoreMap.get(phone).put("integrity", intonation.add(userTotalScoreMap.get(phone).get("integrity")));
|
|
|
+ userTotalScoreMap.get(phone).put("integrity", integrity.add(userTotalScoreMap.get(phone).get("integrity")));
|
|
|
}else{
|
|
|
userTotalScoreMap.get(phone).put("integrity", integrity);
|
|
|
}
|
|
|
@@ -304,6 +303,7 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
|
|
|
BigDecimal score = intonation.multiply(new BigDecimal(0.9)).add(cadence.multiply(new BigDecimal(0.9))).add(integrity.multiply(new BigDecimal(0.1))).setScale(0, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
WS_CLIENTS.get(phone).sendMessage(new TextMessage(JSON.toJSONString(createPushInfo("overall", -1, score, intonation, cadence, integrity))));
|
|
|
+ LOGGER.info("录音频率信息：{}", JSON.toJSONString(userLastMeasurePithInfoMap));
|
|
|
}
|
|
|
|
|
|
private WebSocketInfo createPushInfo(String commond, Integer measureIndex,
|
Joburgess