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

fixed bug with heartbeat

Browse Source 
#story[778]
This commit is contained in:
hba56
2017-04-27 15:53:38 +12:00
parent 949b967abb
commit 246420ccf9
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/seng302/Networking/VisualiserInput.java
+17 -17
View File
@@ -26,18 +26,18 @@ public class VisualiserInput
private ServerSocket visualiserSocket; private ServerSocket visualiserSocket;
private Socket connectionSocket; private Socket connectionSocket;
int heartbeatSeqNum; long heartbeatSeqNum;
VisualiserInput() throws IOException{ VisualiserInput() throws IOException{
//sockets to connect to //sockets to connect to
ServerSocket visualiserSocket = new ServerSocket(4942); // ServerSocket visualiserSocket = new ServerSocket(4942);
Socket connectionSocket = visualiserSocket.accept(); // Socket connectionSocket = visualiserSocket.accept();
//this is the test data that streams form the AC35 website //this is the test data that streams form the AC35 website
// Socket connectionSocket = new Socket("livedata.americascup.com",4941); Socket connectionSocket = new Socket("livedata.americascup.com",4941);
//start Time //start Time
@@ -63,51 +63,51 @@ public class VisualiserInput
case HEARTBEAT: case HEARTBEAT:
lastHeartbeatTime = System.currentTimeMillis(); lastHeartbeatTime = System.currentTimeMillis();
//note: if the program runs for over 340 years, this will crash. //note: if the program runs for over 340 years, this will crash.
heartbeatSeqNum = ByteConverter.bytesToInt(testDecoder.getMessage(), ByteOrder.BIG_ENDIAN); heartbeatSeqNum = ByteConverter.bytesToLong(testDecoder.getMessage());
System.out.println("HeartBeat Message! " + heartbeatSeqNum); System.out.println("HeartBeat Message! " + heartbeatSeqNum);
break; break;
case RACESTATUS: case RACESTATUS:
System.out.println("Race Status Message"); // System.out.println("Race Status Message");
break; break;
case DISPLAYTEXTMESSAGE: case DISPLAYTEXTMESSAGE:
System.out.println("Display Text Message"); // System.out.println("Display Text Message");
//no decoder for this. //no decoder for this.
break; break;
case XMLMESSAGE: case XMLMESSAGE:
System.out.println("XML Message!"); // System.out.println("XML Message!");
XMLMessageDecoder xmlMessageDecoder = new XMLMessageDecoder(testDecoder.getMessage()); XMLMessageDecoder xmlMessageDecoder = new XMLMessageDecoder(testDecoder.getMessage());
xmlMessageDecoder.decode(); xmlMessageDecoder.decode();
System.out.println(xmlMessageDecoder.getXmlMessageInputSource()); System.out.println(xmlMessageDecoder.getXmlMessageInputSource());
break; break;
case RACESTARTSTATUS: case RACESTARTSTATUS:
System.out.println("Race Start Status Message"); // System.out.println("Race Start Status Message");
break; break;
case YACHTEVENTCODE: case YACHTEVENTCODE:
System.out.println("Yacht Action Code!"); // System.out.println("Yacht Action Code!");
//no decoder //no decoder
break; break;
case YACHTACTIONCODE: case YACHTACTIONCODE:
System.out.println("Yacht Action Code!"); // System.out.println("Yacht Action Code!");
//no decoder //no decoder
break; break;
case CHATTERTEXT: case CHATTERTEXT:
System.out.println("Chatter Text Message!"); // System.out.println("Chatter Text Message!");
//no decoder //no decoder
break; break;
case BOATLOCATION: case BOATLOCATION:
System.out.println("Boat Location Message!"); // System.out.println("Boat Location Message!");
break; break;
case MARKROUNDING: case MARKROUNDING:
System.out.println("Mark Rounding Message!"); // System.out.println("Mark Rounding Message!");
break; break;
case COURSEWIND: case COURSEWIND:
System.out.println("Course Wind Message!"); // System.out.println("Course Wind Message!");
break; break;
case AVGWIND: case AVGWIND:
System.out.println("Average Wind Message!"); // System.out.println("Average Wind Message!");
break; break;
default: default:
System.out.println("Broken Message!"); // System.out.println("Broken Message!");
break; break;
} }