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 1d1d5b5..bd4f1f9 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,45 +9,55 @@ 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 { - private LoginFragmentConnection loginFragmentConnection = new LoginFragmentConnection(); - String userId; - String userPass; - Cactus cactus; + private String userId; + private String userPass; + private Cactus cactus; + private LoginFragmentConnection loginFragmentConnection; + + public UserLoginController(){} 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 UserLoginController() { - } - public boolean login() { + + public void login() { + loginFragmentConnection = new LoginFragmentConnection(); loginFragmentConnection.setCallBack(new CallBack() { @Override public void onResponse(String response) { - URIAddressedAccount uriAddressedAccount = JSON.decode(response, new TypeReference() { - }); + //通信した時の処理を書くのだよ + URIAddressedAccount uriAddressedAccount = JSON.decode(response, new TypeReference(){}); +// System.out.println(response); Account account = uriAddressedAccount.getAccount(); if (account.isLogin()) { cactus.setMyAccount(account);//Cactusにアカウントセット cactus.setAddressedAccount(uriAddressedAccount);//Jsonから + LoginFragment loginFragment = new LoginFragment(); + loginFragment.transFragment(); + System.out.println("ログインに成功しました。"); + + + } else { + System.out.println("ログインに失敗しました。"); + } } }); - return true; - } - - - public void addUserFormParam() { loginFragmentConnection.addFormParam("userID", userId); loginFragmentConnection.addFormParam("userPass", userPass); loginFragmentConnection.doPut(); + } + } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java index 65dcff8..4314cd3 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -17,11 +17,11 @@ public class LoginFragment extends Fragment { - Cactus cactus; - UserLoginController userLoginController; - boolean isUserLogin; - EditText userName; - EditText passWord; + private Cactus cactus; + private UserLoginController userLoginController; + private EditText userName; + private EditText passWord; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -47,7 +47,7 @@ @Override public void onClick(View view) { userName = (EditText) getActivity().findViewById(R.id.inputUserName); - passWord = (EditText) getActivity().findViewById(R.id.checkPassword); + passWord = (EditText) getActivity().findViewById(R.id.checkPassword); if (userName.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); @@ -61,26 +61,20 @@ //通信処理 cactus = (Cactus) getActivity().getApplication(); userLoginController = new UserLoginController(cactus, userName, passWord); - isUserLogin = userLoginController.login(); - if (isUserLogin) { - Toast.makeText(getActivity(), "ログインに成功しました。", Toast.LENGTH_SHORT).show(); - //画面遷移 - FragmentManager manager = getFragmentManager(); - FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new InstancesFragment()); - transaction.commit(); - } else { - Toast.makeText(getActivity(), "ログインに失敗しました。", Toast.LENGTH_SHORT).show(); - } - - - + userLoginController.login(); +// userLoginController.addUserFormParam(); } }); - UserLoginController userLoginController = new UserLoginController(); - userLoginController.addUserFormParam(); return view; } + + + public void transFragment() { + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + transaction.replace(R.id.fragment_place, new InstancesFragment()); + transaction.commit(); + } }