diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 9ceeeae..d6dea49 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/connections/CharactersFragmentConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java index ba4a467..dbe9a35 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/CharactersFragmentConnection.java @@ -5,11 +5,11 @@ public class CharactersFragmentConnection extends HttpAsyncConnection { public CharactersFragmentConnection() { - super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/Instances/"+"変数"+"/characters"); + super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/"+"変数"+"/characters"); } public CharactersFragmentConnection(String instanceId) { - super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/Instances/"+ instanceId +"/characters"); + super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances/"+ instanceId +"/characters"); } } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java index 14953d9..e67327e 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/connections/InstancesFragmentConnection.java @@ -5,7 +5,7 @@ public class InstancesFragmentConnection extends HttpAsyncConnection { public InstancesFragmentConnection() { - super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/Instances"); + super("http://nitta-lab-www.is.konan-u.ac.jp:8080/CactusServer/rest/instances"); } } 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 3be8b2c..c43f67f 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 @@ -21,7 +21,9 @@ import java.util.ArrayList; public class CharactersFragment extends Fragment { + private CharactersFragmentConnection connection; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { 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 b433e8b..31c75d8 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 @@ -66,31 +66,31 @@ ArrayAdapter adapter = new ArrayAdapter(getContext(), android.R.layout.simple_list_item_1, listNames); listView = (ListView) view.findViewById(R.id.list_view); listView.setAdapter(adapter); + + // セルを選択されたら詳細画面フラグメント呼び出す + listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View v, int InstanceNum, long id) { + + //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない + //................................................... + //InstanceNum+で選ばれたインスタンスわかるで!数字は0からやで!例えば1はデータ2やで!やで + String[] s = listInstances.get(InstanceNum).getKey().split("/"); + + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + CharactersFragment fragment = new CharactersFragment(); + Bundle bundle = new Bundle(); + bundle.putSerializable("instanceId",s[s.length-1]); + fragment.setArguments(bundle); + transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); + transaction.addToBackStack(null); + transaction.commit(); + } + }); } }); connection.doGet(); - - // セルを選択されたら詳細画面フラグメント呼び出す - listView.setOnItemClickListener(new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View v, int InstanceNum, long id) { - - //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない - //................................................... - //InstanceNum+で選ばれたインスタンスわかるで!数字は0からやで!例えば1はデータ2やで!やで - String[] s = listInstances.get(InstanceNum).getKey().split("/"); - - FragmentManager manager = getFragmentManager(); - FragmentTransaction transaction = manager.beginTransaction(); - CharactersFragment fragment = new CharactersFragment(); - Bundle bundle = new Bundle(); - bundle.putSerializable("InstanceId",s.length-1); - fragment.setArguments(bundle); - transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); - transaction.addToBackStack(null); - transaction.commit(); - } - }); } } \ No newline at end of file