hsai/im-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

聊天记录

Browse Source
This commit is contained in:
rowger
2023-11-30 15:26:26 +08:00
parent d7d4b7e41c
commit 4a702750d8
3 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
hd-glasses-app/src/pages/hd_map.vue
View File

@@ -397,7 +397,7 @@ export default {
_url = _url + this.navigationStartPoint[1] + ";" _url = _url + this.navigationStartPoint[1] + ";"
_url = _url + this.navigationEndPoint[0] + "," _url = _url + this.navigationEndPoint[0] + ","
_url = _url + this.navigationEndPoint[1] _url = _url + this.navigationEndPoint[1]
_url = _url + "?" + "overview=false&alternatives=true&steps=true"; _url = _url + "?" + "alternatives=true&steps=true&geometries=geojson";
axios({ axios({
@@ -409,25 +409,23 @@ export default {
}).then(res => { }).then(res => {
console.log("================================获取到了导航结果") console.log("================================获取到了导航结果")
res=res.data; res = res.data;
/* /*
console.log(res) console.log(res)
if (res.code != "OK") { if (res.code != "OK") {
return false; return false;
}else { }else {
console.log("================================获取到了导航结果,开始步行导航") console.log("================================获取到了导航结果,开始步行导航")
} }
*/ */
let pathList = [startPoint]; let pathList = [startPoint];
const steps=res.routes[0].legs[0].steps const coordinates = res.routes[0].geometry.coordinates
steps.map(item0=>{ coordinates.map(item1 => {
item0.intersections.map(item1=>{ const _point = ol.proj.transform(item1, 'EPSG:4326', 'EPSG:3857');
const _point = ol.proj.transform(item1.location,'EPSG:4326', 'EPSG:3857'); pathList.push(_point)
pathList.push(_point)
})
}) })
// let _list=res.route[0].legs[0].steps[0].intersections // let _list=res.route[0].legs[0].steps[0].intersections

19
hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java
View File

@@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.time.Duration; import java.time.Duration;
import java.util.Date; import java.util.*;
import java.util.List;
import java.util.UUID;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@Slf4j @Slf4j
@@ -65,11 +63,6 @@ public class ImCallHistoryService {
Integer i = Long.valueOf(seconds).intValue(); Integer i = Long.valueOf(seconds).intValue();
imCallHistory.setContinueSecond(i); imCallHistory.setContinueSecond(i);
log.error("===================结束之后通知客户端");
log.error("===================结束之后通知客户端");
log.error("===================结束之后通知客户端");
//TODO 结束之后通知客户端 //TODO 结束之后通知客户端
SendMessageReq req= new SendMessageReq(); SendMessageReq req= new SendMessageReq();
@@ -78,11 +71,19 @@ public class ImCallHistoryService {
req.setToId(imCallHistory.getPassiveId()); req.setToId(imCallHistory.getPassiveId());
req.setMessageTime(System.currentTimeMillis()); req.setMessageTime(System.currentTimeMillis());
// req.setMessageRandom(); // req.setMessageRandom();
req.setMessageBody(JSONObject.toJSONString(imCallHistory));
req.setMessageId(UUID.randomUUID().toString().replace("-", "")); req.setMessageId(UUID.randomUUID().toString().replace("-", ""));
req.setImei("uniapp"); req.setImei("uniapp");
req.setClientType(1); req.setClientType(1);
Map<String, Object> data = new HashMap<String, Object>();
data.put("userId", imCallHistory.getInviteId());
data.put("msgType", "CALL_"+imCallHistory.getType());
data.put("content", JSONObject.toJSONString(imCallHistory));
req.setMessageBody(JSONObject.toJSONString(data));
p2PMessageService.send(req); p2PMessageService.send(req);

2
hs-im-server/im-tcp/src/main/resources/web.html
View File

@@ -410,7 +410,7 @@
//如果浏览器支持WebSocket //如果浏览器支持WebSocket
if (window.WebSocket) { if (window.WebSocket) {
//参数就是与服务器连接的地址 //参数就是与服务器连接的地址
socket = new WebSocket("ws://192.168.1.117:19000/ws"); socket = new WebSocket("ws://119.45.242.222:29001/ws");
//客户端收到服务器消息的时候就会执行这个回调方法 //客户端收到服务器消息的时候就会执行这个回调方法
socket.onmessage = function (event) { socket.onmessage = function (event) {