|
@@ -54,24 +54,22 @@ public class RTDEClient implements Runnable {
|
|
|
|
|
|
// Internal method that actually reads the data
|
|
|
private void readSocket() throws IOException, InterruptedException {
|
|
|
- while (true) {
|
|
|
- int length = dis.readShort();
|
|
|
- int type=dis.readByte();
|
|
|
- if(type==waitingRequest.getType()) {
|
|
|
- waitingRequest.read(dis);
|
|
|
- waitingRequestSem.release();
|
|
|
- } else switch(type) {
|
|
|
- case RTDE_TEXT_MESSAGE:
|
|
|
- var rpv = new RtdeTextMessage();
|
|
|
- request(rpv);
|
|
|
- logger.info("RTDE_TEXT_MESSAGE", rpv.text);
|
|
|
- break;
|
|
|
+ int length = dis.readShort();
|
|
|
+ int type=dis.readByte();
|
|
|
+ if(type==waitingRequest.getType()) {
|
|
|
+ waitingRequest.read(dis);
|
|
|
+ waitingRequestSem.release();
|
|
|
+ } else switch(type) {
|
|
|
+ case RTDE_TEXT_MESSAGE:
|
|
|
+ var rpv = new RtdeTextMessage();
|
|
|
+ request(rpv);
|
|
|
+ logger.info("RTDE_TEXT_MESSAGE", rpv.text);
|
|
|
+ break;
|
|
|
|
|
|
- default: {
|
|
|
- logger.warn(String.format("Unexpected package type: %d", type));
|
|
|
- byte[] buf=new byte[length];
|
|
|
- dis.readFully(buf);
|
|
|
- }
|
|
|
+ default: {
|
|
|
+ logger.warn(String.format("Unexpected package type: %d", type));
|
|
|
+ byte[] buf=new byte[length];
|
|
|
+ dis.readFully(buf);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -112,7 +110,9 @@ public class RTDEClient implements Runnable {
|
|
|
public void init() throws IOException, InterruptedException {
|
|
|
var rpv = new RtdeRequestProtocolVersion();
|
|
|
request(rpv);
|
|
|
+ logger.info("RtdeRequestProtocolVersion succes:" + rpv.success);
|
|
|
var ruv = new RtdeRequestURVersion();
|
|
|
request(ruv);
|
|
|
+ logger.info(String.format("RtdeRequestURVersion: %d.%d.%d.%d",ruv.major, ruv.minor, ruv.build, ruv.bugfix));
|
|
|
}
|
|
|
}
|