松本彩樹のブランチ #31

Merged h-matsumoto merged 2 commits into nitta-lab-2018:master from nitta-lab-2018:松本彩樹のブランチ on 20 Jul 2018

Patch

Unified Split

Showing 4 changed files

Ignore Space Show notes View .idea/caches/build_file_checksums.ser
Not supported

                Ignore Space
               Show notes
              View
            
          
          7 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java
 import android.widget.ListView;
 
 
import org.ntlab.radishforandroidstudio.R;
import org.ntlab.radishforandroidstudio.cactusClient.Cactus;
import org.ntlab.radishforandroidstudio.cactusClient.models.Account;
 
import java.util.ArrayList;
import java.util.List;
 
 
        // Inflate the layout for this fragment
        return inflater.inflate(R.layout.instances_fragment, container, false);
    }
 
    @Override
    public void onViewCreated(View view, Bundle savedInstanceState) {
        // ListViewに表示するデータ
        final ArrayList<String> items = new ArrayList<>();
            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
 
                //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない
                //...................................................
                //
                //positionで選ばれたインスタンスわかるで！数字は０からやで！例えば１はデータ２やで！やで
 
                FragmentManager manager = getFragmentManager();
                FragmentTransaction transaction = manager.beginTransaction();
                CharactersFragment fragment = new CharactersFragment();
                Bundle bundle = new Bundle();
                bundle.putSerializable("test","これはテストです");
                bundle.putSerializable("position",position);
                fragment.setArguments(bundle);
                transaction.replace(R.id.fragment_place, fragment,"characters_fragment");
                transaction.commit();
            }
 import android.widget.ListView;
 import org.ntlab.radishforandroidstudio.R;
+import org.ntlab.radishforandroidstudio.cactusClient.Cactus;
+import org.ntlab.radishforandroidstudio.cactusClient.models.Account;
 import java.util.ArrayList;
 import java.util.List;
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.instances_fragment, container, false);
     }
     @Override
     public void onViewCreated(View view, Bundle savedInstanceState) {
         // ListViewに表示するデータ
         final ArrayList<String> items = new ArrayList<>();
             public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
                 //ここでサーバーに何番のインスタンスが選ばれたのかを送信して、受け取った値に応じてキャラクターを送信しなければならない
                 //...................................................
+                //
+                //positionで選ばれたインスタンスわかるで！数字は０からやで！例えば１はデータ２やで！やで
                 FragmentManager manager = getFragmentManager();
                 FragmentTransaction transaction = manager.beginTransaction();
                 CharactersFragment fragment = new CharactersFragment();
                 Bundle bundle = new Bundle();
+                bundle.putSerializable("test","これはテストです");
+                bundle.putSerializable("position",position);
                 fragment.setArguments(bundle);
                 transaction.replace(R.id.fragment_place, fragment,"characters_fragment");
                 transaction.commit();
             }

                Ignore Space
               Show notes
              View
            
          
          78 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
 import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
 
import net.arnx.jsonic.JSON;
import net.arnx.jsonic.TypeReference;
 
