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 673fd26..3ca29bc 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 @@ -24,6 +24,7 @@ public class LoginFragment extends Fragment { private LoginFragmentConnection connection; + private Boolean testFlag = false; //trueにすると、通信せずにインスタンス画面へ遷移します。つまり、通信なしでテストするなら"true"にせい @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, @@ -37,9 +38,7 @@ super.onStart(); Button button = (Button)getActivity().findViewById(R.id.signUP1); - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ button.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); @@ -50,8 +49,6 @@ transaction.commit(); } }); - //↑↑↑↑↑画面遷移↑↑↑↑↑↑ - Button loginButton = (Button)getActivity().findViewById(R.id.login); loginButton.setOnClickListener(new View.OnClickListener() { @Override @@ -60,13 +57,12 @@ EditText passWord = (EditText)getActivity().findViewById(R.id.checkPassword); // /**************************************************************** -// テストするなら以下を実行するとパスの入力をしなくても画面遷移します - FragmentManager manager = getFragmentManager(); - FragmentTransaction transaction = manager.beginTransaction(); - - transaction.replace(R.id.fragment_place, new InstancesFragment()); - - transaction.commit(); + if(testFlag) { + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + transaction.replace(R.id.fragment_place, new InstancesFragment()); + transaction.commit(); + } // **********************************************************************/ @@ -87,11 +83,9 @@ System.out.println("///////////////////////////////////////////////"); System.out.println(response); Account user = lac.getAccount(); - if(user.isLogin()){ Cactus c = (Cactus) getActivity().getApplication(); c.setMyAccount(user); - Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); @@ -100,14 +94,11 @@ }else { Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); } - } }); connection.addFormParam("userID", userName.getText().toString()); connection.addFormParam("userPass", passWord.getText().toString()); - connection.doPut(); - - + if(testFlag == false)connection.doPut(); } });