diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index 05d4204..93b84a5 100644 --- a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java +++ b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java @@ -10,7 +10,7 @@ public class HelloWorld { @GET public String getHello() { - return "12/21-10:50 WebSocketのコード追加"; + return "12/21-12:22 ログ出力"; } } diff --git a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java index afee617..2b56d60 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java @@ -54,23 +54,35 @@ //stateを変更して、全体の画面を変更させるように導く処理 session.getBasicRemote().sendText(nickname+state+"が正常に渡された!"); RoomManager rm = RoomManager.getInstance(); + session.getBasicRemote().sendText(nickname+state+"1"); Room room = rm.getRoom(rid); + session.getBasicRemote().sendText(nickname+state+"2"); if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 room.setState(state); //部屋の情報を変更 + session.getBasicRemote().sendText(nickname+state+"3"); String path; path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; + session.getBasicRemote().sendText(nickname+state+"4"); KeywordManager km = KeywordManager.getInstance(); + session.getBasicRemote().sendText(nickname+state+"5"); String[] keywords = km.getKeywords(path); + session.getBasicRemote().sendText(nickname+state+"6"); Game game = new Game(room, keywords); + session.getBasicRemote().sendText(nickname+state+"7"); // 同じridのメンバーに一斉にメッセージ送って、画面を切り替えさせる // 本来はここに処理を書くべきではないかも。 for(Map.Entry entry : sessionMap.entrySet()) { if(entry.getKey().contains(rid)){ + session.getBasicRemote().sendText(nickname+state+"8"); entry.getValue().getBasicRemote().sendText("changeState-2"); + session.getBasicRemote().sendText(nickname+state+"9"); } } + session.getBasicRemote().sendText(nickname+state+"10"); + } + session.getBasicRemote().sendText(nickname+state+"11"); } return "WebSocketでメッセージを受信しました!";