diff --git a/app/src/main/java/org/ntlab/irisclient/Iris.java b/app/src/main/java/org/ntlab/irisclient/Iris.java index 5b9567b..3a257aa 100644 --- a/app/src/main/java/org/ntlab/irisclient/Iris.java +++ b/app/src/main/java/org/ntlab/irisclient/Iris.java @@ -11,7 +11,7 @@ public class Iris extends Application { private String rid; private String nickname; - private String team; + private String team; //Memberクラスにおけるbelongs (r:赤チーム b：青チーム n:無所属) private boolean bMaster; private List memberList = new ArrayList<>(); diff --git a/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java b/app/src/main/java/org/ntlab/irisclient/TestDrawingActivity.java index 41b6090..fa29a07 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 @@ .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") .addConverterFactory(JacksonConverterFactory.create()) .build(); - final RoomsRest roomRest = retrofit.create(RoomsRest.class); + final RoomsRest roomsRest = retrofit.create(RoomsRest.class); //上の表示を削除 ActionBar actionBar = getSupportActionBar(); @@ -42,8 +42,7 @@ ownerButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { //（ownerのみ）drawtestを更新 : は動かない - /* - final RoomsRest roomsRest = retrofit.create(RoomsRest.class); +/* Call call = roomsRest.putTestRoom(); call.enqueue(new Callback() { @Override @@ -58,7 +57,7 @@ System.out.println(t); } }); - */ +*/ ((Iris) getApplication()).setRid("drawtest"); ((Iris) getApplication()).setNickname("owner"); Intent intent = new Intent(TestDrawingActivity.this,DrawingActivity.class); diff --git a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java index dce2953..16df8be 100644 --- a/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/TestGameActivity.java @@ -8,6 +8,17 @@ import androidx.appcompat.app.ActionBar; import androidx.appcompat.app.AppCompatActivity; +import org.ntlab.irisclient.models.Member; +import org.ntlab.irisclient.resources.RoomsRest; + +import java.util.List; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; + public class TestGameActivity extends AppCompatActivity { @Override @@ -15,51 +26,130 @@ super.onCreate(savedInstanceState); setContentView(R.layout.test_activity_game); + //サーバーとの通信を初期化 + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/iris/") + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final RoomsRest roomRests = retrofit.create(RoomsRest.class); + //上の表示を削除 ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.hide(); } - //ownerとして参加 + //RedSpy(owner)として参加 Button ownerButton = findViewById(R.id.ownergame); ownerButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { ((Iris) getApplication()).setRid("gametest"); - ((Iris) getApplication()).setNickname("owner"); - Intent intent = new Intent(TestGameActivity.this, GameMemberActivity.class); + ((Iris) getApplication()).setNickname("RedSpy(owner)"); + ((Iris) getApplication()).setTeam("r"); + ((Iris) getApplication()).setMaster(true); + Call> call = roomRests.getRoomMember("gametest"); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()){ + System.out.println("通信成功:createDrawTest"); + ((Iris) getApplication()).setMemberList(response.body()); + } + } + @Override + public void onFailure(Call> call, Throwable t) { + System.out.println("通信失敗:createDrawTest"); + System.out.println(t); + } + }); + + Intent intent = new Intent(TestGameActivity.this, GameMasterActivity.class); startActivity(intent); } }); - //member1として参加 + //RedAgentとして参加 Button mem1Button = findViewById(R.id.member1); mem1Button.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { ((Iris) getApplication()).setRid("gametest"); - ((Iris) getApplication()).setNickname("member1"); + ((Iris) getApplication()).setNickname("RedAgent"); + ((Iris) getApplication()).setTeam("r"); + ((Iris) getApplication()).setMaster(false); + Call> call = roomRests.getRoomMember("gametest"); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()){ + System.out.println("通信成功:createDrawTest"); + ((Iris) getApplication()).setMemberList(response.body()); + } + } + @Override + public void onFailure(Call> call, Throwable t) { + System.out.println("通信失敗:createDrawTest"); + System.out.println(t); + } + }); + Intent intent = new Intent(TestGameActivity.this, GameMemberActivity.class); startActivity(intent); } }); - //member2として参加 + //BlueSpyとして参加 Button mem2Button = findViewById(R.id.member2); mem2Button.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { ((Iris) getApplication()).setRid("gametest"); - ((Iris) getApplication()).setNickname("member2"); - Intent intent = new Intent(TestGameActivity.this, GameMemberActivity.class); + ((Iris) getApplication()).setNickname("BlueSpy"); + ((Iris) getApplication()).setTeam("b"); + ((Iris) getApplication()).setMaster(true); + Call> call = roomRests.getRoomMember("gametest"); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()){ + System.out.println("通信成功:createDrawTest"); + ((Iris) getApplication()).setMemberList(response.body()); + } + } + @Override + public void onFailure(Call> call, Throwable t) { + System.out.println("通信失敗:createDrawTest"); + System.out.println(t); + } + }); + + Intent intent = new Intent(TestGameActivity.this, GameMasterActivity.class); startActivity(intent); } }); - //member3として参加 + //BlueAgentとして参加 Button mem3Button = findViewById(R.id.member3); mem3Button.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { ((Iris) getApplication()).setRid("gametest"); - ((Iris) getApplication()).setNickname("member3"); + ((Iris) getApplication()).setNickname("BlueAgent"); + ((Iris) getApplication()).setTeam("b"); + ((Iris) getApplication()).setMaster(false); + Call> call = roomRests.getRoomMember("gametest"); + call.enqueue(new Callback>() { + @Override + public void onResponse(Call> call, Response> response) { + if (response.isSuccessful()){ + System.out.println("通信成功:createDrawTest"); + ((Iris) getApplication()).setMemberList(response.body()); + } + } + @Override + public void onFailure(Call> call, Throwable t) { + System.out.println("通信失敗:createDrawTest"); + System.out.println(t); + } + }); + Intent intent = new Intent(TestGameActivity.this, GameMemberActivity.class); startActivity(intent); } diff --git a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java index ee6874d..fbb90f6 100644 --- a/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java +++ b/app/src/main/java/org/ntlab/irisclient/entities/MemberJson.java @@ -4,7 +4,7 @@ public class MemberJson { private String nickname; - private String belongs; + private String belongs; //r:赤チーム b：青チーム n:無所属 private boolean master; diff --git a/app/src/main/res/layout/test_activity_game.xml b/app/src/main/res/layout/test_activity_game.xml index 3bf6d1d..1a44f8b 100644 --- a/app/src/main/res/layout/test_activity_game.xml +++ b/app/src/main/res/layout/test_activity_game.xml @@ -21,51 +21,53 @@ android:id="@+id/ownergame" android:layout_width="150dp" android:layout_height="80dp" - android:text="Owner" + android:text="RedSpy (owner)" android:textSize="20sp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintHorizontal_bias="0.499" + app:layout_constraintHorizontal_bias="0.301" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintVertical_bias="0.293" /> + app:layout_constraintVertical_bias="0.302" />