diff --git a/local.properties b/local.properties new file mode 100644 index 0000000..64774f4 --- /dev/null +++ b/local.properties @@ -0,0 +1,8 @@ +## This file must *NOT* be checked into Version Control Systems, +# as it contains information specific to your local configuration. +# +# Location of the SDK. This is only used by Gradle. +# For customization when using a Version Control System, please read the +# header note. +#Thu Dec 22 16:17:06 JST 2022 +sdk.dir=/Users/kota/Library/Android/sdk diff --git a/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java b/src/main/java/com/ntlab/irisserver/resources/HelloWorld.java index 1a73529..a3459bf 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/22-14:20 ログ出力7"; + return "12/22-17:00 ログ出力8"; } } diff --git a/src/main/java/com/ntlab/irisserver/resources/StateRest.java b/src/main/java/com/ntlab/irisserver/resources/StateRest.java index 59fdf0d..9402658 100644 --- a/src/main/java/com/ntlab/irisserver/resources/StateRest.java +++ b/src/main/java/com/ntlab/irisserver/resources/StateRest.java @@ -48,21 +48,19 @@ //rid,nickname,stateを引数として持ってくる public void putState(@PathParam("rid") String rid,@FormParam("nickname") String nickname,@FormParam("state") Integer state) throws IOException { - RoomManager rm = RoomManager.getInstance(); - Room room = rm.getRoom(rid); - - - if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 - room.setState(state); //部屋の情報を変更 - if (state == 2) { - String path; - path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; - //path = "C:\\Users\\student\\IdeaProjects\\IrisServer\\src\\main\\java\\com\\ntlab\\irisserver\\tmp\\keywords.txt"; - KeywordManager km = KeywordManager.getInstance(); - String[] keywords = km.getKeywords(path); - Game game = new Game(room, keywords); - } - } +// RoomManager rm = RoomManager.getInstance(); +// Room room = rm.getRoom(rid); +// if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 +// room.setState(state); //部屋の情報を変更 +// if (state == 2) { +// String path; +// path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; +// //path = "C:\\Users\\student\\IdeaProjects\\IrisServer\\src\\main\\java\\com\\ntlab\\irisserver\\tmp\\keywords.txt"; +// KeywordManager km = KeywordManager.getInstance(); +// String[] keywords = km.getKeywords(path); +// Game game = new Game(room, keywords); +// } +// } } diff --git a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java index 9e4b8c0..5f345ab 100644 --- a/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java +++ b/src/main/java/com/ntlab/irisserver/websockets/GameStartWebSocket.java @@ -64,15 +64,15 @@ if(nickname.equals(room.ownerName)){ //nicknameがownerだった場合 room.setState(state); //部屋の情報を変更 //String path; - // 下の1行で失敗しておる。 - //session.getBasicRemote().sendText(applicationContext.getResource("file:").getFile().getAbsolutePath()); // ここいけてない + // 下の1行でエラーが起こる。 //path = applicationContext.getResource("file:").getFile().getAbsolutePath()+"/apache-tomcat-9.0.10/webapps/irisdata/keywords.txt"; - - session.getBasicRemote().sendText("3"); // ここいけてない //KeywordManager km = KeywordManager.getInstance(); //String[] keywords = km.getKeywords(path); //Game game = new Game(room, keywords); + session.getBasicRemote().sendText("3"); // ここいけてない + + // 同じridのメンバーに一斉にメッセージ送って、画面を切り替えさせる // 本来はここに処理を書くべきではないかも。 for(Map.Entry entry : sessionMap.entrySet()) {