diff --git a/hd-glasses-app/src/pages/hd_map.vue b/hd-glasses-app/src/pages/hd_map.vue index 9a25074..19d5663 100644 --- a/hd-glasses-app/src/pages/hd_map.vue +++ b/hd-glasses-app/src/pages/hd_map.vue @@ -397,7 +397,7 @@ export default { _url = _url + this.navigationStartPoint[1] + ";" _url = _url + this.navigationEndPoint[0] + "," _url = _url + this.navigationEndPoint[1] - _url = _url + "?" + "overview=false&alternatives=true&steps=true"; + _url = _url + "?" + "alternatives=true&steps=true&geometries=geojson"; axios({ @@ -409,25 +409,23 @@ export default { }).then(res => { console.log("================================获取到了导航结果") - res=res.data; + res = res.data; - /* - console.log(res) - if (res.code != "OK") { - return false; - }else { - console.log("================================获取到了导航结果,开始步行导航") - } - */ + /* + console.log(res) + if (res.code != "OK") { + return false; + }else { + console.log("================================获取到了导航结果,开始步行导航") + } + */ let pathList = [startPoint]; - const steps=res.routes[0].legs[0].steps + const coordinates = res.routes[0].geometry.coordinates - steps.map(item0=>{ - item0.intersections.map(item1=>{ - const _point = ol.proj.transform(item1.location,'EPSG:4326', 'EPSG:3857'); - pathList.push(_point) - }) + coordinates.map(item1 => { + const _point = ol.proj.transform(item1, 'EPSG:4326', 'EPSG:3857'); + pathList.push(_point) }) // let _list=res.route[0].legs[0].steps[0].intersections diff --git a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java index d1706ce..a46382c 100644 --- a/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java +++ b/hs-im-server/im-service/src/main/java/com/lld/im/service/call/service/ImCallHistoryService.java @@ -18,9 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.time.Duration; -import java.util.Date; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.concurrent.TimeUnit; @Slf4j @@ -65,11 +63,6 @@ public class ImCallHistoryService { Integer i = Long.valueOf(seconds).intValue(); imCallHistory.setContinueSecond(i); - log.error("===================结束之后通知客户端"); - log.error("===================结束之后通知客户端"); - log.error("===================结束之后通知客户端"); - - //TODO 结束之后通知客户端 SendMessageReq req= new SendMessageReq(); @@ -78,11 +71,19 @@ public class ImCallHistoryService { req.setToId(imCallHistory.getPassiveId()); req.setMessageTime(System.currentTimeMillis()); // req.setMessageRandom(); - req.setMessageBody(JSONObject.toJSONString(imCallHistory)); + req.setMessageId(UUID.randomUUID().toString().replace("-", "")); req.setImei("uniapp"); req.setClientType(1); + + Map data = new HashMap(); + 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); diff --git a/hs-im-server/im-tcp/src/main/resources/web.html b/hs-im-server/im-tcp/src/main/resources/web.html index 8c86711..8f544fe 100644 --- a/hs-im-server/im-tcp/src/main/resources/web.html +++ b/hs-im-server/im-tcp/src/main/resources/web.html @@ -410,7 +410,7 @@ //如果浏览器支持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) {