import org.ntlab.radishforandroidstudio.R;
import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection;
import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedAccount;
import org.ntlab.radishforandroidstudio.framework.network.CallBack;
 
 
public class LoginFragment extends Fragment {
    private LoginFragmentConnection connection;
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        // Inflate the layout for this fragment
        return inflater.inflate(R.layout.login_fragment, container, false);
 
    }
 
    @Override
    public void onStart() {
 
                transaction.commit();
//                 **********************************************************************/
 
//
//                if (userName.getText().toString().isEmpty()) {
//                    Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show();
//                } else if(passWord.getText().toString().isEmpty()){
//                    Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show();
//                } else {
//
//                    connection = new LoginFragmentConnection();
//                    connection.setCallBack(new CallBack() {
//                        @Override
//                        public void onResponse(String response) {
//                            //通信した時の処理を書くのだよ
//                            URIAddressedEntity lac = JSON.decode(response, URIAddressedEntity.class);
//                            System.out.println("///////////////////////////////////////////////");
//                            System.out.println(response);
//
//                            if(response.contains("\"login\":true,")){
//                                Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show();
//                                FragmentManager manager = getFragmentManager();
//                                FragmentTransaction transaction = manager.beginTransaction();
//                                transaction.replace(R.id.fragment_place, new InstancesFragment());
//                                transaction.commit();
//                            }else {
//                                Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show();
//                            }
//
//                        }
//                    });
//                    connection.addFormParam("userID", userName.getText().toString());
//                    connection.addFormParam("userPass", passWord.getText().toString());
//                    connection.doPut();
//                }
/*
                if (userName.getText().toString().isEmpty()) {
                    Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show();
                    return;
                } else if(passWord.getText().toString().isEmpty()){
                    Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show();
                    return;
                }
 
                connection = new LoginFragmentConnection();
                connection.setCallBack(new CallBack() {
                    @Override
                    public void onResponse(String response) {
                        //通信した時の処理を書くのだよ
                        URIAddressedAccount lac = JSON.decode(response, new TypeReference<URIAddressedAccount>(){});
                        System.out.println("///////////////////////////////////////////////");
                        System.out.println(response);
 
                        if(response.contains("\"login\":true,")){
                            Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show();
                            FragmentManager manager = getFragmentManager();
                            FragmentTransaction transaction = manager.beginTransaction();
                            transaction.replace(R.id.fragment_place, new InstancesFragment());
                            transaction.commit();
                        }else {
                            Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show();
                        }
 
                    }
                });
                connection.addFormParam("userID", userName.getText().toString());
                connection.addFormParam("userPass", passWord.getText().toString());
                connection.doPut();
                */
 
            }
        });
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.Toast;
+import net.arnx.jsonic.JSON;
+import net.arnx.jsonic.TypeReference;
 import org.ntlab.radishforandroidstudio.R;
 import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection;
+import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedAccount;
+import org.ntlab.radishforandroidstudio.framework.network.CallBack;
 public class LoginFragment extends Fragment {
     private LoginFragmentConnection connection;
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.login_fragment, container, false);
     }
     @Override
     public void onStart() {
                 transaction.commit();
 //                 **********************************************************************/
+//
+//                if (userName.getText().toString().isEmpty()) {
+//                    Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show();
+//                } else if(passWord.getText().toString().isEmpty()){
+//                    Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show();
+//                } else {
+//
+//                    connection = new LoginFragmentConnection();
+//                    connection.setCallBack(new CallBack() {
+//                        @Override
+//                        public void onResponse(String response) {
+//                            //通信した時の処理を書くのだよ
+//                            URIAddressedEntity lac = JSON.decode(response, URIAddressedEntity.class);
+//                            System.out.println("///////////////////////////////////////////////");
+//                            System.out.println(response);
+//
+//                            if(response.contains("\"login\":true,")){
+//                                Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show();
+//                                FragmentManager manager = getFragmentManager();
+//                                FragmentTransaction transaction = manager.beginTransaction();
+//                                transaction.replace(R.id.fragment_place, new InstancesFragment());
+//                                transaction.commit();
+//                            }else {
+//                                Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show();
+//                            }
+//
+//                        }
+//                    });
+//                    connection.addFormParam("userID", userName.getText().toString());
+//                    connection.addFormParam("userPass", passWord.getText().toString());
+//                    connection.doPut();
+//                }
+/*
+                if (userName.getText().toString().isEmpty()) {
+                    Toast.makeText(getActivity(), "ユーザー名が未記入です", Toast.LENGTH_SHORT).show();
+                    return;
+                } else if(passWord.getText().toString().isEmpty()){
+                    Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                connection = new LoginFragmentConnection();
+                connection.setCallBack(new CallBack() {
+                    @Override
+                    public void onResponse(String response) {
+                        //通信した時の処理を書くのだよ
+                        URIAddressedAccount lac = JSON.decode(response, new TypeReference<URIAddressedAccount>(){});
+                        System.out.println("///////////////////////////////////////////////");
+                        System.out.println(response);
+                        if(response.contains("\"login\":true,")){
+                            Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show();
+                            FragmentManager manager = getFragmentManager();
+                            FragmentTransaction transaction = manager.beginTransaction();
+                            transaction.replace(R.id.fragment_place, new InstancesFragment());
+                            transaction.commit();
+                        }else {
+                            Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show();
+                        }
+                    }
+                });
+                connection.addFormParam("userID", userName.getText().toString());
+                connection.addFormParam("userPass", passWord.getText().toString());
+                connection.doPut();
+                */
             }
         });

                Ignore Space
               Show notes
              View
            
          
          44 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                             Bundle savedInstanceState) {
        // Inflate the layout for this fragment
        return inflater.inflate(R.layout.sign_up_fragment, container, false);
 
    }
 
    //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓
    @Override
 
 
                if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")){
                    Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show();
                    return;
                }else if (inputPassword.getText().toString().isEmpty()) {
                    Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show();
                    return;
                } else if (checkPassWord.getText().toString().isEmpty()) {
                    Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show();
                    return;
                } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) {
                    Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show();
                }else{
                    return;
                }
 
                    connection = new SignUpFragmentConnection();
                    connection.setCallBack(new CallBack() {
                        @Override
                        public void onResponse(String response) {
                            //通信した時の処理を書くのだよ
                            URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class);
                            URIAddressedAccount ac2 = JSON.decode(response, new TypeReference<URIAddressedAccount>(){});
                            System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri());
                            System.out.println("JSON.decode(response, new TypeReference<URIAddressedAccount>(){});\n"+ac2.getUri());
                            System.out.println(response);
                            Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show();
                        }
                    });
                connection = new SignUpFragmentConnection();
                connection.setCallBack(new CallBack() {
                    @Override
                    public void onResponse(String response) {
                        //通信した時の処理を書くのだよ
                        URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class);
                        URIAddressedAccount ac2 = JSON.decode(response, new TypeReference<URIAddressedAccount>(){});
                        System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri());
                        System.out.println("JSON.decode(response, new TypeReference<URIAddressedAccount>(){});\n"+ac2.getUri());
                        System.out.println(response);
                        Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show();
                    }
                });
 
                    connection.addFormParam("userID", inputUserID.getText().toString());
                    connection.addFormParam("userPass", inputPassword.getText().toString());
                    connection.addFormParam("userName", inputUserName.getText().toString());
                    connection.doPost();
                connection.addFormParam("userID", inputUserID.getText().toString());
                connection.addFormParam("userPass", inputPassword.getText().toString());
                connection.addFormParam("userName", inputUserName.getText().toString());
                connection.doPost();
 
                }
 
            }
        });
    }
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         return inflater.inflate(R.layout.sign_up_fragment, container, false);
     }
     //↓↓↓↓↓↓↓↓画面遷移↓↓↓↓↓↓↓↓
     @Override
                 if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")){
                     Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show();
