diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java index bd4f1f9..7c9cb3f 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/controller/UserLoginController.java @@ -9,7 +9,6 @@ import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; import org.ntlab.radishforandroidstudio.cactusClient.models.account.Account; import org.ntlab.radishforandroidstudio.cactusClient.models.account.URIAddressedAccount; -import org.ntlab.radishforandroidstudio.cactusClient.views.LoginFragment; import org.ntlab.radishforandroidstudio.framework.network.CallBack; public class UserLoginController { @@ -19,40 +18,46 @@ private Cactus cactus; private LoginFragmentConnection loginFragmentConnection; - public UserLoginController(){} + Account account; + private boolean isLogin=false; public UserLoginController(Cactus cactus, EditText userName, EditText passWord) { loginFragmentConnection = new LoginFragmentConnection(); this.userId = userName.getText().toString(); this.userPass = passWord.getText().toString(); this.cactus = cactus; + } - public void login() { - loginFragmentConnection = new LoginFragmentConnection(); + public boolean login() { +// loginFragmentConnection = new LoginFragmentConnection(); loginFragmentConnection.setCallBack(new CallBack() { @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - URIAddressedAccount uriAddressedAccount = JSON.decode(response, new TypeReference(){}); -// System.out.println(response); - Account account = uriAddressedAccount.getAccount(); + URIAddressedAccount uriAddressedAccount = JSON.decode(response, new TypeReference() { + }); + account = uriAddressedAccount.getAccount(); + if (account.isLogin()) { cactus.setMyAccount(account);//Cactusにアカウントセット cactus.setAddressedAccount(uriAddressedAccount);//Jsonから - LoginFragment loginFragment = new LoginFragment(); - loginFragment.transFragment(); System.out.println("ログインに成功しました。"); - - + isLogin = true; } else { System.out.println("ログインに失敗しました。"); + isLogin = false; } } }); + + return isLogin; + } + + public void addUserFormParam(){ loginFragmentConnection.addFormParam("userID", userId); loginFragmentConnection.addFormParam("userPass", userPass); loginFragmentConnection.doPut();