林本磊 / virtualbox

Download as
Browse Code »

Commit f22f44550c4b47f06ebcd05a685b2376a5062c0c

Authored by dy
1 parent 41434f30
Exists in develop

fix: 修改lte3000客户端

Showing 6 changed files with 101 additions and 23 deletions   Show diff stats
src/main/java/com/example/mina/client/aeroflex/AeroflexClient.java
  Diff comments   View file @f22f445
1 package com.example.mina.client.aeroflex; 1 package com.example.mina.client.aeroflex;
2 2
3 import com.example.mina.client.base.AbstractClient; 3 import com.example.mina.client.base.AbstractClient;
4 -import com.example.mina.client.base.AbstractVirtualBoxClientHandler;  
5 import com.example.mina.client.coder.ByteFactory; 4 import com.example.mina.client.coder.ByteFactory;
6 import com.example.mina.client.entity.AbstractClientMessage; 5 import com.example.mina.client.entity.AbstractClientMessage;
7 import com.example.mina.server.entity.AeroflexDataBuffer; 6 import com.example.mina.server.entity.AeroflexDataBuffer;
8 -import org.apache.mina.filter.codec.ProtocolCodecFactory;  
9 7
10 /** 8 /**
11 * @author dy 9 * @author dy
@@ -16,7 +14,7 @@ public class AeroflexClient extends AbstractClient { @@ -16,7 +14,7 @@ public class AeroflexClient extends AbstractClient {
16 @Override 14 @Override
17 protected void init(AbstractClientMessage abstractClientMessage) { 15 protected void init(AbstractClientMessage abstractClientMessage) {
18 protocolCodecFactory = new ByteFactory(); 16 protocolCodecFactory = new ByteFactory();
19 - abstractVirtualBoxClientHandler = new AeroflexClientHandler(abstractClientMessage); 17 + abstractVirtualBoxClientHandler = new AeroflexClientHandler(abstractClientMessage, hardwareDataBuffer);
20 } 18 }
21 19
22 @Override 20 @Override
src/main/java/com/example/mina/client/aeroflex/AeroflexClientHandler.java
  Diff comments   View file @f22f445
@@ -3,6 +3,7 @@ package com.example.mina.client.aeroflex; @@ -3,6 +3,7 @@ package com.example.mina.client.aeroflex;
3 import com.example.mina.client.base.AbstractVirtualBoxClientHandler; 3 import com.example.mina.client.base.AbstractVirtualBoxClientHandler;
4 import com.example.mina.client.entity.AbstractClientMessage; 4 import com.example.mina.client.entity.AbstractClientMessage;
5 import com.example.mina.client.entity.Command; 5 import com.example.mina.client.entity.Command;
  6 +import com.example.mina.server.base.AbstractHardwareDataBuffer;
6 7
7 /** 8 /**
8 * @author dy 9 * @author dy
@@ -10,8 +11,9 @@ import com.example.mina.client.entity.Command; @@ -10,8 +11,9 @@ import com.example.mina.client.entity.Command;
10 */ 11 */
11 public class AeroflexClientHandler extends AbstractVirtualBoxClientHandler { 12 public class AeroflexClientHandler extends AbstractVirtualBoxClientHandler {
12 13
13 - public AeroflexClientHandler(AbstractClientMessage clientMessage) {  
14 - super(clientMessage); 14 + public AeroflexClientHandler(AbstractClientMessage clientMessage,
  15 + AbstractHardwareDataBuffer abstractHardwareDataBuffer) {
  16 + super(clientMessage, abstractHardwareDataBuffer);
15 } 17 }
16 18
17 @Override 19 @Override
src/main/java/com/example/mina/client/base/AbstractClient.java
  Diff comments   View file @f22f445
1 package com.example.mina.client.base; 1 package com.example.mina.client.base;
2 2
3 import com.example.mina.client.entity.AbstractClientMessage; 3 import com.example.mina.client.entity.AbstractClientMessage;
4 -import com.example.mina.client.entity.Command;  
5 import com.example.mina.server.base.AbstractHardwareDataBuffer; 4 import com.example.mina.server.base.AbstractHardwareDataBuffer;
6 import org.apache.mina.core.service.IoConnector; 5 import org.apache.mina.core.service.IoConnector;
7 import org.apache.mina.filter.codec.ProtocolCodecFactory; 6 import org.apache.mina.filter.codec.ProtocolCodecFactory;
@@ -9,7 +8,6 @@ import org.apache.mina.filter.codec.ProtocolCodecFilter; @@ -9,7 +8,6 @@ import org.apache.mina.filter.codec.ProtocolCodecFilter;
9 import org.apache.mina.transport.socket.nio.NioSocketConnector; 8 import org.apache.mina.transport.socket.nio.NioSocketConnector;
10 9
11 import java.net.InetSocketAddress; 10 import java.net.InetSocketAddress;
12 -import java.util.List;  
13 11
14 /** 12 /**
15 * @author dy 13 * @author dy
src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java
  Diff comments   View file @f22f445
@@ -3,29 +3,26 @@ package com.example.mina.client.base; @@ -3,29 +3,26 @@ package com.example.mina.client.base;
3 3
4 import com.example.mina.client.entity.AbstractClientMessage; 4 import com.example.mina.client.entity.AbstractClientMessage;
5 import com.example.mina.client.entity.Command; 5 import com.example.mina.client.entity.Command;
6 -import com.example.mina.server.util.LogUtils;  
7 -import com.example.mina.server.util.Lte3000CommandHelper; 6 +import com.example.mina.server.base.AbstractHardwareDataBuffer;
8 import lombok.Data; 7 import lombok.Data;
9 -import org.apache.mina.core.service.IoConnector;  
10 import org.apache.mina.core.service.IoHandlerAdapter; 8 import org.apache.mina.core.service.IoHandlerAdapter;
11 import org.apache.mina.core.session.IdleStatus; 9 import org.apache.mina.core.session.IdleStatus;
12 import org.apache.mina.core.session.IoSession; 10 import org.apache.mina.core.session.IoSession;
13 -import org.apache.mina.filter.codec.ProtocolCodecFilter;  
14 -import org.apache.mina.filter.codec.textline.LineDelimiter;  
15 -import org.apache.mina.filter.codec.textline.TextLineCodecFactory;  
16 -import org.apache.mina.transport.socket.nio.NioSocketConnector;  
17 11
18 -import java.io.IOException;  
19 -import java.net.InetSocketAddress;  
20 -import java.nio.charset.Charset; 12 +import java.io.UnsupportedEncodingException;
  13 +import java.nio.charset.StandardCharsets;
21 14
22 @Data 15 @Data
23 public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter { 16 public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {
24 17
25 protected AbstractClientMessage clientMessage; 18 protected AbstractClientMessage clientMessage;
26 19
27 - public AbstractVirtualBoxClientHandler(AbstractClientMessage clientMessage) { 20 + protected AbstractHardwareDataBuffer hardwareDataBuffer;
  21 +
  22 + public AbstractVirtualBoxClientHandler(AbstractClientMessage clientMessage,
  23 + AbstractHardwareDataBuffer abstractHardwareDataBuffer) {
28 this.clientMessage = clientMessage; 24 this.clientMessage = clientMessage;
  25 + this.hardwareDataBuffer = abstractHardwareDataBuffer;
29 } 26 }
30 27
31 @Override 28 @Override
@@ -38,13 +35,13 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter { @@ -38,13 +35,13 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {
38 public void messageReceived(IoSession session, Object message) { 35 public void messageReceived(IoSession session, Object message) {
39 handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length); 36 handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);
40 System.out.println("客户端messageReceived被调用！"); 37 System.out.println("客户端messageReceived被调用！");
41 - System.out.println("client端接收信息：" + message.toString()); 38 + System.out.println("client端接收信息：" + new String((byte[])message, StandardCharsets.UTF_8));
42 } 39 }
43 40
44 @Override 41 @Override
45 public void messageSent(IoSession session, Object message) { 42 public void messageSent(IoSession session, Object message) {
46 System.out.println("客户端messageSent被调用！"); 43 System.out.println("客户端messageSent被调用！");
47 - System.out.println("client端发送信息：" + message.toString()); 44 + System.out.println("client端发送信息：" + new String((byte[])message, StandardCharsets.UTF_8));
48 } 45 }
49 46
50 @Override 47 @Override
src/main/java/com/example/mina/client/lte3000/Lte3000Client.java
  Diff comments   View file @f22f445
@@ -18,7 +18,7 @@ public class Lte3000Client extends AbstractClient { @@ -18,7 +18,7 @@ public class Lte3000Client extends AbstractClient {
18 @Override 18 @Override
19 protected void init(AbstractClientMessage abstractClientMessage) { 19 protected void init(AbstractClientMessage abstractClientMessage) {
20 protocolCodecFactory = new ByteFactory(); 20 protocolCodecFactory = new ByteFactory();
21 - abstractVirtualBoxClientHandler = new Lte3000ClientHandler(abstractClientMessage); 21 + abstractVirtualBoxClientHandler = new Lte3000ClientHandler(abstractClientMessage, hardwareDataBuffer);
22 } 22 }
23 23
24 @Override 24 @Override
src/main/java/com/example/mina/client/lte3000/Lte3000ClientHandler.java
View file @f22f445
No preview for this file type