diff --git a/.idea/misc.xml b/.idea/misc.xml index d5d35ec..860da66 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/app/build.gradle b/app/build.gradle index cd305c3..85f58fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,4 +47,5 @@ androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0' implementation "com.squareup.retrofit2:retrofit:2.5.0" implementation 'com.squareup.retrofit2:converter-jackson:2.5.0' + implementation 'com.squareup.retrofit2:converter-scalars:2.1.0' } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java index 5db414a..b353219 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java +++ b/app/src/main/java/org/ntlab/acanthus_client/resources/accounts/HelloWorldRest.java @@ -1,5 +1,6 @@ package org.ntlab.acanthus_client.resources.accounts; +import okhttp3.ResponseBody; import retrofit2.Call; import retrofit2.http.GET; diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java index 537c0bf..2fe991c 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/Main_menu_ui/home/HomeViewModel.java @@ -1,16 +1,56 @@ package org.ntlab.acanthus_client.views.Main_menu_ui.home; +import android.os.Bundle; +import android.widget.EditText; + +import org.ntlab.acanthus_client.R; +import org.ntlab.acanthus_client.entities.AccountTokenJson; +import org.ntlab.acanthus_client.resources.accounts.HelloWorldRest; +import org.ntlab.acanthus_client.resources.accounts.LoginRest; + import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; +import okhttp3.ResponseBody; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; public class HomeViewModel extends ViewModel { - + private EditText editEmailTextView; private MutableLiveData mText; + public HomeViewModel() { mText = new MutableLiveData<>(); - mText.setValue("This is home fragment"); + Retrofit retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(ScalarsConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + final HelloWorldRest helloworld = retrofit.create(HelloWorldRest.class); + Call call = helloworld.getHelloWorld(); + call.enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + if(response.isSuccessful()) { + String res = response.body(); + mText.setValue(res.toString()); + }else{ + mText.setValue("False helloworld"); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + mText.setValue("みす helloworld"); + } + }); + + } public LiveData getText() {