diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 1d1275b..86dd0b1 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java index d8fed11..d4cbbc1 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java @@ -15,6 +15,8 @@ import org.ntlab.radishforandroidstudio.R; +import org.ntlab.radishforandroidstudio.cactusClient.Cactus; +import org.ntlab.radishforandroidstudio.cactusClient.models.Account; import java.util.ArrayList; import java.util.List; @@ -35,6 +37,7 @@ // Inflate the layout for this fragment return inflater.inflate(R.layout.instances_fragment, container, false); } + @Override public void onViewCreated(View view, Bundle savedInstanceState) { // ListViewに表示するデータ @@ -54,13 +57,13 @@ //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない //................................................... - // + //positionで選ばれたインスタンスわかるで！数字は０からやで！例えば１はデータ２やで！やで FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); CharactersFragment fragment = new CharactersFragment(); Bundle bundle = new Bundle(); - bundle.putSerializable("test","これはテストです"); + bundle.putSerializable("position",position); fragment.setArguments(bundle); transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); transaction.commit(); 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 93f93d4..b1dad9c 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 @@ -9,8 +9,15 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; +import android.widget.Toast; + +import net.arnx.jsonic.JSON; +import net.arnx.jsonic.TypeReference; + import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; +import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedAccount; +import org.ntlab.radishforandroidstudio.framework.network.CallBack; public class LoginFragment extends Fragment { @@ -21,7 +28,6 @@ Bundle savedInstanceState) { // Inflate the layout for this fragment return inflater.inflate(R.layout.login_fragment, container, false); - } @Override @@ -61,38 +67,41 @@ transaction.commit(); // **********************************************************************/ -// -// if (userName.getText().toString().isEmpty()) { -// Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); -// } else if(passWord.getText().toString().isEmpty()){ -// Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show(); -// } else { -// -// connection = new LoginFragmentConnection(); -// connection.setCallBack(new CallBack() { -// @Override -// public void onResponse(String response) { -// //通信した時の処理を書くのだよ -// URIAddressedEntity lac = JSON.decode(response, URIAddressedEntity.class); -// System.out.println("///////////////////////////////////////////////"); -// System.out.println(response); -// -// if(response.contains("\"login\":true,")){ -// 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(); -// } -// -// } -// }); -// connection.addFormParam("userID", userName.getText().toString()); -// connection.addFormParam("userPass", passWord.getText().toString()); -// connection.doPut(); -// } +/* + if (userName.getText().toString().isEmpty()) { + Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show(); + return; + } else if(passWord.getText().toString().isEmpty()){ + Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show(); + return; + } + + connection = new LoginFragmentConnection(); + connection.setCallBack(new CallBack() { + @Override + public void onResponse(String response) { + //通信した時の処理を書くのだよ + URIAddressedAccount lac = JSON.decode(response, new TypeReference(){}); + System.out.println("///////////////////////////////////////////////"); + System.out.println(response); + + if(response.contains("\"login\":true,")){ + 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(); + } + + } + }); + connection.addFormParam("userID", userName.getText().toString()); + connection.addFormParam("userPass", passWord.getText().toString()); + connection.doPut(); + */ + } }); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java index 938ade5..eeadd8b 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -26,7 +26,6 @@ Bundle savedInstanceState) { // Inflate the layout for this fragment return inflater.inflate(R.layout.sign_up_fragment, container, false); - } //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ @@ -67,34 +66,38 @@ if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")){ Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show(); + return; }else if (inputPassword.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show(); + return; } else if (checkPassWord.getText().toString().isEmpty()) { Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show(); + return; } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) { Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show(); - }else{ - - connection = new SignUpFragmentConnection(); - connection.setCallBack(new CallBack() { - @Override - public void onResponse(String response) { - //通信した時の処理を書くのだよ - URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class); - URIAddressedAccount ac2 = JSON.decode(response, new TypeReference(){}); - System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri()); - System.out.println("JSON.decode(response, new TypeReference(){});\n"+ac2.getUri()); - System.out.println(response); - Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show(); - } - }); - - connection.addFormParam("userID", inputUserID.getText().toString()); - connection.addFormParam("userPass", inputPassword.getText().toString()); - connection.addFormParam("userName", inputUserName.getText().toString()); - connection.doPost(); - + return; } + + connection = new SignUpFragmentConnection(); + connection.setCallBack(new CallBack() { + @Override + public void onResponse(String response) { + //通信した時の処理を書くのだよ + URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class); + URIAddressedAccount ac2 = JSON.decode(response, new TypeReference(){}); + System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri()); + System.out.println("JSON.decode(response, new TypeReference(){});\n"+ac2.getUri()); + System.out.println(response); + Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show(); + } + }); + + connection.addFormParam("userID", inputUserID.getText().toString()); + connection.addFormParam("userPass", inputPassword.getText().toString()); + connection.addFormParam("userName", inputUserName.getText().toString()); + connection.doPost(); + + } }); }