Merge branch 'master' of https://github.com/0xcaffebabe/seeaw4

seeaw4_client/src/main/java/wang/ismy/seeaw4/client/Client.java

@@ -65,7 +65,7 @@ public void init() {
         MessageService.getInstance().registerMessageChain(new PrintMessageChain()
                 , PromiseMessageChain.getInstance(),new ClientCommandMessageChain(terminal,localPerList,this));
         // 连接服务端
-        NettyClientConnection connection = new NettyClientConnection("127.0.0.1", 1999);
+        NettyClientConnection connection = new NettyClientConnection("100.64.137.37", 1999);
         connection.bindConnectionListener(connectionListener);
         // 向连接设置客户自定义的连接监听器
         connection.connect();

seeaw4_client/src/main/java/wang/ismy/seeaw4/client/command/ClientCommandHandler.java

@@ -107,7 +107,7 @@ public void onMessage(String msg) {
     }
 
     private Message screen(Connection connection,CommandMessage message){
-        byte[] screen = terminal.getDesktop().getScreen(ImgType.JPEG, Resolution.getDefault());
+        byte[] screen = terminal.getDesktop().getScreen(ImgType.JPEG, new Resolution(1366,768));
         return new ImgMessage(screen,ImgType.JPEG.getFormat());
     }
 

seeaw4_desktop/src/main/java/wang/ismy/seeaw4/desktop/Main.java

@@ -20,7 +20,6 @@ public static void main(String[] args) {
         launch();
     }
 
-
     @Override
     public void start(Stage stage) throws Exception {
         Parent root = FXMLLoader.load(getClass().getResource("/Main.fxml"));

seeaw4_terminal/src/main/java/wang/ismy/seeaw4/terminal/impl/CommonTerminal.java

@@ -46,7 +46,7 @@ private void init(ShellType type) throws IOException{
                 desktop = new WindowsDesktop();
                 break;
             case NIX:
-                desktop = new LinuxDesktop();
+                desktop = new WindowsDesktop();
                 break;
             default:
                 desktop = null;

seeaw4_terminal/src/test/java/wang/ismy/seeaw4/terminal/impl/CommonTerminalTest.java

@@ -0,0 +1,19 @@
+package wang.ismy.seeaw4.terminal.impl;
+
+import org.junit.Test;
+import wang.ismy.seeaw4.terminal.Resolution;
+import wang.ismy.seeaw4.terminal.desktop.impl.WindowsDesktop;
+import wang.ismy.seeaw4.terminal.enums.ImgType;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.Arrays;
+
+public class CommonTerminalTest {
+
+    @Test
+    public void test() throws IOException {
+
+    }
+
+}