diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java index 282c22a..1085bbf 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/LoginFragmentConnection.java @@ -5,7 +5,7 @@ public class LoginFragmentConnection extends HttpAsyncConnection { public LoginFragmentConnection() { - super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/CactusServer/rest/accounts"); + super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/accounts"); } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java index 790156d..6c70db3 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/SignUpFragmentConnection.java @@ -5,7 +5,7 @@ public class SignUpFragmentConnection extends HttpAsyncConnection { public SignUpFragmentConnection() { - super("http://nitta-lab-www2.is.konan-u.ac.jp:8080/CactusServer/rest/accounts"); + super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/accounts"); } } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java index 8fe2513..8e38502 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/models/Account.java @@ -5,6 +5,8 @@ public class Account { private String id, name, token, pass, uniqueID; private boolean login = false; + private Account(){ + } public Account(String userID, String userName, String userPass, String uniqueID) { setId(userID); @@ -48,6 +50,11 @@ this.login = login; } + public void setToken(String token){ + this.token = token; + + } + public String getToken() { return token; } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index c246924..82298f1 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java @@ -11,7 +11,6 @@ import android.widget.ArrayAdapter; import android.widget.Button; import android.widget.ListView; -import android.widget.Toast; import org.ntlab.radishforandroidstudio.R; @@ -21,11 +20,11 @@ import java.util.ArrayList; public class CharactersFragment extends Fragment { - + int InstanceNum; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - int position = getArguments().getInt("position"); + InstanceNum = getArguments().getInt("InstanceNum"); Cactus c = (Cactus) getActivity().getApplication(); Account account = c.getMyAccount(); @@ -39,28 +38,22 @@ public void onViewCreated(View view, Bundle savedInstanceState) { Button button = (Button) getActivity().findViewById(R.id.chooseInstances); - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); - FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.replace(R.id.fragment_place, new InstancesFragment()); - transaction.commit(); } }); - // ListViewに表示するデータ final ArrayList items = new ArrayList<>(); - items.add("キャラクター1"); - items.add("キャラクター2"); - items.add("キャラクター3"); + items.add("インスタンスが"+ InstanceNum +"のキャラクター1"); + items.add("インスタンスが"+ InstanceNum +"のキャラクター2"); + items.add("インスタンスが"+ InstanceNum +"のキャラクター3"); // ListViewをセット final ArrayAdapter adapter = new ArrayAdapter(this.getContext(), android.R.layout.simple_list_item_1, items); 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 d4cbbc1..5c5d928 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 @@ -31,6 +31,7 @@ //このあたりで、サーバーと通信して、インスタンスの情報をとってくる //............................................................... + //getInstances // @@ -42,9 +43,9 @@ public void onViewCreated(View view, Bundle savedInstanceState) { // ListViewに表示するデータ final ArrayList items = new ArrayList<>(); - items.add("データ1"); - items.add("データ2"); - items.add("データ3"); + items.add("インスタンス1"); + items.add("インスタンス2"); + items.add("インスタンス3"); // ListViewをセット final ArrayAdapter adapter = new ArrayAdapter(this.getContext(), android.R.layout.simple_list_item_1, items); @@ -53,7 +54,7 @@ // セルを選択されたら詳細画面フラグメント呼び出す listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { @Override - public void onItemClick(AdapterView parent, View v, int position, long id) { + public void onItemClick(AdapterView parent, View v, int InstanceNum, long id) { //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない //................................................... @@ -63,9 +64,10 @@ FragmentTransaction transaction = manager.beginTransaction(); CharactersFragment fragment = new CharactersFragment(); Bundle bundle = new Bundle(); - bundle.putSerializable("position",position); + bundle.putSerializable("InstanceNum",InstanceNum+1); fragment.setArguments(bundle); transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); + transaction.addToBackStack(null); 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 3ca29bc..61e5b78 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 @@ -62,6 +62,7 @@ FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new InstancesFragment()); transaction.commit(); + return; } // **********************************************************************/ @@ -80,13 +81,12 @@ public void onResponse(String response) { //通信した時の処理を書くのだよ URIAddressedAccount lac = JSON.decode(response, new TypeReference(){}); - System.out.println("///////////////////////////////////////////////"); - System.out.println(response); +// System.out.println(response); Account user = lac.getAccount(); if(user.isLogin()){ + Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); Cactus c = (Cactus) getActivity().getApplication(); c.setMyAccount(user); - Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); transaction.replace(R.id.fragment_place, new InstancesFragment()); 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 eeadd8b..df08e52 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 @@ -28,7 +28,6 @@ return inflater.inflate(R.layout.sign_up_fragment, container, false); } - //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓ @Override public void onStart() { @@ -37,16 +36,12 @@ //ログインボタン Button button = (Button) getActivity().findViewById(R.id.LoginButton2); button.setOnClickListener(new View.OnClickListener() { - @Override public void onClick(View v) { //Toast.makeText(getActivity(), "hoge!", Toast.LENGTH_SHORT).show(); - FragmentManager manager = getFragmentManager(); FragmentTransaction transaction = manager.beginTransaction(); - transaction.addToBackStack(null); - //transaction.replace(R.id.fragment_place, new LoginFragment()); transaction.replace(R.id.fragment_place, new LoginFragment()); transaction.commit(); @@ -83,12 +78,12 @@ @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class); +// URIAddressedAccount ac = JSON.decode(response,URIAddressedAccount.class); +// System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri()); 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(); + Toast.makeText(getActivity(),"アカウントを作成しました。", Toast.LENGTH_SHORT).show(); } }); @@ -96,8 +91,6 @@ connection.addFormParam("userPass", inputPassword.getText().toString()); connection.addFormParam("userName", inputUserName.getText().toString()); connection.doPost(); - - } }); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java index cd6bf85..96cb463 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/framework/network/HttpAsyncConnection.java @@ -5,7 +5,9 @@ import android.util.Log; import java.io.BufferedReader; +import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.OutputStream; import java.net.HttpURLConnection; @@ -120,21 +122,52 @@ // response public String doReceive() { BufferedReader reader; + InputStream in = null; try { - reader = new BufferedReader(new InputStreamReader(conn.getInputStream())); + System.out.println(conn.getResponseCode()); + in = conn.getInputStream(); + reader = new BufferedReader(new InputStreamReader(in)); String line; StringBuilder builder = new StringBuilder(); - while((line = reader.readLine()) != null) + while ((line = reader.readLine()) != null) builder.append(line); reader.close(); if (conn != null) conn.disconnect(); return builder.toString(); + } catch (FileNotFoundException e) { // IOException をキャッチするより先に FileNotFoundException をキャッチしないと IOException のキャッチブロックに行くのでこうする + System.err.println(e); + InputStream err = null; + try { + err = conn.getErrorStream(); + System.out.println(err.read()); + // 4xx または 5xx なレスポンスのボディーを読み取る + // ... + } catch (IOException e2) { + System.err.println(e2); + } finally { + if (err != null) { + try { + err.close(); + } catch (IOException e3) { + System.err.println(e3); + } + } + } } catch (IOException e) { - e.printStackTrace(); - if (conn != null) conn.disconnect(); - return null; + System.err.println(e); + } finally { + if (in != null) { + try { + in.close(); + } catch (IOException e) { + System.err.println(e); + } + } + if (conn != null) { + conn.disconnect(); + } } - + return null; } public void notConnection(){};