Merge remote-tracking branch 'origin/master_saas' into master_saas

audio-analysis/src/main/java/com/yonge/netty/dto/UserChannelContext.java

@@ -2,7 +2,6 @@ package com.yonge.netty.dto;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -15,6 +14,7 @@ import java.util.stream.Collectors;
 
 import javax.sound.sampled.AudioFormat;
 
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -36,7 +36,7 @@ public class UserChannelContext {
 	private final static Logger LOGGER = LoggerFactory.getLogger(UserChannelContext.class);
 	
 	//打击乐
-	private final static List<Integer> percussionList = Arrays.asList(23, 113, 121);
+	//private final static List<Integer> percussionList = Arrays.asList(23, 113, 121);
 	
 	private final static int MIN_FREQUECY = 43;
 	
@@ -58,6 +58,8 @@ public class UserChannelContext {
 	
 	private Integer subjectId;
 	
+	private String evaluationCriteria;
+	
 	private float beatDuration;
 	
 	private boolean delayProcessed;
@@ -120,11 +122,12 @@ public class UserChannelContext {
 		return result;
 	}
 	
-	public void init(String platform, String heardLevel, int subjectId, float beatDuration,float sampleRate, int bufferSize) {
-		this.platform = platform;
-		this.subjectId = subjectId;
-		this.beatDuration = beatDuration;
-		hardLevel = HardLevelEnum.valueOf(heardLevel);
+	public void init(MusicXmlBasicInfo musicXmlBasicInfo, float sampleRate, int bufferSize) {
+		this.platform = musicXmlBasicInfo.getPlatform();
+		this.subjectId = musicXmlBasicInfo.getSubjectId();
+		this.beatDuration = musicXmlBasicInfo.getBeatLength();
+		this.hardLevel = HardLevelEnum.valueOf(musicXmlBasicInfo.getHeardLevel());
+		this.evaluationCriteria = musicXmlBasicInfo.getEvaluationCriteria();
 		if(detector == null){
 			detector = new FastYin(sampleRate, bufferSize);
 		}
@@ -327,13 +330,18 @@ public class UserChannelContext {
 		//int playFrequency = (int) frequencyDetector.getFrequency(samples);
 		
 		int playFrequency = -1;
-		if(!percussionList.contains(subjectId)){
+		if(StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.FREQUENCY.getCode())){
 			playFrequency = (int)detector.getPitch(samples).getPitch();
 		}
 		
 		int splDb = (int) Signals.soundPressureLevel(samples);
 		int power = (int) Signals.power(samples);
-		int amplitude = (int) Signals.norm(samples);
+		int amplitude = 0;
+		if(StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.AMPLITUDE.getCode())) {
+			amplitude = (int) Signals.norm(samples);
+		}else if(StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.DECIBELS.getCode())){
+			amplitude = (int) Signals.decibels(samples) >= 38 ? 10 : 1;
+		}
 		//float rms = Signals.rms(samples);
 		
 		double durationTime = 1000 * (samples.length * 2) / audioFormat.getSampleRate() / (audioFormat.getSampleSizeInBits() / 8);
@@ -369,7 +377,7 @@ public class UserChannelContext {
 			totalChunkAnalysisList.add(chunkAnalysis);
 			
 			boolean flag = false; //是否收到有效信号
-			if(percussionList.contains(subjectId)){
+			if(!StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.FREQUENCY.getCode())){
 				flag = chunkAnalysis.getAmplitude() > hardLevel.getAmplitudeThreshold();
 			}else{
 				flag = chunkAnalysis.getFrequency() > MIN_FREQUECY && chunkAnalysis.getFrequency() < MAX_FREQUECY;
@@ -395,7 +403,7 @@ public class UserChannelContext {
 				
 				//判断节奏(音符持续时间内有不间断的音高，就节奏正确)
 				boolean tempo = true;
-				if (percussionList.contains(subjectId)) {
+				if (!StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.FREQUENCY.getCode())) {
 					noteAnalysis.setPlayFrequency(-1);
 					tempo = computeTempoWithAmplitude2(musicXmlNote);
 				}else{
@@ -539,7 +547,7 @@ public class UserChannelContext {
 		
 		double playDurationTime = 0;
 		
-		if (percussionList.contains(subjectId)) {
+		if (!StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.FREQUENCY.getCode())) {
 			if (noteAnalysis.getFrequency() == -1) {// 休止符
 				if (!noteAnalysis.isTempo()) {
 					noteAnalysis.setMusicalErrorType(NoteErrorType.CADENCE_WRONG);
@@ -622,7 +630,7 @@ public class UserChannelContext {
 			noteAnalysis.setIntegrityScore(integrityScore);
 		}
 		noteAnalysis.setIntonationScore(intonationScore);
-		if (percussionList.contains(subjectId)) {
+		if (!StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.FREQUENCY.getCode())) {
 			noteAnalysis.setScore(tempoScore);
 		} else {
 			noteAnalysis.setScore(new BigDecimal(intonationScore + tempoScore + integrityScore).divide(new BigDecimal(3), 2).setScale(0, BigDecimal.ROUND_UP)
@@ -950,7 +958,7 @@ public class UserChannelContext {
 			return musicXmlNote.getTimeStamp() + dynamicOffset;
 		}
 		
-		if (percussionList.contains(subjectId)) {
+		if (!StringUtils.equalsIgnoreCase(evaluationCriteria, EvaluationCriteriaEnum.FREQUENCY.getCode())) {
 			Optional<ChunkAnalysis> optional = chunkAnalysisList.stream().filter(t -> t.getAmplitude() > hardLevel.getAmplitudeThreshold()).findFirst();
 			if(optional.isPresent()){
 				LOGGER.debug("范围内查询到信号,correctedStartTime:{}", optional.get().getStartTime());

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -126,8 +126,7 @@ public class AudioCompareHandler implements MessageHandler {
 			channelContext.setHandlerSwitch(false);
 
 			channelContext.getSongMusicXmlMap().put(musicXmlBasicInfo.getExamSongId(), musicXmlBasicInfo);
-			channelContext.init(musicXmlBasicInfo.getPlatform(), musicXmlBasicInfo.getHeardLevel(), musicXmlBasicInfo.getSubjectId(),
-					musicXmlBasicInfo.getBeatLength(), audioFormat.getSampleRate(), bufferSize / 2);
+			channelContext.init(musicXmlBasicInfo, audioFormat.getSampleRate(), bufferSize / 2);
 			channelContext.setUser(user);
 			
 			userChannelContextService.register(channel, channelContext);

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImLiveBroadcastRoomServiceImpl.java

@@ -872,7 +872,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 log.debug("opsRoom>>>> userRoom is not exists, userState: {}", JSON.toJSONString(userState));
                 return;
             }
-            String roomUid = userRoom.get();
+            String roomUid = Optional.ofNullable(user.getRoomUid()).orElse(userRoom.get());
 
             //向直播间发送当前在线人数消息
             ImLiveBroadcastRoomVo roomVo = this.getImLiveBroadcastRoomVo(roomUid);
@@ -2417,6 +2417,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             imUserState.setStatus(onlineStatus == 1 && liveRoomStatus == 1?"0":"1");
             imUserState.setOs(callbackOnMemberStateChange.getOptPlatform());
             imUserState.setTime(new Date().getTime());
+            imUserState.setRoomUid(callbackOnMemberStateChange.getGroupId());
             imUserStates.add(imUserState);
         }
         opsRoom(imUserStates);
@@ -2449,6 +2450,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             imUserState.setStatus("3");
             imUserState.setOs(callbackAfterMemberExit.getOptPlatform());
             imUserState.setTime(callbackAfterMemberExit.getEventTime().atZone(ZoneId.systemDefault()).toEpochSecond());
+            imUserState.setRoomUid(callbackAfterMemberExit.getGroupId());
             imUserStates.add(imUserState);
         }
         opsRoom(imUserStates);
@@ -2492,6 +2494,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
             imUserState.setStatus(userMap.getOrDefault(userId.intValue(), new ImLiveBroadcastRoomMember()).getOnlineStatus() == 1 ? "0" : "1");
             imUserState.setOs(callbackAfterNewMemberJoin.getOptPlatform());
             imUserState.setTime(callbackAfterNewMemberJoin.getEventTime().atZone(ZoneId.systemDefault()).toEpochSecond());
+            imUserState.setRoomUid(callbackAfterNewMemberJoin.getGroupId());
             imUserStates.add(imUserState);
         }
         opsRoom(imUserStates);

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImUserState.java

@@ -28,6 +28,16 @@ public class ImUserState implements Serializable {
      */
     private String clientIp;
 
+    private String roomUid;
+
+    public String getRoomUid() {
+        return roomUid;
+    }
+
+    public void setRoomUid(String roomUid) {
+        this.roomUid = roomUid;
+    }
+
     public String getUserid() {
         return userid;
     }