diff --git a/app/src/main/java/com/example/cosmosclient/views/Signin.java b/app/src/main/java/com/example/cosmosclient/views/Signin.java index 08ae5bc..3b1cc5b 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Signin.java +++ b/app/src/main/java/com/example/cosmosclient/views/Signin.java @@ -1,12 +1,11 @@ package com.example.cosmosclient.views; -import java.util.List; - import retrofit2.Call; import retrofit2.http.POST; import retrofit2.http.Path; +import retrofit2.http.Query; public interface Signin { @POST("users/{uId}/login") - Call loginList(@Path("uId") String uId, @Path("pw")String pw); + Call loginList(@Path("uId") String uId, @Query("pw") String pw); } diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index 13c54f1..47babd5 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -38,15 +38,14 @@ //interfaceから実装を取得 final Signin signin = retrofit.create(Signin.class); - - //Sign inボタンの処理 SigninButton.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - //Intent intent = new Intent(getApplication(), GroupList.class); + //APIに値を送信 Call call = signin.loginList(NameText.getText().toString(), PasswordText.getText().toString()); + //サーバからのレスポンス call.enqueue(new Callback() { //成功時 @Override @@ -57,12 +56,13 @@ //intent.putExtra("UserInfomation",result); Toast.makeText(SigninActivity.this, "ログインしました", Toast.LENGTH_SHORT).show(); - //test - startActivity(intent); finish(); + }else{ + Toast.makeText(SigninActivity.this, + "ユーザIDもしくはパスワードが間違っています",Toast.LENGTH_SHORT).show(); } } diff --git a/app/src/main/java/com/example/cosmosclient/views/Signup.java b/app/src/main/java/com/example/cosmosclient/views/Signup.java index c88e615..ba90f00 100644 --- a/app/src/main/java/com/example/cosmosclient/views/Signup.java +++ b/app/src/main/java/com/example/cosmosclient/views/Signup.java @@ -4,7 +4,6 @@ import retrofit2.http.Field; import retrofit2.http.FormUrlEncoded; import retrofit2.http.POST; -import retrofit2.http.Path; public interface Signup { @POST("users") diff --git a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java index 44dc94e..b1dff9b 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java @@ -20,7 +20,7 @@ import retrofit2.converter.jackson.JacksonConverterFactory; public class SignupActivity extends AppCompatActivity { - public static final String UserInfomation="com.example.cosmosclient.views"; +// public static final String UserInfomation="com.example.cosmosclient.views"; @Override protected void onCreate(Bundle savedInstanceState) { @@ -49,22 +49,20 @@ MakeAccountButton.setOnClickListener(new View.OnClickListener(){ @Override public void onClick(View v){ - //パスワードと確認パスワードが一致していない際の処理 -// if(!PasswordText.equals(ConfirmPasswordText)){ +// if(PasswordText.getText().toString().equals(ConfirmPasswordText.getText().toString()) == false){ // Toast.makeText(SignupActivity.this,"入力されたパスワードが一致しません。",Toast.LENGTH_SHORT); // return; // } - System.out.println(""); //API呼び出しのための値入力 Call call = signup.listUser(NameText.getText().toString(), PasswordText.getText().toString(),"https://yumenavi.info/live/2018/photo/k/s015980019.jpg"); + //サーバからデータ受け取り call.enqueue(new Callback() { //成功時 @Override public void onResponse(Call call, Response response) { - System.out.println(""); if (response.isSuccessful()) { User result = response.body(); Intent intent = new Intent(getApplication(), GroupList.class); @@ -84,7 +82,6 @@ }else{ Toast.makeText(SignupActivity.this, "アカウント作成失敗",Toast.LENGTH_SHORT); - finish(); } } @@ -95,9 +92,7 @@ Toast.makeText(SignupActivity.this, "アカウント作成失敗",Toast.LENGTH_SHORT); } - }); - } });