From 127b948d848eaffa7230e5f3799cfd4a17574960 Mon Sep 17 00:00:00 2001 From: ymr Date: Fri, 11 Jul 2014 19:45:47 +0800 Subject: [PATCH 1/2] for chinajoy. --- src/main/example/ChatServer.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/example/ChatServer.java b/src/main/example/ChatServer.java index a27cb0ee0..be7411e4c 100644 --- a/src/main/example/ChatServer.java +++ b/src/main/example/ChatServer.java @@ -61,7 +61,18 @@ public static void main( String[] args ) throws InterruptedException , IOExcepti BufferedReader sysin = new BufferedReader( new InputStreamReader( System.in ) ); while ( true ) { String in = sysin.readLine(); - s.sendToAll( in ); + if (!in.equals("")){ + if (in.equals("o")) { + s.sendToAll( "open_camera" ); + } else if (in.equals("s")) { + s.sendToAll( "start" ); + } else if (in.equals("t")) { + s.sendToAll( "stop" ); + } else if (in.equals("h")) { + s.sendToAll( "home" ); + } + } + if( in.equals( "exit" ) ) { s.stop(); break; @@ -72,7 +83,8 @@ public static void main( String[] args ) throws InterruptedException , IOExcepti } } } - @Override + + @Override public void onError( WebSocket conn, Exception ex ) { ex.printStackTrace(); if( conn != null ) { From 43dfe94e47c35d5e099745659288af3c91df8b00 Mon Sep 17 00:00:00 2001 From: ymr Date: Tue, 15 Jul 2014 16:56:23 +0800 Subject: [PATCH 2/2] add some cmd. --- src/main/example/ChatServer.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/example/ChatServer.java b/src/main/example/ChatServer.java index be7411e4c..d0d27c664 100644 --- a/src/main/example/ChatServer.java +++ b/src/main/example/ChatServer.java @@ -62,14 +62,17 @@ public static void main( String[] args ) throws InterruptedException , IOExcepti while ( true ) { String in = sysin.readLine(); if (!in.equals("")){ + s.sendToAll("wake"); if (in.equals("o")) { s.sendToAll( "open_camera" ); } else if (in.equals("s")) { - s.sendToAll( "start" ); + s.sendToAll( "start_" + (System.currentTimeMillis() + 5000) ); } else if (in.equals("t")) { - s.sendToAll( "stop" ); + s.sendToAll( "stop_" + (System.currentTimeMillis() + 5000) ); } else if (in.equals("h")) { s.sendToAll( "home" ); + } else if (in.equals("w")) { + s.sendToAll("wake"); } }