diff --git a/car_srv/kotlinSrv/src/McTransport.kt b/car_srv/kotlinSrv/src/McTransport.kt index 16035a072f2..89b5430faa9 100644 --- a/car_srv/kotlinSrv/src/McTransport.kt +++ b/car_srv/kotlinSrv/src/McTransport.kt @@ -12,7 +12,7 @@ class McTransport() { fun writeToFile(bytes: ByteArray) { println("write: " + bytes) val bytesTemp = bytes - writeStream.write(js("new Buffer(bytesTemp)")); + writeStream.write(js("new Buffer(bytesTemp)")) } fun writeToFile(byte: Byte) { diff --git a/car_srv/kotlinSrv/src/MicroController.kt b/car_srv/kotlinSrv/src/MicroController.kt index 29fd1484fdd..30cd7195dcc 100644 --- a/car_srv/kotlinSrv/src/MicroController.kt +++ b/car_srv/kotlinSrv/src/MicroController.kt @@ -32,12 +32,8 @@ class MicroController private constructor() { fun start() { - if (!isConnected()) { - connectToServer(config.getCarIp(), serverPort) - } + connectToServer(config.getCarIp(), serverPort) -// this.transportFilePath = "./testTtyAcm"//todo need init -// mcTransport.initStreams(transportFilePath) mcTransport.setCallBack { bytes -> println("read: " + bytes.toString()) } @@ -89,7 +85,7 @@ class MicroController private constructor() { } fun isConnected(): Boolean { - return uid != 0 + return transportFilePath != "" } fun rcHeartBeat(sid: Int) { diff --git a/car_srv/kotlinSrv/src/net/server/handlers/main/SetRoute.kt b/car_srv/kotlinSrv/src/net/server/handlers/main/SetRoute.kt index 9ada3086cfb..d1129005850 100644 --- a/car_srv/kotlinSrv/src/net/server/handlers/main/SetRoute.kt +++ b/car_srv/kotlinSrv/src/net/server/handlers/main/SetRoute.kt @@ -3,6 +3,7 @@ package net.server.handlers.main import net.server.handlers.AbstractHandler import CodedInputStream import encodeProtoBuf +import mcTransport /** * Created by user on 7/28/16. @@ -21,6 +22,12 @@ class SetRoute : AbstractHandler { val car = MicroController.instance.car val message = fromServerObjectBuilder.build() message.mergeFrom(CodedInputStream(data)) + if (!MicroController.instance.isConnected()) { + println("mc is disconnected!") + val responseMessage = toServerObjectBuilder.setCode(16).build() + callback.invoke(encodeProtoBuf(responseMessage)) + return + } car.routeExecutor.executeRoute(message) val responseMessage = toServerObjectBuilder.setCode(0).build() callback.invoke(encodeProtoBuf(responseMessage))