diff --git a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java index d62ef21..d6c8dda 100644 --- a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java @@ -67,21 +67,30 @@ @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()) { -// JoinGroupResponse result = response.body(); //成功時 - JoinGroupResponse result = response.body(); - Group g = new Group(result.gId,result.uri,result.name,uId); + final JoinGroupResponse result = response.body(); + //追加ボタンに関する記述 + test.setText(result.name); + Button AddBtn = (Button)findViewById(R.id.Addbutton); + AddBtn.setVisibility(View.VISIBLE); - //app/CosmosにgIdを保存 - Cosmos app = (Cosmos)getApplication(); - app.setCurrentGroup(g); + AddBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Group g = new Group(result.gId, result.uri, result.name, uId); - Intent intent = new Intent(getApplication(), RequestListActivity.class); - startActivity(intent); - //ここで成功の処理を記述 - finish(); + //app/CosmosにgIdを保存 + Cosmos app = (Cosmos) getApplication(); + app.setCurrentGroup(g); - } else { + Intent intent = new Intent(getApplication(), RequestListActivity.class); + startActivity(intent); + finish(); + + } + }); + + }else { //onFailureでキャッチできないエラー用 //ここでエラーの処理を記述 test.setText("失敗"); diff --git a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java index 94c6750..957fee5 100644 --- a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java @@ -5,6 +5,7 @@ import android.os.Bundle; import android.util.Log; import android.view.View; +import android.widget.Button; import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; @@ -50,7 +51,7 @@ final IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); if(result != null) { QRcodeData = (String)result.getContents(); - QRcodeResult.setText(QRcodeData); +// QRcodeResult.setText(QRcodeData); } else { super.onActivityResult(requestCode, resultCode, data); } @@ -88,18 +89,25 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { //成功時 - JoinGroupResponse result = response.body(); - Group g = new Group(result.gId,result.uri,result.name,uId); + final JoinGroupResponse result = response.body(); + QRcodeResult.setText(result.name); + Button AddBtn = (Button)findViewById(R.id.Addbutton); - //app/CosmosにgIdを保存 - Cosmos app = (Cosmos)getApplication(); - app.setCurrentGroup(g); + AddBtn.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + Group g = new Group(result.gId, result.uri, result.name, uId); - Intent intent = new Intent(getApplication(), RequestListActivity.class); - startActivity(intent); - //ここで成功の処理を記述 - finish(); + //app/CosmosにgIdを保存 + Cosmos app = (Cosmos) getApplication(); + app.setCurrentGroup(g); + Intent intent = new Intent(getApplication(), RequestListActivity.class); + startActivity(intent); + finish(); + + } + }); } else { diff --git a/app/src/main/res/layout/activity_join_group_by_id.xml b/app/src/main/res/layout/activity_join_group_by_id.xml index 4ddeff1..9f744f2 100644 --- a/app/src/main/res/layout/activity_join_group_by_id.xml +++ b/app/src/main/res/layout/activity_join_group_by_id.xml @@ -35,15 +35,6 @@ app:layout_constraintTop_toTopOf="parent" tools:layout_editor_absoluteX="16dp" /> -