diff --git a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java index e319394..574c50c 100644 --- a/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java +++ b/app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java @@ -34,7 +34,7 @@ //フィールド ArrayList viewMembers = new ArrayList<>(); ArrayList oldMembers = new ArrayList<>(); - String r = "roomid"; + String roomId = "null"; String myName = "null"; @@ -45,7 +45,7 @@ super.onCreate(savedInstanceState); setContentView(R.layout.activity_member_room); - String roomId = ((Iris) getApplication()).getRid(); + roomId = ((Iris) getApplication()).getRid(); String nickname = ((Iris) getApplication()).getNickname(); //-------------------------------------------------------------------------- @@ -101,8 +101,61 @@ //-------------------------------------------------------------------------- //各ボタン処理 - buttonProcesses(); + Button redMasterButton = (Button) findViewById(R.id.beRedMaster); + Button redSpyButton = (Button) findViewById(R.id.beRedSpy); + Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); + Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); + ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); + //MemberRoom専用ボタン + ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton); + + //チームと役職の変更 + //赤チーム・スパイマスター + redMasterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"r",true); + } + }); + + //赤チーム・諜報員 + redSpyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"r",false); + } + }); + + //青チーム・スパイマスター + blueMasterButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"b",true); + } + }); + + //青チーム・諜報員 + blueSpyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + roomViewModel.changeBelongsAndMaster(roomId, myName,"b",false); + } + }); + + copyButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show(); + } + }); + + homeButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + + } + }); //--------------------------------------------------------------- //settings情報 @@ -119,64 +172,4 @@ } - public void buttonProcesses(){ - Button redMasterButton = (Button) findViewById(R.id.beRedMaster); - Button redSpyButton = (Button) findViewById(R.id.beRedSpy); - Button blueMasterButton = (Button) findViewById(R.id.beBlueMaster); - Button blueSpyButton = (Button) findViewById(R.id.beBlueSpy); - ImageButton copyButton = (ImageButton) findViewById(R.id.copyButton); - ImageButton homeButton = (ImageButton) findViewById(R.id.homeButton); - - redMasterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "赤マスターボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - redSpyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "赤諜報員ボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - blueMasterButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "青マスターボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - blueSpyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "青諜報員ボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - homeButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - r = "ホームボタン検知しました"; - TextView RoomIdText = findViewById(R.id.roomID); - RoomIdText.setText(r); - } - }); - - copyButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Snackbar.make(v, "コピーしました", Snackbar.LENGTH_LONG).show(); - } - }); - } } \ No newline at end of file