Merge remote-tracking branch 'origin/feature-BOX一期' into feature-BOX一期
This commit is contained in:
commit
57b43d3ce7
@ -251,7 +251,7 @@ public class BaseWebSocketProcess {
|
|||||||
//做相应的动作
|
//做相应的动作
|
||||||
baseSession.getMusic().setPlay(action.getSystemTalkAnswerConfigEntity().getPlayType());
|
baseSession.getMusic().setPlay(action.getSystemTalkAnswerConfigEntity().getPlayType());
|
||||||
resp.setMusic(baseSession.getMusic());
|
resp.setMusic(baseSession.getMusic());
|
||||||
resp.setText("已" + action.getAction());
|
resp.setText("已" + action.getAction() + baseSession.getMusic().getSinger());
|
||||||
resp.setType(action.getSystemTalkAnswerConfigEntity().getAnswerType());
|
resp.setType(action.getSystemTalkAnswerConfigEntity().getAnswerType());
|
||||||
sendMessage(action, baseSession, resp);
|
sendMessage(action, baseSession, resp);
|
||||||
}else{
|
}else{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user