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/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeModel.java new file mode 100644 index 0000000..9bd140b --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/home/HomeModel.java @@ -0,0 +1,53 @@ +package org.ntlab.acanthus_client.views.main_menu_ui.home; + +import org.ntlab.acanthus_client.resources.HelloWorldRest; + +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; +import retrofit2.Retrofit; +import retrofit2.converter.jackson.JacksonConverterFactory; +import retrofit2.converter.scalars.ScalarsConverterFactory; + +public class HomeModel { + private MutableLiveData text; + + public void Gethelloworld(MutableLiveData mText){ + 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); + + }else{ + mText.setValue("False helloworld"); + } + } + + @Override + public void onFailure(Call call, Throwable t) { + mText.setValue("みす helloworld"); + } + }); + + } + +// public void setText(MutableLiveData mText){ +// this.text=mText; +// } +// +// public LiveData getText(){ +// return text; +// } + +} 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 b094d92..bdf1830 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 @@ -18,38 +18,13 @@ public class HomeViewModel extends ViewModel { private EditText editEmailTextView; private MutableLiveData mText; + private HomeModel homeModel; public HomeViewModel() { mText = new MutableLiveData<>(); - Gethelloworld(mText); - } - - public void Gethelloworld(MutableLiveData mText){ - 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); - }else{ - mText.setValue("False helloworld"); - } - } - - @Override - public void onFailure(Call call, Throwable t) { - mText.setValue("みす helloworld"); - } - }); - + homeModel= new HomeModel(); + homeModel.Gethelloworld(mText); } public LiveData getText() {