fix: 修改抽象client

林本磊
1 parent 9b4524d9
Showing 6 changed files with 44 additions and 15 deletions Show diff stats
src/main/java/com/example/mina/client/base/AbstractClient.java
src/main/java/com/example/mina/client/base/AbstractVirtualBoxClientHandler.java
src/main/java/com/example/mina/client/box/aeroflex/AeroflexClient.java
src/main/java/com/example/mina/client/box/lte3000/Lte3000Client.java
src/main/java/com/example/mina/client/test/MinaClient.java
src/main/java/com/example/mina/server/box/lte3000/Lte3000VirtualBoxHandler.java
@@ -54,24 +54,29 @@ public abstract class AbstractClient {
         // 等待建立连接
         connectFuture.awaitUninterruptibly();
         // 获取连接会话
+        int a = getAttenuation(3);
+
         this.ioSession = connectFuture.getSession();
-        setAttenuation(clientDTO);
-    }
-    public boolean isConnected() {
-        return false;
+        //setAttenuation(clientDTO);
+
+        int b = getAttenuation(3);
     }
-    public void close() {
+    abstract public int getAttenuation(int col);
-    }
+    /*public boolean isConnected() {
+        return false;
+    }*/
+
+    //public void close() {}
     abstract public void setAttenuation(ClientDTO clientDTO);
-    //abstract public int getAttenuation(int row, int col);
-    abstract public Boolean reset();
-    abstract public int[][] getAll();
+    //abstract public Boolean reset();
+
+    //abstract public int[][] getAll();
 }
@@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {
     @Override
     public void messageReceived(IoSession session, Object message) {
-        handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);
+        //handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);
         System.out.println("客户端messageReceived被调用！");
         System.out.println("client端接收信息：" + new String((byte[])message, StandardCharsets.UTF_8));
         LogUtils.println("client端接收信息hex：",(byte[])message);
@@ -36,7 +36,7 @@ public class AeroflexClient extends AbstractClient {
     @Override
     public int getAttenuation(int row, int col) {
         return 0;
-    }*/
+    }
     @Override
     public Boolean reset() {
@@ -46,6 +46,10 @@ public class AeroflexClient extends AbstractClient {
     @Override
     public int[][] getAll() {
         return new int[0][];
-    }
+    }*/
+    @Override
+    public int getAttenuation(int col) {
+        return 0;
+    }
 }
@@ -5,6 +5,7 @@ import com.example.mina.client.entity.ClientDTO;
 import com.example.mina.client.entity.Command;
 import com.example.mina.client.entity.Lte3000Message;
 import com.example.mina.client.entity.ServerMessage;
+import com.example.mina.server.entity.Entry;
 import com.example.mina.server.entity.Lte3000DataBuffer;
 import com.example.mina.server.util.Lte3000CommandHelper;
@@ -45,11 +46,28 @@ public class Lte3000Client extends AbstractClient {
         ioSession.write(cmd);
     }
+    public boolean isCrossPointOn(int row, int col) {
+        return hardwareDataBuffer.getAttenuation(row, col) >= 1;
+    }
+
+    @Override
     public int getAttenuation(int col) {
         return hardwareDataBuffer.getOffset(col);
     }
-    @Override
+    public byte[] genCloseCommand(){
+        return Lte3000CommandHelper.genCommandGetCross(1);
+    }
+
+    public Entry[][] getMatrix(){
+        return hardwareDataBuffer.getMatrixData();
+    }
+
+    public Entry[] getOffsetData(){
+        return hardwareDataBuffer.getOffsetData();
+    }
+
+    /*@Override
     public Boolean reset() {
         return null;
     }
@@ -57,6 +75,6 @@ public class Lte3000Client extends AbstractClient {
     @Override
     public int[][] getAll() {
         return new int[0][];
-    }
+    }*/
 }
@@ -31,7 +31,7 @@ public class MinaClient {
 //        cf.getSession().getCloseFuture().awaitUninterruptibly();
 //
 //        connector.dispose();
-        new Lte3000Client().start(ClientDTO.builder().row(32).col(32).maxAttn(30).build());
+        new Lte3000Client().start(ClientDTO.builder().row(0).col(3).maxAttn(5).build());
     }
	@@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {		@@ -34,7 +34,7 @@ public abstract class AbstractVirtualBoxClientHandler extends IoHandlerAdapter {
34		34
35	@Override	35	@Override
36	public void messageReceived(IoSession session, Object message) {	36	public void messageReceived(IoSession session, Object message) {
37	- handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);	37	+ //handleCommandResponse(clientMessage.getCommands().get(1).getBytes(), (byte[]) message, ((byte[]) message).length);
38	System.out.println("客户端messageReceived被调用！");	38	System.out.println("客户端messageReceived被调用！");
39	System.out.println("client端接收信息：" + new String((byte[])message, StandardCharsets.UTF_8));	39	System.out.println("client端接收信息：" + new String((byte[])message, StandardCharsets.UTF_8));
40	LogUtils.println("client端接收信息hex：",(byte[])message);	40	LogUtils.println("client端接收信息hex：",(byte[])message);
	@@ -31,7 +31,7 @@ public class MinaClient {		@@ -31,7 +31,7 @@ public class MinaClient {
31	// cf.getSession().getCloseFuture().awaitUninterruptibly();	31	// cf.getSession().getCloseFuture().awaitUninterruptibly();
32	//	32	//
33	// connector.dispose();	33	// connector.dispose();
34	- new Lte3000Client().start(ClientDTO.builder().row(32).col(32).maxAttn(30).build());	34	+ new Lte3000Client().start(ClientDTO.builder().row(0).col(3).maxAttn(5).build());
35		35
36		36
37	}	37	}