diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 52f5f62..e4f2468 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,6 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$PROJECT_DIR$/../../../../Program Files/gradle-5.4.1-all/gradle-5.4.1" />
         <option name="gradleJvm" value="temurin-11" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index c1f24a5..c71d1b1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,6 +3,7 @@
   <component name="DesignSurface">
     <option name="filePathToZoomLevelMap">
       <map>
+        <entry key="../../../../../../../layout/custom_preview.xml" value="0.19791666666666666" />
         <entry key="..\:/Users/Nitta/AndroidStudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.20969202898550723" />
         <entry key="..\:/Users/Nitta/StudioProjects/IrisClient/app/src/main/res/layout/activity_main.xml" value="0.266304347826087" />
         <entry key="..\:/Users/Student/StudioProjects/IrisClient/app/src/main/res/layout/activity_drawing.xml" value="0.2203125" />
@@ -36,6 +37,9 @@
         <entry key="..\:/Users/student/StudioProjects/IrisClient/app/src/main/res/layout/recycler_view_item.xml" value="0.28072916666666664" />
         <entry key="..\:/Users/totos/StudioProjects/IrisClient/app/src/main/res/layout/activity_drawing.xml" value="0.25" />
         <entry key="..\:/Users/totos/StudioProjects/IrisClient/app/src/main/res/layout/activity_member_room.xml" value="0.33" />
+        <entry key="app/src/main/res/layout/activity_drawing.xml" value="0.196875" />
+        <entry key="app/src/main/res/layout/activity_game_master.xml" value="0.20742753623188406" />
+        <entry key="app/src/main/res/layout/fragment_card_drawing.xml" value="0.196875" />
       </map>
     </option>
   </component>
diff --git a/app/build.gradle b/app/build.gradle
index 9b6aef0..ba387bf 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -68,4 +68,8 @@
     implementation 'com.google.android.material:material:1.1.0-alpha08'
     implementation 'androidx.viewpager2:viewpager2:1.0.0-beta02'
 
+    // WeSocketで追加
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
+    implementation 'javax.websocket:javax.websocket-api:1.1'
+
 }
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index dc21aea..c05e2c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="org.ntlab.irisclient" >
 
     <uses-permission android:name="android.permission.INTERNET" />
@@ -14,7 +15,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.IrisClient"
-        android:usesCleartextTraffic="true" >
+        android:usesCleartextTraffic="true"
+        tools:targetApi="31">
         <activity
             android:name=".GameMasterActivity"
             android:exported="false"
diff --git a/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java
index 4e4ffac..183d50e 100644
--- a/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/CreateRoomActivity.java
@@ -35,7 +35,7 @@
         //----------------------------------------------------------------------------------------------------------------------------------
         //サーバーとの通信の初期化
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final RoomsRest roomRest = retrofit.create(RoomsRest.class);
diff --git a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
index 5d62adb..cfe5385 100644
--- a/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
@@ -36,7 +36,7 @@
         }
 
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
index 725f9ca..bd1f60a 100644
--- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
@@ -74,6 +74,7 @@
         RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class);
 
         roomViewModel.setRid(roomId);
+        roomViewModel.openWebSocket(roomId, nickname);
 
         ListView membersList = (ListView) findViewById(R.id.MembersList);
 
diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
index 54cc0b2..c9449f7 100644
--- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java
@@ -97,6 +97,7 @@
         RoomViewModel roomViewModel = new ViewModelProvider(this).get(RoomViewModel.class);
 
         roomViewModel.setRid(roomId);
+        roomViewModel.openWebSocket(roomId, myName);
 
         ListView membersList = (ListView) findViewById(R.id.MembersList);
 
@@ -315,11 +316,12 @@
         });
 
         //スタートボタン
