diff --git a/app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java b/app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java index b98a746..496e753 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java +++ b/app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java @@ -1,11 +1,12 @@ package com.example.cosmosclient.entities; -import java.util.List; +import java.util.ArrayList; public class JoinGroupResponse { public String gId; - public String uId; - public String token; public String uri; + public String name; + public ArrayList members= new ArrayList<>(); + public ArrayList requests = new ArrayList<>(); } diff --git a/app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java b/app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java index 8472bfb..54d994b 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java @@ -13,6 +13,6 @@ public interface JoinGroupRest { @POST("groups/{gId}/members") @FormUrlEncoded - Call JoinGroup(@Path("gId") String gId, @Field("uId ") String uId , @Field("token ") String token); + Call JoinGroup(@Path("gId") String gId, @Field("uId") String uId , @Field("token") String token); } 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 df0f054..d62ef21 100644 --- a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java @@ -49,18 +49,17 @@ //* 必要値取得 *// //現在のグループ情報を格納しているものからuid,tokenを取得 -// Cosmos app = (Cosmos) getApplication(); - //元となるgId,uid,tokenを取得完了 -// String gId = GroupID; -// String uId=app.getuId(); -// String token=app.getToken(); + Cosmos app = (Cosmos) getApplication(); + //uid,tokenを取得完了 + final String uId=app.getuId(); + String token=app.getToken(); //テスト値 - String gId="qwer"; - String uId="asdf"; - String token="sggh"; + String gId=GroupID; +// String uId="asdf"; +// String token="sggh"; //API呼び出しのための値入力 - Call call = joinGroupService.JoinGroup(gId, uId, token); + final Call call = joinGroupService.JoinGroup(gId, uId, token); //サーバからデータ受け取り call.enqueue(new Callback() { @@ -69,21 +68,18 @@ public void onResponse(Call call, Response response) { if (response.isSuccessful()) { // JoinGroupResponse result = response.body(); - test.setText("成功"); - Cosmos app = (Cosmos) getApplication(); -// Intent intent = new Intent(getApplication(), GroupListActivity.class); + //成功時 + JoinGroupResponse result = response.body(); + Group g = new Group(result.gId,result.uri,result.name,uId); - //test -// System.out.println(result.gId); -// System.out.println(result.uId); -// System.out.println(result.name); -// System.out.println(result.uri); -// System.out.println(result.token); -// System.out.println(result.iconUri); -// System.out.println(result.pw); + //app/CosmosにgIdを保存 + Cosmos app = (Cosmos)getApplication(); + app.setCurrentGroup(g); + Intent intent = new Intent(getApplication(), RequestListActivity.class); + startActivity(intent); //ここで成功の処理を記述 -// finish(); + finish(); } else { //onFailureでキャッチできないエラー用 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 c49cee9..94c6750 100644 --- a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java @@ -11,6 +11,7 @@ import com.example.cosmosclient.R; import com.example.cosmosclient.app.Cosmos; +import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.entities.JoinGroupResponse; import com.example.cosmosclient.resources.JoinGroupRest; import com.google.zxing.integration.android.IntentIntegrator; @@ -67,15 +68,15 @@ //* 必要値取得 *// //現在のグループ情報を格納しているものからuid,tokenを取得 -// Cosmos app = (Cosmos) getApplication(); + Cosmos app = (Cosmos) getApplication(); //元となるgId,uid,tokenを取得完了 -// String gId = (String)result.getContents(); -// String uId=app.getuId(); -// String token=app.getToken(); + String gId = (String)result.getContents(); + final String uId=app.getuId(); + String token=app.getToken(); - String gId="dnjewvhoirae"; - String uId="dnjewvhfgoirae"; - String token="dnjewvhoidgfrae"; +// String gId="dnjewvhoirae"; +// String uId="dnjewvhfgoirae"; +// String token="dnjewvhoidgfrae"; //API呼び出しのための値入力 Call call = joinGroupService.JoinGroup(gId, uId, token); @@ -86,22 +87,21 @@ @Override 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); - Cosmos app = (Cosmos) getApplication(); - //test -// System.out.println(result.uId); -// System.out.println(result.name); -// System.out.println(result.uri); -// System.out.println(result.token); -// System.out.println(result.iconUri); -// System.out.println(result.pw); + //app/CosmosにgIdを保存 + Cosmos app = (Cosmos)getApplication(); + app.setCurrentGroup(g); + Intent intent = new Intent(getApplication(), RequestListActivity.class); + startActivity(intent); //ここで成功の処理を記述 - testtxt.setText("成功"); - finish(); + + } else { //onFailureでキャッチできないエラー用 //ここでエラーの処理を記述 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 1a45ac7..4ddeff1 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 @@ -13,7 +13,7 @@ android:layout_marginStart="8dp" android:layout_marginLeft="8dp" android:layout_marginTop="8dp" - android:digits="abcdefghijklmnopqrstuvwxyz1234567890 " + android:digits="abcdefghijklmnopqrstuvwxyz1234567890-" android:ems="10" android:gravity="start|top" android:inputType="textEmailAddress"