wulin/qiuguo-iot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
wulin 2023-10-19 16:31:24 +08:00
parent 6a80e2be32
commit 7a652adbab
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iot-modules/iot-box-websocket-api/src/main/java/com/qiuguo/iot/box/websocket/api/handler/BaseWebSocketProcess.java
View File

@ -680,7 +680,7 @@ public class BaseWebSocketProcess {
BoxMessageResp boxMessageResp = new BoxMessageResp(); BoxMessageResp boxMessageResp = new BoxMessageResp();
BeanUtils.copyProperties(baseMessageResp, boxMessageResp); BeanUtils.copyProperties(baseMessageResp, boxMessageResp);
boxMessageResp.setAudio(s); boxMessageResp.setAudio(s);
sendMsg(baseSession, JSONObject.toJSONString(boxMessageResp)); sendMsg(baseSession, JSONObject.toJSONString(boxMessageResp));======
return s; return s;
}).subscribeOn(Schedulers.single()).subscribe(); }).subscribeOn(Schedulers.single()).subscribe();
}else{ }else{