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 8b297d0..3b1b5c9 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java +++ b/app/src/main/java/com/example/cosmosclient/entities/JoinGroupResponse.java @@ -7,10 +7,10 @@ import java.util.Map; public class JoinGroupResponse { - public List member=new ArrayList<>();; + public List members=new ArrayList<>();; public List getListMembers() { - return member; + return members; } } \ No newline at end of file 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 31661e1..e231ab6 100644 --- a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java @@ -52,16 +52,16 @@ //* 必要値取得 *// //現在のグループ情報を格納しているものからuid,tokenを取得 -// Cosmos app = (Cosmos) getApplication(); + Cosmos app = (Cosmos) getApplication(); //元となるgId,uid,tokenを取得完了 // String gId = GroupID; -// String uId=app.getuId(); -// String token=app.getToken(); + String uId=app.getuId(); + String token=app.getToken(); //テスト値 - String gId="qwer"; - String uId="asdf"; - String token="sggh"; + String gId="df6cddf2-7aff-4601-9ba7-d32bdc5d7e75"; +// String uId="asdf"; +// String token="sggh"; //API呼び出しのための値入力 Call call = joinGroupService.JoinGroup(gId, uId, token); @@ -73,9 +73,9 @@ if (response.isSuccessful()) { ListlistMembers= response.body().getListMembers(); int s = listMembers.size(); - for(int i = 0; i < s; i++){ - Log.d("debug3", String.valueOf(listMembers.get(i))); - } +// for(int i = 0; i < s; i++){ +// Log.d("debug3", String.valueOf(listMembers.get(i))); +// } // JoinGroupResponse result = response.body(); test.setText("成功"); Cosmos app = (Cosmos) getApplication(); 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 bb8c927..ab61b35 100644 --- a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java @@ -71,15 +71,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 uId=app.getuId(); + String token=app.getToken(); - String gId="dnjewvhoirae"; - String uId="dnjewvhfgoirae"; - String token="dnjewvhoidgfrae"; + String gId="df6cddf2-7aff-4601-9ba7-d32bdc5d7e75"; +// String uId="dnjewvhfgoirae"; +// String token="dnjewvhoidgfrae"; //API呼び出しのための値入力 Call call = joinGroupService.JoinGroup(gId, uId, token); @@ -92,9 +92,9 @@ if (response.isSuccessful()) { List listMembers= response.body().getListMembers(); int s = listMembers.size(); - for(int i = 0; i < s; i++){ - Log.d("debug3", String.valueOf(listMembers.get(i))); - } +// for(int i = 0; i < s; i++){ +// Log.d("debug3", String.valueOf(listMembers.get(i))); +// } Cosmos app = (Cosmos) getApplication(); //test // System.out.println(result.uId);