Merge branch 'music_score'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/WebSocketInfo.java

@@ -3,6 +3,8 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.WebsocketTypeEnum;
 import org.springframework.http.HttpStatus;
 
+import java.util.HashMap;
+
 /**
  * @Author Joburgess
  * @Date 2021/6/17 0017
@@ -74,6 +76,11 @@ public class WebSocketInfo<T> {
         return new WebSocketInfo(new Head(commond));
     }
 
+    public static WebSocketInfo success(String commond, String bodyKey, Object bodyValue){
+        WebSocketInfo webSocketInfo = new WebSocketInfo(new Head(commond));
+        webSocketInfo.setBody(new HashMap<String, Object>(){{put(bodyKey, bodyValue);}});
+        return webSocketInfo;
+    }
 
     public Head getHeader() {
         return header;

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

@@ -91,12 +91,13 @@ public class SoundCheckHandler implements WebSocketEventHandler {
                 if(Math.abs(normalCents - recordCents)<3){
                     userSoundCheckInfo.get(phone).setRightSize(userSoundCheckInfo.get(phone).getRightSize() + audioEvent.getBufferSize());
                     userSoundCheckInfo.get(phone).getErrorNum().set(0);
+                    WebSocketHandler.sendTextMessage(phone, WebSocketInfo.success("checking", "trend", 0));
                 }else if(Math.abs(normalCents - recordCents)>=3){
                     userSoundCheckInfo.get(phone).getErrorNum().getAndIncrement();
+                    WebSocketHandler.sendTextMessage(phone, WebSocketInfo.success("checking", "trend", normalCents>recordCents?-1:1));
                 }
             }));
             dispatcher.run();
-            LOGGER.info(JSONObject.toJSONString(userSoundCheckInfo.get(phone)));
             if(userSoundCheckInfo.get(phone).getRightSize()>SIZE){
                 WebSocketHandler.sendTextMessage(phone, WebSocketInfo.success("checkDone"));
                 userSoundCheckInfo.remove(phone);