Merge pull request #71 from nitta-lab-2022/EnterRoom0929

Fork: 0

nitta-lab-2022 / IrisClient

Browse code Merge pull request #71 from nitta-lab-2022/EnterRoom0929 Irisにridとnicknameを送る処理を追加。次画面にIrisからridとnicknameの取得処理を追加。 DrawingActivity GameActivity_Shimokawa GameView1110 GameViewActivity1108 GameViewActivity1115 GameViewModel1020 GameViewModel1117 List1025 Okazaki0927 Owner10/27 Owner1101 OwnerRoomActivity cardfragment_bug1105 cardfragment_bug1108 drawingCardFragment_ConnectViewModel drawingCard_endlogic drawingFragment_outputDrawImage drawingcardbug_1110 drawingcardfragment-1101error drawingcardfragment-connectVM2 fragment-urlToImage master o_game ok_home output_log ...test01
commit d09b4588c757b478cd4afc94274b0592028fccf7 2 parents 52ddac1 + 67e8f39 Kengo Iwamoto authored on 29 Sep 2022

Browse code

Irisにridとnicknameを送る処理を追加。次画面にIrisからridとnicknameの取得処理を追加。

DrawingActivity ...test01

commit d09b4588c757b478cd4afc94274b0592028fccf7

2 parents 52ddac1 + 67e8f39

Kengo Iwamoto authored on 29 Sep 2022

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          app/src/main/java/org/ntlab/irisclient/EnterRoomActivity.java
                         @Override
                        public void onResponse(Call<RoomJson> call, Response<RoomJson> response) {
                            if(response.isSuccessful()){
 
                                /*String responseRid = response.body().getRid();
                                ((Iris) getApplication()).setRid(responseRid);*/
                                String responseRid = response.body().getRid();
                                ((Iris) getApplication()).setRid(responseRid);
                                ((Iris) getApplication()).setNickname(name);
 
                                Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class);
                                intent.putExtra("nickname", name);
                                //intent.putExtra("nickname", name);
                                startActivity(intent);
                            }else {
                                Snackbar.make(v, "部屋に同名のプレイヤーがいるか,満席です", Snackbar.LENGTH_LONG).show();
                            }
                         @Override
                         public void onResponse(Call<RoomJson> call, Response<RoomJson> response) {
                             if(response.isSuccessful()){
+                                /*String responseRid = response.body().getRid();
+                                ((Iris) getApplication()).setRid(responseRid);*/
+                                String responseRid = response.body().getRid();
+                                ((Iris) getApplication()).setRid(responseRid);
+                                ((Iris) getApplication()).setNickname(name);
                                 Intent intent = new Intent(EnterRoomActivity.this,MemberRoomActivity.class);
+                                intent.putExtra("nickname", name);
+                                //intent.putExtra("nickname", name);
                                 startActivity(intent);
                             }else {
                                 Snackbar.make(v, "部屋に同名のプレイヤーがいるか,満席です", Snackbar.LENGTH_LONG).show();
                             }

                Ignore Space
               Show notes
              View
            
          
          7 ■■■■■
          app/src/main/java/org/ntlab/irisclient/MemberRoomActivity.java
     //フィールド
    ArrayList<String> members = new ArrayList<>();
    String r = "roomid";
    String myName = "null";
    //String roomId = ((Iris) getApplication()).getRid();
    //private RoomViewModel roomViewModel;
    private RoomViewModel roomViewModel;
 
 
 
 
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
        setContentView(R.layout.activity_member_room);
 
        String roomId = ((Iris) getApplication()).getRid();
        String nickname = ((Iris) getApplication()).getNickname();
 
        //自分のなまえ
        //Intent intentMain = getIntent();
        //myName = intentMain.getStringExtra("nickname");
     //フィールド
     ArrayList<String> members = new ArrayList<>();
     String r = "roomid";
     String myName = "null";
+    //String roomId = ((Iris) getApplication()).getRid();
+    //private RoomViewModel roomViewModel;
+    private RoomViewModel roomViewModel;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_member_room);
+        String roomId = ((Iris) getApplication()).getRid();
+        String nickname = ((Iris) getApplication()).getNickname();
         //自分のなまえ
         //Intent intentMain = getIntent();
         //myName = intentMain.getStringExtra("nickname");

Ignore Space Show notes View app/src/main/java/org/ntlab/irisclient/OwnerRoomActivity.java

Show line notes below