Merge pull request #292 from nitta-lab-2022/GameActivity

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge pull request #292 from nitta-lab-2022/GameActivity_Shimokawa りょーけい GameActivity_Shimokawa GameView1110 GameViewActivity1115 GameViewModel1117 cardfragment_bug1105 master o_game ok_home ...output_log
commit 00bc63d83683d5ab3e41e015ae8b260f3819b6d1 2 parents 85ff7bd + 8b53922 Okada Kenshin authored on 10 Nov 2022

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          app/src/main/java/org/ntlab/irisclient/GameMasterActivity.java
         // ImageButton を無効にする
        Button FinishGuessButton = (Button) findViewById(R.id.finishGuessButton);
        FinishGuessButton.setEnabled(false);
        //FinishGuessButton.setColorFilter(0xaaCCCCCC);
 
    }
 
    private void buttonProcesses(){
        Button SendHintButton = (Button) findViewById(R.id.SendHint);
                }
                if(HintMax.getText().toString().length() != 0){
                    System.out.println("Gakuto:MasterActivity ヒントマックス" + HintMax.getText().toString());
                    hintMax = Integer.parseInt(HintMax.getText().toString());
                    //マックス０は受け付けない
                    if(hintMax == 0){
                        hintMax = 1;
                    }
                }
 
 
                //ニックネームまたは部屋番号が入力されていない場合エラーメッセージを表示する
         // ImageButton を無効にする
         Button FinishGuessButton = (Button) findViewById(R.id.finishGuessButton);
         FinishGuessButton.setEnabled(false);
         //FinishGuessButton.setColorFilter(0xaaCCCCCC);
     }
     private void buttonProcesses(){
         Button SendHintButton = (Button) findViewById(R.id.SendHint);
                 }
                 if(HintMax.getText().toString().length() != 0){
                     System.out.println("Gakuto:MasterActivity ヒントマックス" + HintMax.getText().toString());
                     hintMax = Integer.parseInt(HintMax.getText().toString());
+                    //マックス０は受け付けない
+                    if(hintMax == 0){
+                        hintMax = 1;
+                    }
                 }
                 //ニックネームまたは部屋番号が入力されていない場合エラーメッセージを表示する

                Ignore Space
               Show notes
              View
            
          
          37 ■■■■■
          app/src/main/java/org/ntlab/irisclient/GamePlayerListFragment.java
 import android.widget.BaseAdapter;
import android.widget.ListView;
import android.widget.TextView;
import android.view.Gravity;
import org.ntlab.irisclient.models.Member;
 
import org.ntlab.irisclient.models.Member;
 
import java.util.ArrayList;
 
        //irisからプレイヤーの一覧を取得
        Iris iris = (Iris)this.getActivity().getApplication();
 
        //test
        if(iris == null){
            System.out.println("通信失敗:Gakuto Game GamePlayerListFragment irisが取得できていません");
        }
        List<Member> players = iris.getMemberList();
        List<Member> myTeamPlayers = new ArrayList<>();
 
        List<Member> players = iris.getMemberList();
 
        //memberのリストから名前(string)だけを抽出
        //プレイヤーのリストから名前(string)だけを抽出
        ArrayList<String> viewPlayers = new ArrayList<>();
 
        //自分と同じチームのだけと抽出。スパイマスターはトップにくるようにしています。
        players.forEach(m -> {
 
            if(m.getBelongs().equals(myTeam)){
                viewPlayers.add(m.getNickname());
                if(m.getMaster() == true){
                    viewPlayers.add(0,m.getNickname());
                    myTeamPlayers.add(0,m);
                }else{
                    viewPlayers.add(m.getNickname());
                    myTeamPlayers.add(m);
                }
 
            }
        });
 
 
        System.out.println("Gakuto:GamePLayerList" + players.get(0).getNickname() + players.get(1).getNickname() );
 
        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);
        playersList.setAdapter(adapter);
 
        return view;
    }
 import android.widget.BaseAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.view.Gravity;
+import org.ntlab.irisclient.models.Member;
 import org.ntlab.irisclient.models.Member;
 import java.util.ArrayList;
         //irisからプレイヤーの一覧を取得
         Iris iris = (Iris)this.getActivity().getApplication();
+        //test
+        if(iris == null){
+            System.out.println("通信失敗:Gakuto Game GamePlayerListFragment irisが取得できていません");
+        }
+        List<Member> players = iris.getMemberList();
+        List<Member> myTeamPlayers = new ArrayList<>();
+        List<Member> players = iris.getMemberList();
+        //memberのリストから名前(string)だけを抽出
+        //プレイヤーのリストから名前(string)だけを抽出
         ArrayList<String> viewPlayers = new ArrayList<>();
+        //自分と同じチームのだけと抽出。スパイマスターはトップにくるようにしています。
         players.forEach(m -> {
             if(m.getBelongs().equals(myTeam)){
+                viewPlayers.add(m.getNickname());
+                if(m.getMaster() == true){
+                    viewPlayers.add(0,m.getNickname());
+                    myTeamPlayers.add(0,m);
+                }else{
+                    viewPlayers.add(m.getNickname());
+                    myTeamPlayers.add(m);
+                }
             }
         });
+        System.out.println("Gakuto:GamePLayerList" + players.get(0).getNickname() + players.get(1).getNickname() );
         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);
         playersList.setAdapter(adapter);
         return view;
     }

                Ignore Space
               Show notes
              View
            
          
          1 ■■■■■
          app/src/main/res/layout/activity_game_master.xml
         android:ems="10"
        android:hint="数"
        android:inputType="number"
        android:maxLength="1"
        android:imeOptions="actionDone"
        app:layout_constraintBottom_toTopOf="@+id/include"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintHorizontal_bias="0.5"
        app:layout_constraintStart_toEndOf="@+id/GameHint"
         android:ems="10"
         android:hint="数"
         android:inputType="number"
         android:maxLength="1"
+        android:imeOptions="actionDone"
         app:layout_constraintBottom_toTopOf="@+id/include"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/GameHint"

Show line notes below