アカウント情報をCuctusクラスに保存するためのブランチ #9

Merged h-matsumoto merged 3 commits into nitta-lab-2018:master from nitta-lab-2018:アカウント情報をCuctusクラスに保存するためのブランチ on 14 Jun 2018

Patch

Unified Split

Showing 3 changed files

                Ignore Space
               Show notes
              View
            
          
          5 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java
                     Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show();
                } else {
 
                    connection = new LoginFragmentConnection();
 
                    connection.setCallBack(new CallBack() {
                        @Override
                        public void onResponse(String response) {
                            //通信した時の処理を書くのだよ
                            System.out.println(ac.getUri());
                            System.out.println(response);
                        }
                    });
                    connection.addFormParam("user_id", userName.getText().toString());
                    connection.addFormParam("password", passWord.getText().toString());
                    connection.addFormParam("userID", userName.getText().toString());
                    connection.addFormParam("userPass", passWord.getText().toString());
                    connection.doPut();
                }
            }
        });
                     Toast.makeText(getActivity(), "パスワードが未記入です", Toast.LENGTH_SHORT).show();
                 } else {
                     connection = new LoginFragmentConnection();
                     connection.setCallBack(new CallBack() {
                         @Override
                         public void onResponse(String response) {
                             //通信した時の処理を書くのだよ
                             System.out.println(ac.getUri());
                             System.out.println(response);
                         }
                     });
+                    connection.addFormParam("user_id", userName.getText().toString());
+                    connection.addFormParam("password", passWord.getText().toString());
+                    connection.addFormParam("userID", userName.getText().toString());
+                    connection.addFormParam("userPass", passWord.getText().toString());
                     connection.doPut();
                 }
             }
         });

                Ignore Space
               Show notes
              View
            
          
          19 ■■■■■
          app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java
 import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Toast;
 
import net.arnx.jsonic.JSON;
 
import org.ntlab.radishforandroidstudio.R;
import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection;
import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedEntity;
import org.ntlab.radishforandroidstudio.framework.network.CallBack;
                EditText checkPassWord = (EditText)getActivity().findViewById(R.id.checkPassword);
                EditText inputUserName = (EditText)getActivity().findViewById(R.id.inputUserName);
                EditText inputUserID = (EditText)getActivity().findViewById(R.id.inputUserID);
 
                if (inputPassword.getText().toString().isEmpty()) {
 
                if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")){
                    Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show();
                }else if (inputPassword.getText().toString().isEmpty()) {
                    Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show();
                } else if (checkPassWord.getText().toString().isEmpty()) {
                    Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show();
                } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) {
                        @Override
                        public void onResponse(String response) {
                            //通信した時の処理を書くのだよ
                            URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class);
 
                            System.out.println(ac.getUri());
                            System.out.println(response);
 
                            //Cactus setMyAccount(ac.getBody());
 
                        }
                    });
 
                    connection.addFormParam("user_id", inputUserID.getText().toString());
                    connection.addFormParam("user_name", inputUserName.getText().toString());
                    connection.addFormParam("password", inputPassword.getText().toString());
                    connection.addFormParam("userID", inputUserID.getText().toString());
                    connection.addFormParam("userPass", inputPassword.getText().toString());
                    connection.addFormParam("userName", inputUserName.getText().toString());
                    connection.doPost();
                    Toast.makeText(getActivity(),inputUserID.getText().toString(), Toast.LENGTH_SHORT).show();
                }
            }
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 import net.arnx.jsonic.JSON;
 import org.ntlab.radishforandroidstudio.R;
 import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection;
 import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedEntity;
 import org.ntlab.radishforandroidstudio.framework.network.CallBack;
                 EditText checkPassWord = (EditText)getActivity().findViewById(R.id.checkPassword);
                 EditText inputUserName = (EditText)getActivity().findViewById(R.id.inputUserName);
                 EditText inputUserID = (EditText)getActivity().findViewById(R.id.inputUserID);
+                if (inputPassword.getText().toString().isEmpty()) {
+                if(inputUserID.getText().toString().contains(" ") || inputUserID.getText().toString().contains("　")){
+                    Toast.makeText(getActivity(), "空白の含むIDは登録できません", Toast.LENGTH_SHORT).show();
+                }else if (inputPassword.getText().toString().isEmpty()) {
                     Toast.makeText(getActivity(), "パスワードを入力してください", Toast.LENGTH_SHORT).show();
                 } else if (checkPassWord.getText().toString().isEmpty()) {
                     Toast.makeText(getActivity(), "確認用パスワードを入力してください", Toast.LENGTH_SHORT).show();
                 } else if (!inputPassword.getText().toString().equals(checkPassWord.getText().toString() )) {
                         @Override
                         public void onResponse(String response) {
                             //通信した時の処理を書くのだよ
                             URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class);
                             System.out.println(ac.getUri());
                             System.out.println(response);
+                            //Cactus setMyAccount(ac.getBody());
                         }
                     });
+                    connection.addFormParam("user_id", inputUserID.getText().toString());
+                    connection.addFormParam("user_name", inputUserName.getText().toString());
+                    connection.addFormParam("password", inputPassword.getText().toString());
+                    connection.addFormParam("userID", inputUserID.getText().toString());
+                    connection.addFormParam("userPass", inputPassword.getText().toString());
+                    connection.addFormParam("userName", inputUserName.getText().toString());
                     connection.doPost();
                     Toast.makeText(getActivity(),inputUserID.getText().toString(), Toast.LENGTH_SHORT).show();
                 }
             }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          app/src/main/res/layout/login_fragment.xml
         android:layout_below="@+id/EmailAddress"
        android:layout_centerHorizontal="true"
        android:ems="10"
        android:inputType="text"
        android:text="Please enter UserID" />
        android:hint="Please enter UserID" />
 
    <EditText
        android:id="@+id/checkPassword"
        android:layout_width="300dp"
         android:layout_below="@+id/EmailAddress"
         android:layout_centerHorizontal="true"
         android:ems="10"
         android:inputType="text"
+        android:text="Please enter UserID" />
+        android:hint="Please enter UserID" />
     <EditText
         android:id="@+id/checkPassword"
         android:layout_width="300dp"