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 c6fe679..df0f054 100644 --- a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.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; @@ -45,11 +46,21 @@ //interfaceから実装を取得 JoinGroupRest joinGroupService = retrofit.create(JoinGroupRest.class); - String gid="qwer"; - String uid="asdf"; + + //* 必要値取得 *// + //現在のグループ情報を格納しているものからuid,tokenを取得 +// Cosmos app = (Cosmos) getApplication(); + //元となるgId,uid,tokenを取得完了 +// String gId = GroupID; +// String uId=app.getuId(); +// String token=app.getToken(); + + //テスト値 + String gId="qwer"; + String uId="asdf"; String token="sggh"; //API呼び出しのための値入力 - Call call = joinGroupService.JoinGroup(gid, uid, token); + Call call = joinGroupService.JoinGroup(gId, uId, token); //サーバからデータ受け取り call.enqueue(new Callback() { 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 1d3282f..c49cee9 100644 --- a/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/QRcodeReadingActivity.java @@ -65,11 +65,19 @@ //interfaceから実装を取得 final JoinGroupRest joinGroupService = retrofit.create(JoinGroupRest.class); - String gid="dnjewvhoirae"; - String uid="dnjewvhfgoirae"; + //* 必要値取得 *// + //現在のグループ情報を格納しているものからuid,tokenを取得 +// Cosmos app = (Cosmos) getApplication(); + //元となるgId,uid,tokenを取得完了 +// String gId = (String)result.getContents(); +// String uId=app.getuId(); +// String token=app.getToken(); + + String gId="dnjewvhoirae"; + String uId="dnjewvhfgoirae"; String token="dnjewvhoidgfrae"; //API呼び出しのための値入力 - Call call = joinGroupService.JoinGroup(gid, uid, token); + Call call = joinGroupService.JoinGroup(gId, uId, token); //サーバからデータ受け取り call.enqueue(new Callback() { @@ -81,8 +89,6 @@ JoinGroupResponse result = response.body(); Cosmos app = (Cosmos) getApplication(); - Intent intent = new Intent(getApplication(), GroupListActivity.class); - //test // System.out.println(result.uId); // System.out.println(result.name);