diff --git a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java index baf2f42..c4b3fdc 100644 --- a/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java @@ -6,14 +6,11 @@ import android.content.ClipDescription; import android.content.ClipboardManager; import android.content.Intent; -import android.graphics.Color; import android.os.Bundle; import android.view.View; -import android.widget.ArrayAdapter; import android.widget.BaseAdapter; import android.widget.Button; import android.widget.CompoundButton; -import android.widget.EditText; import android.widget.ImageButton; import android.widget.ListView; import android.widget.Switch; @@ -26,21 +23,12 @@ import androidx.lifecycle.Observer; import androidx.lifecycle.ViewModelProvider; -import org.ntlab.irisclient.entities.RoomJson; import org.ntlab.irisclient.models.Member; -import org.ntlab.irisclient.models.Settings; -import org.ntlab.irisclient.resources.RoomsRest; import org.ntlab.irisclient.viewmodels.RoomViewModel; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import retrofit2.Call; -import retrofit2.Callback; -import retrofit2.Response; -import retrofit2.Retrofit; -import retrofit2.converter.jackson.JacksonConverterFactory; public class OwnerRoomActivity extends AppCompatActivity { @@ -54,13 +42,11 @@ List Bteam = new ArrayList<>(); String roomId = "null"; String myName = "null"; - //String nickname; - String belongs; - Boolean isMaster; + boolean drawingTimer = true; - int drawingTimes = 50; + int drawingTimes = 40; boolean gameTimer = true; - int gameTimes = 30; + int gameTimes = 90; int gameFirstTimes = 10; private void homeButton(RoomViewModel roomViewModel){ @@ -98,9 +84,6 @@ myName = ((Iris) getApplication()).getNickname(); roomId = ((Iris) getApplication()).getRid(); - //自分のなまえ - //Intent intentMain = getIntent(); - //myName = intentMain.getStringExtra("nickname"); //-------------------------------------------------------------------------- //メンバー表示 @@ -150,12 +133,18 @@ Switch dTimer = findViewById(R.id.dTimer); @SuppressLint("UseSwitchCompatOrMaterialCode") Switch gTimer = findViewById(R.id.gTimer); - Switch switch4 = findViewById(R.id.switch4); - Switch switch5 = findViewById(R.id.switch5); - Switch switch6 = findViewById(R.id.switch6); - Switch switch7 = findViewById(R.id.switch7); - Switch switch8 = findViewById(R.id.switch8); - Switch switch9 = findViewById(R.id.switch9); + @SuppressLint("UseSwitchCompatOrMaterialCode") + Switch d20Times = findViewById(R.id.d20Times); + @SuppressLint("UseSwitchCompatOrMaterialCode") + Switch d40Times = findViewById(R.id.d40Times); + @SuppressLint("UseSwitchCompatOrMaterialCode") + Switch d60Times = findViewById(R.id.d60Times); + @SuppressLint("UseSwitchCompatOrMaterialCode") + Switch g60Times = findViewById(R.id.g60Times); + @SuppressLint("UseSwitchCompatOrMaterialCode") + Switch g90Times = findViewById(R.id.g90Times); + @SuppressLint("UseSwitchCompatOrMaterialCode") + Switch g120Times = findViewById(R.id.g120Times); //OwnerRoom専用ボタン @@ -217,87 +206,106 @@ //設定ボタン + //お絵描きタイマー dTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { drawingTimer = isChecked; if(drawingTimer == false){ - switch4.setVisibility(View.GONE); - switch5.setVisibility(View.GONE); - switch6.setVisibility(View.GONE); + d20Times.setVisibility(View.GONE); + d40Times.setVisibility(View.GONE); + d60Times.setVisibility(View.GONE); }else { - switch4.setVisibility(View.VISIBLE); - switch5.setVisibility(View.VISIBLE); - switch6.setVisibility(View.VISIBLE); + d20Times.setVisibility(View.VISIBLE); + d40Times.setVisibility(View.VISIBLE); + d60Times.setVisibility(View.VISIBLE); } roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - switch4.setOnClickListener(new View.OnClickListener() { + //d20タイマー + d20Times.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - switch5.setChecked(false); - switch6.setChecked(false); + d40Times.setChecked(false); + d60Times.setChecked(false); + drawingTimes = 20; + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - switch5.setOnClickListener(new View.OnClickListener() { + //d40タイマー + d40Times.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - switch4.setChecked(false); - switch6.setChecked(false); + d20Times.setChecked(false); + d60Times.setChecked(false); + drawingTimes = 40; + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - switch6.setOnClickListener(new View.OnClickListener() { + //d60タイマー + d60Times.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - switch4.setChecked(false); - switch5.setChecked(false); + d20Times.setChecked(false); + d40Times.setChecked(false); + drawingTimes = 60; + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - + //ゲームタイマー gTimer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @Override public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { gameTimer = isChecked; if(gameTimer == false){ - switch7.setVisibility(View.GONE); - switch8.setVisibility(View.GONE); - switch9.setVisibility(View.GONE); + g60Times.setVisibility(View.GONE); + g90Times.setVisibility(View.GONE); + g120Times.setVisibility(View.GONE); }else { - switch7.setVisibility(View.VISIBLE); - switch8.setVisibility(View.VISIBLE); - switch9.setVisibility(View.VISIBLE); + g60Times.setVisibility(View.VISIBLE); + g90Times.setVisibility(View.VISIBLE); + g120Times.setVisibility(View.VISIBLE); } roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - switch7.setOnClickListener(new View.OnClickListener() { + //g60タイマー + g60Times.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - switch8.setChecked(false); - switch9.setChecked(false); + g90Times.setChecked(false); + g120Times.setChecked(false); + gameTimes = 60; + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - switch8.setOnClickListener(new View.OnClickListener() { + //g90タイマー + g90Times.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - switch7.setChecked(false); - switch9.setChecked(false); + g60Times.setChecked(false); + g120Times.setChecked(false); + gameTimes = 90; + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); - switch9.setOnClickListener(new View.OnClickListener() { + //g120タイマー + g120Times.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - switch7.setChecked(false); - switch8.setChecked(false); + g60Times.setChecked(false); + g90Times.setChecked(false); + gameTimes = 120; + roomViewModel.changeSettings(roomId, drawingTimer, drawingTimes, gameTimer, gameTimes, gameFirstTimes); } }); @@ -332,18 +340,12 @@ } }); - //--------------------------------------------------------------- - //settings情報 - - - //--------------------------------------------------------------- //部屋ID情報 TextView RoomIdText = findViewById(R.id.roomID); RoomIdText.setText(roomId); - roomViewModel.start(500,(Iris)getApplication()); } @@ -398,7 +400,13 @@ } } + //スタートを押したときの人数・チーム・役職状況 public boolean ConditionStart() { + Mteam.clear(); + Steam.clear(); + Rteam.clear(); + Bteam.clear(); + for(int i=0; i< allMembers.size(); i++){ if(allMembers.get(i).getMaster()){ @@ -411,6 +419,8 @@ Rteam.add(i); }else if(allMembers.get(i).getBelongs().equals("b")) { Bteam.add(i); + } else { + return false; } }