+        // TODO: ここー！！
         startButton.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 if(ConditionStart()){
-                    roomViewModel.startDrawing(roomId, myName);
+                    roomViewModel.startDrawing(myName);
 
                     Intent intent = new Intent(OwnerRoomActivity.this,DrawingActivity.class);
                     startActivity(intent);
diff --git a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java
index f73e19d..e8deeb8 100644
--- a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java
@@ -29,7 +29,7 @@
 
         //サーバーとの通信を初期化
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
diff --git a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java
index de74e3b..e102db6 100644
--- a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java
+++ b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java
@@ -28,7 +28,7 @@
 
         //サーバーとの通信を初期化
         Retrofit retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final RoomsRest roomsRest = retrofit.create(RoomsRest.class);
diff --git a/app/src/main/java/org/ntlab/irisclient/TimeMesure.java b/app/src/main/java/org/ntlab/irisclient/TimeMesure.java
new file mode 100644
index 0000000..f8328b0
--- /dev/null
+++ b/app/src/main/java/org/ntlab/irisclient/TimeMesure.java
@@ -0,0 +1,9 @@
+package org.ntlab.irisclient;
+
+import android.app.Application;
+
+public class TimeMesure extends Application {
+
+
+
+}
diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java
index 9f2b0bd..3e38cdc 100644
--- a/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java
+++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/DrawingStateViewModel.java
@@ -41,7 +41,7 @@
 
     public DrawingStateViewModel() {
         this.retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
     }
diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
index e16880c..0307653 100644
--- a/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
+++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/GameViewModel.java
@@ -67,7 +67,7 @@
         this.QMutableLiveData = new MutableLiveData<>();
 
         this.retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         this.gameRest = retrofit.create(GameRest.class);
diff --git a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
index 64e4a7d..725566a 100644
--- a/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
+++ b/app/src/main/java/org/ntlab/irisclient/viewmodels/RoomViewModel.java
@@ -1,5 +1,7 @@
 package org.ntlab.irisclient.viewmodels;
 
+import android.os.Handler;
+
 import org.ntlab.irisclient.models.Member;
 import org.ntlab.irisclient.models.Settings;
 import org.ntlab.irisclient.resources.RoomsRest;
@@ -11,6 +13,11 @@
 import java.util.List;
 import java.util.Objects;
 
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.WebSocket;
+import okhttp3.WebSocketListener;
+import okio.ByteString;
 import retrofit2.Call;
 import retrofit2.Callback;
 import retrofit2.Response;
@@ -21,6 +28,7 @@
 
     //フィールド
     private String rid;
+    private String nickname;
     final private Retrofit retrofit;
     final private RoomsRest roomsRest;
 
@@ -35,6 +43,11 @@
     final private MutableLiveData<Settings> settingsMutableLiveData;
     final private MutableLiveData<Integer> stateLiveData;
 
+    // WebSocket用追加フィールド
+    private GameStartWebSocket gameStartWebSocket;
+    public MutableLiveData<String> webSocketMessageLiveData;
+
+
     //-----------------------------------------------------------------------------
     //コンストラクタ
     public RoomViewModel() {
@@ -42,10 +55,13 @@
         this.settingsMutableLiveData = new MutableLiveData<>();
         this.stateLiveData = new MutableLiveData<>();
         this.retrofit = new Retrofit.Builder()
-                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         this.roomsRest = retrofit.create(RoomsRest.class);
+
+        // webSocket用追加コンストラクタ
+        this.webSocketMessageLiveData = new MutableLiveData<>();
     }
 
     //-----------------------------------------------------------------------------
@@ -53,6 +69,13 @@
     public void setRid(String rid){
         this.rid = rid;
     }
+    // webSocket用追加
+    public void closeWebSocket() {
+        gameStartWebSocket.webSocket.close(1000,"切断のボタンを押した");
+    }
+    public void openWebSocket(String rid, String nickname) {
+        gameStartWebSocket = new GameStartWebSocket(rid, nickname);
+    }
 
     // getter
     public LiveData<List<Member>> getMembersLiveData() {
@@ -64,6 +87,10 @@
     public LiveData<Integer> getStateLiveData() {
         return this.stateLiveData;
     }
+    // webSocket用追加
+    public LiveData<String> getTextLiveData() {
+        return this.webSocketMessageLiveData;
+    }
 
     //-----------------------------------------------------------------------------
     //roomViewModelのみの機能的なメソッド
@@ -238,23 +265,9 @@
     }
 
     //スタートボタンの処理(OwnerActivityのみ)
-    public void startDrawing(String rid, String nickname) {
-        Call<Void> call = roomsRest.putState(rid,nickname,2);
-
-        call.enqueue(new Callback<Void>() {
-            @Override
-            public void onResponse(Call<Void> call, Response<Void> response) {
-                if (response.isSuccessful()){
-                    //System.out.println("通信成功:startDrawing");
-                } else {
-                    //System.out.println("通信可能：startDrawing: " + response.code());
-                }
-            }
-            @Override
-            public void onFailure(Call<Void> call, Throwable t) {
-                //System.out.println("通信失敗:startDrawing");
-            }
-        });
+    // TODO: ここー！！
+    public void startDrawing(String nickname) {
+        gameStartWebSocket.sendMessage(nickname+",2");
     }
 
     //ランダムボタンの処理(OwnerActivityのみ)
@@ -315,7 +328,7 @@
     public void update(){
         updateMembers(rid);
         updateSettings(rid);
-        updateState(rid);
+        //updateState(rid);
     }
 
     //部屋の情報の更新(List<Members>)
@@ -406,25 +419,112 @@
     }
 
     //部屋の状態情報の更新(Integer)
-    public void updateState(String rid) {
-        Call<Integer> call = roomsRest.getState(rid);
+    // TODO: ここー！！！
+//    public void updateState(String rid) {
+//        Call<Integer> call = roomsRest.getState(rid);
+//
+//        call.enqueue(new Callback<Integer>() {
+//            @Override
+//            public void onResponse(Call<Integer> call, Response<Integer> response) {
+//                if (response.isSuccessful()){
+//
+//                    //値が一緒なら書き換えない
+//                    if(preState != response.body()){
+//                        preState = response.body();
+//                        stateLiveData.setValue(response.body());
+//                    }
+//                }
+//            }
+//
+//            @Override
+//            public void onFailure(Call<Integer> call, Throwable t) {
+//            }
+//        });
+//    }
 
-        call.enqueue(new Callback<Integer>() {
-            @Override
-            public void onResponse(Call<Integer> call, Response<Integer> response) {
-                if (response.isSuccessful()){
 
-                    //値が一緒なら書き換えない
-                    if(preState != response.body()){
-                        preState = response.body();
-                        stateLiveData.setValue(response.body());
-                    }
+    /*
+    WebSocketに関わる内部クラス
+     */
+    public class GameStartWebSocket extends WebSocketListener {
+
+        private WebSocket webSocket;
+        private Handler mHandler = new Handler();
+
+        // 外部クラスのLiveDateにアクセスする
+        private void setTextLiveData(String message) {
+            // UIスレッドにしないと動かない...
+            mHandler.post(new Runnable() {
+                public void run() {
+                    // UIの操作
+                    webSocketMessageLiveData.setValue(message);
                 }
-            }
+            });
+        }
 
-            @Override
-            public void onFailure(Call<Integer> call, Throwable t) {
+        public GameStartWebSocket(String rid, String nickname) {
+            OkHttpClient client = new OkHttpClient();
+
+            Request.Builder request = new Request.Builder();
+            String url = "ws://nitta-lab-www.is.konan-u.ac.jp/iris-websocket/game-start/" + rid + "?nickname=" + nickname;
+            request.url(url);
+            webSocket = client.newWebSocket(request.build(), this);
+        }
+
+        //-----------------------------------------------------------------------------
+        //setter
+        public void sendMessage(String message) {
+            System.out.println(message);
+            webSocket.send(message);
+        }
+        //-----------------------------------------------------------------------------
+
+
+        @Override
+        public void onOpen(WebSocket webSocket, okhttp3.Response response) {
+            this.setTextLiveData("接続完了");
+            System.out.println("kota: WebSocketの接続成功");
+        }
+
+        @Override
+        public void onMessage(WebSocket webSocket, String text) {
+            this.setTextLiveData("接続中"+text);
+            if(text.equals("changeState-2")) {
+
+                // メインで実行しなければいけない
+                mHandler.post(new Runnable() {
+                    public void run() {
+                        // UIの操作
+                        System.out.println("kota: stateLiveDataの値変更： " + text);
+                        stateLiveData.setValue(2);
+                    }
+                });
+
+                // ここでwebsocketは必要なくなるからCloseする。
+                webSocket.close(1000, null);
+                System.out.println("kota: websocketクローズ完了" );
+
             }
-        });
+            System.out.println("kota: サーバーからメッセージ受信（text）： " + text);
+        }
+
+        @Override
+        public void onMessage(WebSocket webSocket, ByteString bytes) {
+            this.setTextLiveData("接続中"+bytes.hex());
+            System.out.println("kota: サーバーからメッセージ受信（bytes）： " + bytes.hex());
+        }
+
+        @Override
+        public void onClosing(WebSocket webSocket, int code, String reason) {
+            webSocket.close(1000, null);
+            this.setTextLiveData("切断しました");
+            System.out.println("kota: WebSocketが切断： " + code + reason);
+        }
+
+        @Override
+        public void onFailure(WebSocket webSocket, Throwable t, okhttp3.Response response) {
+            this.setTextLiveData("接続失敗");
+            System.out.println("kota: WebSocketの接続が失敗： "+ t.getLocalizedMessage());
+        }
     }
 }
diff --git a/app/src/main/res/layout/activity_drawing.xml b/app/src/main/res/layout/activity_drawing.xml
index 42d07cf..5497a3d 100644
--- a/app/src/main/res/layout/activity_drawing.xml
+++ b/app/src/main/res/layout/activity_drawing.xml
@@ -31,7 +31,7 @@
 
     <TextView
         android:id="@+id/drawingNowText"
-        android:layout_width="95dp"
+        android:layout_width="200dp"
         android:layout_height="51dp"
         android:gravity="center_horizontal"
         android:text="test"