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 6ea7a4c..ba4a467 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,7 +5,11 @@ public class CharactersFragmentConnection extends HttpAsyncConnection { public CharactersFragmentConnection() { - 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/"+"変数"+"/characters"); + } + + public CharactersFragmentConnection(String instanceId) { + 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/views/CharactersFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/CharactersFragment.java index 82298f1..3be8b2c 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 @@ -15,20 +15,24 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.Cactus; +import org.ntlab.radishforandroidstudio.cactusClient.connections.CharactersFragmentConnection; import org.ntlab.radishforandroidstudio.cactusClient.models.Account; import java.util.ArrayList; public class CharactersFragment extends Fragment { - int InstanceNum; + private CharactersFragmentConnection connection; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - InstanceNum = getArguments().getInt("InstanceNum"); + String instanceId = getArguments().getString("instanceId"); Cactus c = (Cactus) getActivity().getApplication(); Account account = c.getMyAccount(); + connection = new CharactersFragmentConnection(instanceId); + + // Inflate the layout for this fragment return inflater.inflate(R.layout.characters_fragment, container, false); } @@ -51,9 +55,9 @@ // ListViewに表示するデータ final ArrayList items = new ArrayList<>(); - items.add("インスタンスが"+ InstanceNum +"のキャラクター1"); - items.add("インスタンスが"+ InstanceNum +"のキャラクター2"); - items.add("インスタンスが"+ InstanceNum +"のキャラクター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 8ad6d11..b433e8b 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 @@ -78,11 +78,13 @@ //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない //................................................... //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("InstanceNum",InstanceNum+1); + bundle.putSerializable("InstanceId",s.length-1); fragment.setArguments(bundle); transaction.replace(R.id.fragment_place, fragment,"characters_fragment"); transaction.addToBackStack(null);