diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f0899d7..4b34f18 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java index 3a15b91..04a3513 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/LoginFragment.java @@ -73,10 +73,24 @@ @Override public void onResponse(String response) { //通信した時の処理を書くのだよ - URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class); - - System.out.println(ac.getUri()); + URIAddressedEntity lac = JSON.decode(response, URIAddressedEntity.class); + + System.out.println("////////////////////////////////////////////"); System.out.println(response); + +// if(response.toString().matches(".*\"login\":true,\".*")){ +// Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); +// }else { +// Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); +// } + + + + if(response.contains("\"login\":true,")){ + Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); + }else { + Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); + } } }); connection.addFormParam("user_id", userName.getText().toString()); diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java index 7b96e86..c5e90c9 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/SignUpFragment.java @@ -10,6 +10,7 @@ import android.widget.Button; import android.widget.EditText; import android.widget.Toast; +import android.widget.Toast; import net.arnx.jsonic.JSON; import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.SignUpFragmentConnection; @@ -61,7 +62,10 @@ 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(); @@ -75,16 +79,18 @@ public void onResponse(String response) { //通信した時の処理を書くのだよ URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class); - System.out.println(ac.getUri()); System.out.println(response); + Toast.makeText(getActivity(),ac.getUri().toString(), Toast.LENGTH_SHORT).show(); + //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(); } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java b/app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java index a8c5953..76f1430 100644 --- a/app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/sample/SampleActivity.java @@ -50,6 +50,7 @@ universe.placeLight(amblight); //平行光源 + DirectionalLight dirlight = new DirectionalLight( new Color3f(1.0f, 1.0f, 1.0f), //光の色 new Vector3f(0.0f, -1.0f, -0.5f) //光の方向ベクトル diff --git a/app/src/main/res/layout/sign_up_fragment.xml b/app/src/main/res/layout/sign_up_fragment.xml index 3a4d05b..b4e6114 100644 --- a/app/src/main/res/layout/sign_up_fragment.xml +++ b/app/src/main/res/layout/sign_up_fragment.xml @@ -67,7 +67,7 @@ android:layout_below="@+id/userName" android:ems="10" android:inputType="textPersonName" - android:text="Please enter UserID" /> + android:hint="Please enter UserID"/>