update

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

@@ -9,20 +9,20 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	 * 完成度范围, 未演奏的范围
 	 */
 	//BEGINNER("入门级", 3, 5, 5, 5, 10, 10, 13, 15, 60, 10), 
-	BEGINNER("入门级", 3, 5, 10, 10, 15, 15, 22, 22, 75, 25), 
+	BEGINNER("入门级", 3, 5, 12, 18, 23, 28, 75, 25), 
 	/**
 	 * 进阶级, 振幅阈值, 频率阈值 <br>
 	 * 节奏有效范围（1分音符）, 节奏有效范围（2分音符）, 节奏有效范围（4分音符）, 节奏有效范围（8分音符）, 节奏有效范围（16分音符）, 节奏有效范围（32分音符）<br>
 	 * 完成度范围, 未演奏的范围
 	 */
-	ADVANCED("进阶级", 3, 5, 8, 8, 12, 12, 20, 20, 85, 15),
+	ADVANCED("进阶级", 3, 5, 10, 15, 20, 25, 85, 15),
 	//ADVANCED("进阶级", 3, 5, 50, 50, 50, 50, 50, 5, 80, 10),
 	/**
 	 * 大师级, 振幅阈值, 频率阈值 <br>
 	 * 节奏有效范围（1分音符）, 节奏有效范围（2分音符）, 节奏有效范围（4分音符）, 节奏有效范围（8分音符）, 节奏有效范围（16分音符）, 节奏有效范围（32分音符）<br>
 	 * 完成度范围, 未演奏的范围
 	 */
-	PERFORMER("大师级", 3, 3, 5, 5, 10, 10, 13, 15, 95, 10);
+	PERFORMER("大师级", 3, 3, 5, 10, 13, 15, 95, 10);
 
 	private String msg;
 
@@ -38,9 +38,6 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 
 	private int tempoEffectiveRangeOf8;
 
-	private int tempoEffectiveRangeOf16;
-
-	private int tempoEffectiveRangeOf32;
 
 	private int integrityRange;
 
@@ -55,13 +52,11 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 	 * @param tempoEffectiveRangeOf2 节奏偏移量百分比（在当前范围内节奏才算正确）
 	 * @param tempoEffectiveRangeOf4 节奏偏移量百分比（在当前范围内节奏才算正确）
 	 * @param tempoEffectiveRangeOf8 节奏偏移量百分比（在当前范围内节奏才算正确）
-	 * @param tempoEffectiveRangeOf16 节奏偏移量百分比（在当前范围内节奏才算正确）
-	 * @param tempoEffectiveRangeOf32 节奏偏移量百分比（在当前范围内节奏才算正确）
 	 * @param integrityRange 完成度范围
 	 * @param notPlayRange 未演奏的范围
 	 */
 	HardLevelEnum(String msg, int amplitudeThreshold, int frequencyThreshold, int tempoEffectiveRangeOf1, int tempoEffectiveRangeOf2,
-			int tempoEffectiveRangeOf4, int tempoEffectiveRangeOf8, int tempoEffectiveRangeOf16, int tempoEffectiveRangeOf32, int integrityRange,
+			int tempoEffectiveRangeOf4, int tempoEffectiveRangeOf8, int integrityRange,
 			int notPlayRange) {
 		this.msg = msg;
 		this.amplitudeThreshold = amplitudeThreshold;
@@ -70,8 +65,6 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 		this.tempoEffectiveRangeOf2 = tempoEffectiveRangeOf2;
 		this.tempoEffectiveRangeOf4 = tempoEffectiveRangeOf4;
 		this.tempoEffectiveRangeOf8 = tempoEffectiveRangeOf8;
-		this.tempoEffectiveRangeOf16 = tempoEffectiveRangeOf16;
-		this.tempoEffectiveRangeOf32 = tempoEffectiveRangeOf32;
 		this.integrityRange = integrityRange;
 		this.notPlayRange = notPlayRange;
 	}
@@ -93,13 +86,13 @@ public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
 		int tempoEffectiveRange = 0;
 		
 		if(duration >= 1000){
-			tempoEffectiveRange = 10;
+			tempoEffectiveRange = tempoEffectiveRangeOf1;
 		}else if(duration >= 500){
-			tempoEffectiveRange = 15;
+			tempoEffectiveRange = tempoEffectiveRangeOf2;
 		}else if(duration >= 200){
-			tempoEffectiveRange = 20;
+			tempoEffectiveRange = tempoEffectiveRangeOf4;
 		}else{
-			tempoEffectiveRange = 25;
+			tempoEffectiveRange = tempoEffectiveRangeOf8;
 		}
 		
 		/*switch (denominator) {