azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added debug-mode for UI to central server

Browse Source
This commit is contained in:
dsavvinov
2016-08-26 12:47:52 +03:00
parent 1ae02c367e
commit dd1b4d7777
3 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
proto/protofiles_sources/server_client/mode_change.proto
+1
View File
@@ -4,6 +4,7 @@ message ModeChange {
enum Mode { enum Mode {
ManualControl = 0; ManualControl = 0;
PerimeterBuilding = 1; PerimeterBuilding = 1;
PerimeterDebug = 2;
} }
Mode newMode = 1; Mode newMode = 1;
server/src/main/java/web/server/Handler.kt
-1
View File
@@ -98,7 +98,6 @@ class Handler : SimpleChannelInboundHandler<Any>() {
ctx.writeAndFlush(response).addListener(io.netty.channel.ChannelFutureListener.CLOSE) ctx.writeAndFlush(response).addListener(io.netty.channel.ChannelFutureListener.CLOSE)
} }
Constants.getDebug -> { Constants.getDebug -> {
val msg = RoomModel.getDebugInfo() val msg = RoomModel.getDebugInfo()
val outs = CodedOutputStream(ByteArray(msg.getSizeNoTag())) val outs = CodedOutputStream(ByteArray(msg.getSizeNoTag()))
msg.writeTo(outs) msg.writeTo(outs)
server/src/main/java/web/server/Server.kt
+3 -1
View File
@@ -9,13 +9,15 @@ object Server {
enum class ServerMode { enum class ServerMode {
IDLE, IDLE,
MANUAL_MODE, MANUAL_MODE,
PERIMETER_BUILDING; PERIMETER_BUILDING,
PERIMETER_DEBUG;
companion object { companion object {
fun fromProtoMode(mode: ModeChange.Mode): ServerMode { fun fromProtoMode(mode: ModeChange.Mode): ServerMode {
return when (mode) { return when (mode) {
ModeChange.Mode.ManualControl -> MANUAL_MODE ModeChange.Mode.ManualControl -> MANUAL_MODE
ModeChange.Mode.PerimeterBuilding -> PERIMETER_BUILDING ModeChange.Mode.PerimeterBuilding -> PERIMETER_BUILDING
ModeChange.Mode.PerimeterDebug -> PERIMETER_DEBUG
else -> throw IllegalArgumentException("Illegal argument when parsing ServerMode from Protobuf Mode") else -> throw IllegalArgumentException("Illegal argument when parsing ServerMode from Protobuf Mode")
} }
} }