diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cb0ef0b..4f19a48 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,10 +5,13 @@
android:hardwareAccelerated="true"
-
+
+
+
listUser(@Path("name") String name,@Path("pw") String pw,@Path("icon-image") String icon_image);
+ Call listUser(@Field("name") String name, @Field("pw") String pw, @Field("icon-image") String icon_image);
}
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 58747fd..44dc94e 100644
--- a/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
+++ b/app/src/main/java/com/example/cosmosclient/views/SignupActivity.java
@@ -51,33 +51,47 @@
public void onClick(View v){
//パスワードと確認パスワードが一致していない際の処理
- if(!PasswordText.equals(ConfirmPasswordText)){
- Toast.makeText(SignupActivity.this,"入力されたパスワードが一致しません。",Toast.LENGTH_SHORT);
- return;
- }
+// if(!PasswordText.equals(ConfirmPasswordText)){
+// Toast.makeText(SignupActivity.this,"入力されたパスワードが一致しません。",Toast.LENGTH_SHORT);
+// return;
+// }
+ System.out.println("");
//API呼び出しのための値入力
- Call call = signup.listUser(NameText.getText().toString(),
- PasswordText.getText().toString(),null);
+ 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);
//intent.putExtra("UserInfomation",result);
+
+ //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);
+
startActivity(intent);
finish();
+ }else{
+ Toast.makeText(SignupActivity.this,
+ "アカウント作成失敗",Toast.LENGTH_SHORT);
+ finish();
}
}
//失敗時
@Override
public void onFailure(Call call, Throwable t) {
- //t.printStackTrace();
+ t.printStackTrace();
Toast.makeText(SignupActivity.this,
"アカウント作成失敗",Toast.LENGTH_SHORT);
}
diff --git a/app/src/main/java/com/example/cosmosclient/views/User.java b/app/src/main/java/com/example/cosmosclient/views/User.java
index 55d3d40..1fd85b2 100644
--- a/app/src/main/java/com/example/cosmosclient/views/User.java
+++ b/app/src/main/java/com/example/cosmosclient/views/User.java
@@ -3,9 +3,11 @@
public class User {
public String uId;
public String name;
+ public String pw;
public String uri;
public String token;
- public String icon_uri;
+ public String iconUri;
+ public boolean login;
}