Quellcode durchsuchen

feat:小节评分

Joburgess vor 4 Jahren
Ursprung
Commit
468ae5732f
1 geänderte Dateien mit 24 neuen und 0 gelöschten Zeilen
  1. 24 0
      mec-biz/src/main/java/com/ym/mec/biz/handler/WebSocketHandler.java

+ 24 - 0
mec-biz/src/main/java/com/ym/mec/biz/handler/WebSocketHandler.java

@@ -378,11 +378,31 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
                     }
                 }
 
+                //非正常频率次数
+                int errPitchNum = 0;
+
                 if(CollectionUtils.isEmpty(musicalNotesPitchs)){
                     userSoundInfoMap.get(phone).getMusicalNotePitchMap().put(musicXmlInfo.getMusicalNotesIndex(), (float) 0);
                 }else{
                     Map<Integer, Long> collect = musicalNotesPitchs.stream().collect(Collectors.groupingBy(Integer::intValue, Collectors.counting()));
+                    //出现次数最多的频率
                     Integer pitch = collect.entrySet().stream().max(Comparator.comparing(e -> e.getValue())).get().getKey();
+                    boolean ing = false;
+                    int dnum = 0;
+                    for (Integer musicalNotesPitch : musicalNotesPitchs) {
+                        if (!ing && Math.abs(musicalNotesPitch - pitch) <= 20){
+                            ing = true;
+                            continue;
+                        }
+                        if (ing && Math.abs(musicalNotesPitch - pitch) > 20){
+                            dnum++;
+                        }
+                        if (dnum>=2){
+                            dnum = 0;
+                            errPitchNum++;
+                            ing  = false;
+                        }
+                    }
                     userSoundInfoMap.get(phone).getMusicalNotePitchMap().put(musicXmlInfo.getMusicalNotesIndex(), (float) pitch);
                 }
 
@@ -392,6 +412,10 @@ public class WebSocketHandler extends AbstractWebSocketHandler {
                 float intonationDuty = recordValidIntonationNum/compareNum;
                 //有效节奏占比
                 float cadenceDuty = cadenceValidNum/compareNum;
+                //如果错误频率达到一定数值,则当前小节无效
+                if(errPitchNum>=3){
+                    cadenceDuty = 0;
+                }
                 //节奏
                 if(cadenceDuty>=cadenceValidDuty){
                     cadenceNum++;