fanwuyang/SENG302
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'cbt-multi-controller' of eng-git.canterbury.ac.nz:seng302-2017/team-7 into cbt-multi-controller

Browse Source
This commit is contained in:
fjc40
2017-07-27 14:08:19 +12:00
parent 1b5926007c 67c7c88b32
commit 669b8167cd
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
racevisionGame/src/main/java/visualiser/gameController/ControllerClient.java
+3 -2
View File
@@ -52,15 +52,16 @@ public class ControllerClient {
byte[] bytes = new byte[4]; byte[] bytes = new byte[4];
ByteBuffer.wrap(bytes).putInt(key.getProtocolCode()); ByteBuffer.wrap(bytes).putInt(key.getProtocolCode());
BoatActionEnum boatActionEnum = BoatActionEnum.fromByte(bytes[3]);
BoatAction boatAction = new BoatAction(BoatActionEnum.fromByte(bytes[3])); BoatAction boatAction = new BoatAction(boatActionEnum);
byte[] encodedBoatAction = RaceVisionByteEncoder.boatActionMessage(boatAction); byte[] encodedBoatAction = RaceVisionByteEncoder.boatActionMessage(boatAction);
BinaryMessageEncoder binaryMessage = new BinaryMessageEncoder(MessageType.BOATACTION, System.currentTimeMillis(), 0, BinaryMessageEncoder binaryMessage = new BinaryMessageEncoder(MessageType.BOATACTION, System.currentTimeMillis(), 0,
(short) encodedBoatAction.length, encodedBoatAction); (short) encodedBoatAction.length, encodedBoatAction);
System.out.println("Sending out key: " + protocolCode); System.out.println("Sending out key: " + boatActionEnum);
outputStream.write(binaryMessage.getFullMessage()); outputStream.write(binaryMessage.getFullMessage());
} }
} }
racevisionGame/src/main/java/visualiser/gameController/ControllerServer.java
+1 -2
View File
@@ -49,8 +49,7 @@ public class ControllerServer implements Runnable {
BinaryMessageDecoder encodedMessage = new BinaryMessageDecoder(message); BinaryMessageDecoder encodedMessage = new BinaryMessageDecoder(message);
BoatActionDecoder boatActionDecoder = new BoatActionDecoder(encodedMessage.getMessageBody()); BoatActionDecoder boatActionDecoder = new BoatActionDecoder(encodedMessage.getMessageBody());
BoatActionEnum decodedMessage = boatActionDecoder.getBoatAction(); BoatActionEnum decodedMessage = boatActionDecoder.getBoatAction();
int key = decodedMessage.getValue(); System.out.println("Received key: " + decodedMessage);
System.out.println("Received key: " + key);
} }
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();