diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f0899d7..01f2f44 100644 --- a/.idea/caches/build_file_checksums.ser +++ b/.idea/caches/build_file_checksums.ser Binary files differ diff --git a/app/build.gradle b/app/build.gradle index f05a173..8404121 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,4 +31,6 @@ androidTestImplementation 'com.android.support.test:runner:1.0.2' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' implementation group: 'net.arnx', name: 'jsonic', version: '1.3.10' + implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'com.google.android.gms:play-services-maps:15.0.1' } diff --git a/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java new file mode 100644 index 0000000..2190535 --- /dev/null +++ b/app/src/main/java/org/ntlab/radishforandroidstudio/cactusClient/views/InstancesFragment.java @@ -0,0 +1,21 @@ +package org.ntlab.radishforandroidstudio.cactusClient.views; + +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.support.v4.app.Fragment; + + +import org.ntlab.radishforandroidstudio.R; + +public class InstancesFragment extends Fragment { + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.instances_fragment, container, false); + + } +} 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 aa60837..ecd5c80 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 @@ -16,6 +16,7 @@ import org.ntlab.radishforandroidstudio.R; import org.ntlab.radishforandroidstudio.cactusClient.connections.LoginFragmentConnection; +import org.ntlab.radishforandroidstudio.cactusClient.views.InstancesFragment; import org.ntlab.radishforandroidstudio.cactusClient.models.URIAddressedEntity; import org.ntlab.radishforandroidstudio.framework.network.CallBack; @@ -72,10 +73,26 @@ @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.contains("\"login\":true,")){ + Toast.makeText(getActivity(),"ログインに成功しました。", Toast.LENGTH_SHORT).show(); + + + }else { + Toast.makeText(getActivity(),"ログインに失敗しました。", Toast.LENGTH_SHORT).show(); + } + + FragmentManager manager = getFragmentManager(); + FragmentTransaction transaction = manager.beginTransaction(); + + transaction.replace(R.id.fragment_place, new InstancesFragment()); + + transaction.commit(); } }); connection.addFormParam("userID", userName.getText().toString()); @@ -84,6 +101,5 @@ } } }); - } } 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 aa94b2c..d02712d 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,9 +10,7 @@ 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; @@ -82,9 +80,7 @@ URIAddressedEntity ac = JSON.decode(response, URIAddressedEntity.class); System.out.println(ac.getUri()); System.out.println(response); - - //Cactus setMyAccount(ac.getBody()); - + Toast.makeText(getActivity(),response, Toast.LENGTH_SHORT).show(); } }); @@ -92,7 +88,7 @@ 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/instances_fragment.xml b/app/src/main/res/layout/instances_fragment.xml new file mode 100644 index 0000000..2cb5429 --- /dev/null +++ b/app/src/main/res/layout/instances_fragment.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/login_fragment.xml b/app/src/main/res/layout/login_fragment.xml index cc1fe42..b1a3de6 100644 --- a/app/src/main/res/layout/login_fragment.xml +++ b/app/src/main/res/layout/login_fragment.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@android:color/background_light" - tools:context=".cactusClient.LoginFragment"> + tools:context=".cactusClient.views.LoginFragment">