diff --git a/src/drawApp/lineNetApp.ts b/src/drawApp/lineNetApp.ts index 04b7cf8..7379894 100644 --- a/src/drawApp/lineNetApp.ts +++ b/src/drawApp/lineNetApp.ts @@ -1,7 +1,7 @@ import { GraphicApp, GraphicData, GraphicState } from 'src/jl-graphic'; import { getPublishLineNet } from 'src/api/PublishApi'; import { graphicData } from 'src/protos/stationLayoutGraphics'; -// import { state } from 'src/protos/ws_message'; +import { state } from 'src/protos/ws_message'; import { RunLine, RunLineTemplate } from 'src/graphics/runLine/RunLine'; import { @@ -25,10 +25,10 @@ import { RectData } from './graphics/RectInteraction'; import { useLineNetStore } from 'src/stores/line-net-store'; import { toUint8Array } from 'js-base64'; -// import { getWebsocketUrl } from 'src/configs/UrlManage'; -// import { getJwtToken } from 'src/configs/TokenManage'; -// import { alert } from 'src/protos/alertInfo'; -// import { QNotifyUpdateOptions, Notify } from 'quasar'; +import { getWebsocketUrl } from 'src/configs/UrlManage'; +import { getJwtToken } from 'src/configs/TokenManage'; +import { alert } from 'src/protos/alertInfo'; +import { QNotifyUpdateOptions, Notify } from 'quasar'; let lineNetApp: GraphicApp | null = null; @@ -107,43 +107,43 @@ export async function loadLineNetDatas(app: GraphicApp) { pathLineList.forEach((pathLine) => { pathLine.visible = false; }); - // app.enableWsMassaging({ - // wsUrl: `${getWebsocketUrl()}`, - // token: getJwtToken() as string, - // }); - // app.subscribe({ - // destination: '/queue/lineNet', - // messageConverter: (message: Uint8Array) => { - // const storage = state.WsLineNetMessage.deserialize(message); - // const states: GraphicState[] = []; - // storage.offset.forEach((item) => { - // states.push(new TrainLineState(item)); - // }); - // return states; - // }, - // }); - // app.subscribe({ - // destination: '/queue/xian/ncc/alert', - // messageHandle: (message: Uint8Array) => { - // const storage = alert.NccAlertInfoMessage.deserialize(message); - // lineNetStore.setAlarmInfo(storage.messages as []); - // }, - // }); - // let msgNotify: null | ((props?: QNotifyUpdateOptions | undefined) => void) = - // null; - // app.on('websocket-connect-state-change', (connected) => { - // if (!connected && !msgNotify) { - // msgNotify = Notify.create({ - // type: 'negative', - // timeout: 0, - // position: 'top-right', - // message: '通信链接已断开!', - // }); - // } else if (msgNotify && connected) { - // msgNotify(); - // msgNotify = null; - // } - // }); + app.enableWsMassaging({ + wsUrl: `${getWebsocketUrl()}`, + token: getJwtToken() as string, + }); + app.subscribe({ + destination: '/queue/lineNet', + messageConverter: (message: Uint8Array) => { + const storage = state.WsLineNetMessage.deserialize(message); + const states: GraphicState[] = []; + storage.offset.forEach((item) => { + states.push(new TrainLineState(item)); + }); + return states; + }, + }); + app.subscribe({ + destination: '/queue/xian/ncc/alert', + messageHandle: (message: Uint8Array) => { + const storage = alert.NccAlertInfoMessage.deserialize(message); + lineNetStore.setAlarmInfo(storage.messages as []); + }, + }); + let msgNotify: null | ((props?: QNotifyUpdateOptions | undefined) => void) = + null; + app.on('websocket-connect-state-change', (connected) => { + if (!connected && !msgNotify) { + msgNotify = Notify.create({ + type: 'negative', + timeout: 0, + position: 'top-right', + message: '通信链接已断开!', + }); + } else if (msgNotify && connected) { + msgNotify(); + msgNotify = null; + } + }); } else { app.loadGraphic([]); }