diff --git a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java index c066ae7..90157cc 100644 --- a/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java +++ b/app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java @@ -37,21 +37,24 @@ //irisからプレイヤーの一覧を取得 Iris iris = (Iris)this.getActivity().getApplication(); - if(iris != null){ - System.out.println("Gakuto:GamePLayerList irisを取得できています" ); - } - List players = iris.getMemberList(); List myTeamPlayers = new ArrayList<>(); - //memberのリストから名前(string)だけを抽出 + //プレイヤーのリストから名前(string)だけを抽出 ArrayList viewPlayers = new ArrayList<>(); + //自分と同じチームのだけと抽出。スパイマスターはトップにくるようにしています。 players.forEach(m -> { if(m.getBelongs().equals(myTeam)){ - viewPlayers.add(m.getNickname()); - myTeamPlayers.add(m); + if(m.getMaster() == true){ + viewPlayers.add(0,m.getNickname()); + myTeamPlayers.add(0,m); + }else{ + viewPlayers.add(m.getNickname()); + myTeamPlayers.add(m); + } + } }); @@ -59,9 +62,9 @@ ListView playersList = (ListView) view.findViewById(R.id.PlayersList); - BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, players); + //BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, players); // BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.fragment_game_player_list, viewPlayers, players); - // BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, myTeamPlayers); + BaseAdapter adapter = new MemberListAdapter(this.getActivity().getApplicationContext(), R.layout.member_list_layout, viewPlayers, myTeamPlayers); playersList.setAdapter(adapter); return view;