diff --git a/app/src/main/java/com/example/cosmosclient/entities/ToJoinGroupRetrofitMethods.java b/app/src/main/java/com/example/cosmosclient/entities/ToJoinGroupRetrofitMethods.java index 774a3f1..65bf3ae 100644 --- a/app/src/main/java/com/example/cosmosclient/entities/ToJoinGroupRetrofitMethods.java +++ b/app/src/main/java/com/example/cosmosclient/entities/ToJoinGroupRetrofitMethods.java @@ -26,56 +26,56 @@ public ToJoinGroupRetrofitMethods() { } - public String runRetrofit() { - //retrofitの処理 - final Retrofit retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - //interfaceから実装を取得 - final JoinGroupRest joinGroupService = retrofit.create(JoinGroupRest.class); - - String gid="dnjewvhoirae"; - String uid="dnjewvhfgoirae"; - String token="dnjewvhoidgfrae"; - //API呼び出しのための値入力 - Call call = joinGroupService.JoinGroup(gid, uid, token); - - //サーバからデータ受け取り - call.enqueue(new Callback() { - //成功時 - @Override - public void onResponse(Call call, Response response) { - if (response.isSuccessful()) { - 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); -// System.out.println(result.uri); -// System.out.println(result.token); -// System.out.println(result.iconUri); -// System.out.println(result.pw); - - //ここで成功の処理を記述 - finish(); - - } else { - //onFailureでキャッチできないエラー用 - //ここでエラーの処理を記述 - } - } - - - //失敗時 - @Override - public void onFailure(Call call, Throwable t) { - String errertxt = "errer"; - return errertxt; - } - }); - } +// public String runRetrofit() { +// //retrofitの処理 +// final Retrofit retrofit = new Retrofit.Builder() +// .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") +// .addConverterFactory(JacksonConverterFactory.create()) +// .build(); +// //interfaceから実装を取得 +// final JoinGroupRest joinGroupService = retrofit.create(JoinGroupRest.class); +// +// String gid="dnjewvhoirae"; +// String uid="dnjewvhfgoirae"; +// String token="dnjewvhoidgfrae"; +// //API呼び出しのための値入力 +// Call call = joinGroupService.JoinGroup(gid, uid, token); +// +// //サーバからデータ受け取り +// call.enqueue(new Callback() { +// //成功時 +// @Override +// public void onResponse(Call call, Response response) { +// if (response.isSuccessful()) { +// 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); +//// System.out.println(result.uri); +//// System.out.println(result.token); +//// System.out.println(result.iconUri); +//// System.out.println(result.pw); +// +// //ここで成功の処理を記述 +// finish(); +// +// } else { +// //onFailureでキャッチできないエラー用 +// //ここでエラーの処理を記述 +// } +// } +// +// +// //失敗時 +// @Override +// public void onFailure(Call call, Throwable t) { +// String errertxt = "errer"; +// return errertxt; +// } +// }); +// } } 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 8860eed..8472bfb 100644 --- a/app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java +++ b/app/src/main/java/com/example/cosmosclient/resources/JoinGroupRest.java @@ -4,12 +4,15 @@ import com.example.cosmosclient.entities.SigninResponse; import retrofit2.Call; +import retrofit2.http.Field; +import retrofit2.http.FormUrlEncoded; import retrofit2.http.POST; import retrofit2.http.Path; import retrofit2.http.Query; public interface JoinGroupRest { @POST("groups/{gId}/members") - Call JoinGroup(@Path("gId") String gId, @Query("uId ") String uId , @Query("token ") String token); + @FormUrlEncoded + 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 c26ce72..96fc61f 100644 --- a/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/JoinGroupByIDActivity.java @@ -45,9 +45,9 @@ //interfaceから実装を取得 JoinGroupRest joinGroupService = retrofit.create(JoinGroupRest.class); - String gid="dnjewvhoirae"; - String uid="dnjewvhfgoirae"; - String token="dnjewvhoidgfrae"; + String gid="qwer"; + String uid="asdf"; + String token="sggh"; //API呼び出しのための値入力 Call call = joinGroupService.JoinGroup(gid, uid, token); @@ -56,14 +56,11 @@ //成功時 @Override public void onResponse(Call call, Response response) { - JoinGroupResponse result = response.body(); - System.out.println(result); - if (response.isSuccessful()) { // JoinGroupResponse result = response.body(); - - Cosmos app = (Cosmos) getApplication(); - Intent intent = new Intent(getApplication(), GroupListActivity.class); + result.setText("成功"); +// Cosmos app = (Cosmos) getApplication(); +// Intent intent = new Intent(getApplication(), GroupListActivity.class); //test // System.out.println(result.uId); @@ -79,6 +76,8 @@ } else { //onFailureでキャッチできないエラー用 //ここでエラーの処理を記述 + result.setText("失敗"); + } } @@ -89,6 +88,8 @@ t.printStackTrace(); Toast.makeText(JoinGroupByIDActivity.this, "アカウント作成失敗",Toast.LENGTH_SHORT); + result.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 7da637c..1d3282f 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.EditText; import android.widget.TextView; import android.widget.Toast; @@ -25,6 +26,7 @@ public class QRcodeReadingActivity extends CaptureActivity { public String QRcodeData = null; TextView QRcodeResult; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -44,7 +46,7 @@ //QRコードから読み取った結果の取得 @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); + final IntentResult result = IntentIntegrator.parseActivityResult(requestCode, resultCode, data); if(result != null) { QRcodeData = (String)result.getContents(); QRcodeResult.setText(QRcodeData); @@ -52,6 +54,9 @@ super.onActivityResult(requestCode, resultCode, data); } + //テストでグループIDを出力 + final TextView testtxt = (TextView)findViewById(R.id.result); + //retrofitの処理 final Retrofit retrofit = new Retrofit.Builder() .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/cosmos/") @@ -68,6 +73,7 @@ //サーバからデータ受け取り call.enqueue(new Callback() { + //成功時 @Override public void onResponse(Call call, Response response) { @@ -86,11 +92,15 @@ // System.out.println(result.pw); //ここで成功の処理を記述 + testtxt.setText("成功"); + finish(); } else { //onFailureでキャッチできないエラー用 //ここでエラーの処理を記述 + testtxt.setText("失敗"); + } } diff --git a/app/src/main/res/layout/activity_qrcode_reading.xml b/app/src/main/res/layout/activity_qrcode_reading.xml index 3a7780e..5fb778a 100644 --- a/app/src/main/res/layout/activity_qrcode_reading.xml +++ b/app/src/main/res/layout/activity_qrcode_reading.xml @@ -17,4 +17,17 @@ app:layout_constraintHorizontal_bias="0.5" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + \ No newline at end of file