add error msg if try send data on mc and he is disconnect

This commit is contained in:
MaximZaitsev
2016-08-17 17:11:01 +03:00
parent bbe506dbb5
commit dfdc231386
3 changed files with 10 additions and 7 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ class McTransport() {
fun writeToFile(bytes: ByteArray) { fun writeToFile(bytes: ByteArray) {
println("write: " + bytes) println("write: " + bytes)
val bytesTemp = bytes val bytesTemp = bytes
writeStream.write(js("new Buffer(bytesTemp)")); writeStream.write(js("new Buffer(bytesTemp)"))
} }
fun writeToFile(byte: Byte) { fun writeToFile(byte: Byte) {
+2 -6
View File
@@ -32,12 +32,8 @@ class MicroController private constructor() {
fun start() { fun start() {
if (!isConnected()) { connectToServer(config.getCarIp(), serverPort)
connectToServer(config.getCarIp(), serverPort)
}
// this.transportFilePath = "./testTtyAcm"//todo need init
// mcTransport.initStreams(transportFilePath)
mcTransport.setCallBack { bytes -> mcTransport.setCallBack { bytes ->
println("read: " + bytes.toString()) println("read: " + bytes.toString())
} }
@@ -89,7 +85,7 @@ class MicroController private constructor() {
} }
fun isConnected(): Boolean { fun isConnected(): Boolean {
return uid != 0 return transportFilePath != ""
} }
fun rcHeartBeat(sid: Int) { fun rcHeartBeat(sid: Int) {
@@ -3,6 +3,7 @@ package net.server.handlers.main
import net.server.handlers.AbstractHandler import net.server.handlers.AbstractHandler
import CodedInputStream import CodedInputStream
import encodeProtoBuf import encodeProtoBuf
import mcTransport
/** /**
* Created by user on 7/28/16. * Created by user on 7/28/16.
@@ -21,6 +22,12 @@ class SetRoute : AbstractHandler {
val car = MicroController.instance.car val car = MicroController.instance.car
val message = fromServerObjectBuilder.build() val message = fromServerObjectBuilder.build()
message.mergeFrom(CodedInputStream(data)) 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) car.routeExecutor.executeRoute(message)
val responseMessage = toServerObjectBuilder.setCode(0).build() val responseMessage = toServerObjectBuilder.setCode(0).build()
callback.invoke(encodeProtoBuf(responseMessage)) callback.invoke(encodeProtoBuf(responseMessage))