通信処理(token)以外 #26

Merged m-shindo merged 1 commit into nitta-lab-2020:master from nitta-lab-2020:Signup on 27 Jun 2020

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          6 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/LoginActivity.java
     protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_login);
        Retrofit retrofit = new Retrofit.Builder()
                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/rest/")
                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
                .addConverterFactory(JacksonConverterFactory.create())
                .build();
        final AccountsRest LoginService = retrofit.create(AccountsRest.class);
        setContentView(R.layout.activity_login);
                call.enqueue(new Callback<LoginJson>(){
                    @Override
                    public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
                        LoginJson loginJson =response.body();
                        String token = loginJson.getToken();
                        Amaryllis app = (Amaryllis) getApplication();
                        app.setToken(loginJson.getToken());
                        Intent intent = new Intent(LoginActivity.this, MapsActivity.class);
                        startActivity(intent);
                    }
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         Retrofit retrofit = new Retrofit.Builder()
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/rest/")
+                .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/amaryllis/")
                 .addConverterFactory(JacksonConverterFactory.create())
                 .build();
         final AccountsRest LoginService = retrofit.create(AccountsRest.class);
         setContentView(R.layout.activity_login);
                 call.enqueue(new Callback<LoginJson>(){
                     @Override
                     public void onResponse(Call<LoginJson> call, Response<LoginJson> response) {
                         LoginJson loginJson =response.body();
+                        String token = loginJson.getToken();
+                        Amaryllis app = (Amaryllis) getApplication();
+                        app.setToken(loginJson.getToken());
                         Intent intent = new Intent(LoginActivity.this, MapsActivity.class);
                         startActivity(intent);
                     }

                Ignore Space
               Show notes
              View
            
          
          19 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/SignUpActivity.java
 import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;
 
import org.ntlab.amaryllis.client.entities.LoginJson;
import org.ntlab.amaryllis.client.entities.SignUpJson;
import org.ntlab.amaryllis.client.resources.AccountsRest;
 
import retrofit2.Call;
                Call<SignUpJson> call = signUpService.PostSignUp(passWordEditText.getText().toString(), nameEditText.getText().toString());
                call.enqueue(new Callback<SignUpJson>(){
                    @Override
                    public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
                        Intent intent = new Intent(SignUpActivity.this, LoginActivity.class);
                        SignUpJson signUpJson =response.body();
                        String token = signUpJson.getToken();
                        Amaryllis amaryllis = (Amaryllis) getApplication();
                        amaryllis.setToken(token);
                        Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
                        startActivity(intent);
                    }
 
                    @Override
                    }
                });
            }
        });
       /* Amaryllis amaryllis =(Amaryllis) getApplication();
        String uid = amaryllis.getUid();
        String passWord = amaryllis.getPassWord();
        if(uid != null && passWord != null){
            signUpService.accountLogin(uid,passWord);
            Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
            startActivity(intent);
        }*/
 
    }
 
    @Override
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import org.ntlab.amaryllis.client.entities.LoginJson;
 import org.ntlab.amaryllis.client.entities.SignUpJson;
 import org.ntlab.amaryllis.client.resources.AccountsRest;
 import retrofit2.Call;
                 Call<SignUpJson> call = signUpService.PostSignUp(passWordEditText.getText().toString(), nameEditText.getText().toString());
                 call.enqueue(new Callback<SignUpJson>(){
                     @Override
                     public void onResponse(Call<SignUpJson> call, Response<SignUpJson> response) {
+                        Intent intent = new Intent(SignUpActivity.this, LoginActivity.class);
+                        SignUpJson signUpJson =response.body();
+                        String token = signUpJson.getToken();
+                        Amaryllis amaryllis = (Amaryllis) getApplication();
+                        amaryllis.setToken(token);
+                        Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
                         startActivity(intent);
                     }
                     @Override
                     }
                 });
             }
         });
+       /* Amaryllis amaryllis =(Amaryllis) getApplication();
+        String uid = amaryllis.getUid();
+        String passWord = amaryllis.getPassWord();
+        if(uid != null && passWord != null){
+            signUpService.accountLogin(uid,passWord);
+            Intent intent = new Intent(SignUpActivity.this, MapsActivity.class);
+            startActivity(intent);
+        }*/
     }
     @Override

                Ignore Space
               Show notes
              View
            
          
          9 ■■■■■
          app/src/main/java/org/ntlab/amaryllis/client/entities/SignUpJson.java
 public class SignUpJson {
    private String message;
    private String uid;
    private String token;
 
    public String getMessage() {
        return message;
    }
 
    public void setUid(String uid) {
        this.uid = uid;
    }
 
    public void setToken(String token) {
        this.token = token;
    }
 
    public String getToken() {
        return token;
    }
}
 public class SignUpJson {
     private String message;
     private String uid;
+    private String token;
     public String getMessage() {
         return message;
     }
     public void setUid(String uid) {
         this.uid = uid;
     }
+    public void setToken(String token) {
+        this.token = token;
+    }
+    public String getToken() {
+        return token;
+    }
 }