+                    return;
                 }else if (inputPassword.getText().toString().isEmpty()) {
                     Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show();
+                    return;
                 } else if (checkPassWord.getText().toString().isEmpty()) {
                     Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show();
+                    return;
                 } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) {
                     Toast.makeText(getActivity(), "パスワードが一致しません", Toast.LENGTH_SHORT).show();
+                }else{
+                    return;
+                }
+                    connection = new SignUpFragmentConnection();
+                    connection.setCallBack(new CallBack() {
+                        @Override
+                        public void onResponse(String response) {
+                            //通信した時の処理を書くのだよ
+                            URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class);
+                            URIAddressedAccount ac2 = JSON.decode(response, new TypeReference<URIAddressedAccount>(){});
+                            System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri());
+                            System.out.println("JSON.decode(response, new TypeReference<URIAddressedAccount>(){});\n"+ac2.getUri());
+                            System.out.println(response);
+                            Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show();
+                        }
+                    });
+                connection = new SignUpFragmentConnection();
+                connection.setCallBack(new CallBack() {
+                    @Override
+                    public void onResponse(String response) {
+                        //通信した時の処理を書くのだよ
+                        URIAddressedAccount ac = JSON.decode(response, URIAddressedAccount.class);
+                        URIAddressedAccount ac2 = JSON.decode(response, new TypeReference<URIAddressedAccount>(){});
+                        System.out.println("JSON.decode(response, URIAddressedAccount.class);\n"+ac.getUri());
+                        System.out.println("JSON.decode(response, new TypeReference<URIAddressedAccount>(){});\n"+ac2.getUri());
+                        System.out.println(response);
+                        Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show();
+                    }
+                });
+                    connection.addFormParam("userID", inputUserID.getText().toString());
+                    connection.addFormParam("userPass", inputPassword.getText().toString());
+                    connection.addFormParam("userName", inputUserName.getText().toString());
+                    connection.doPost();
+                connection.addFormParam("userID", inputUserID.getText().toString());
+                connection.addFormParam("userPass", inputPassword.getText().toString());
+                connection.addFormParam("userName", inputUserName.getText().toString());
+                connection.doPost();
+                }
             }
         });
     }