diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java index a3832fb..521075b 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/InvitedConnectionModel.java @@ -1,5 +1,9 @@ package org.ntlab.acanthus_client.views.main_menu_ui.mypage; +import android.util.Log; + +import androidx.lifecycle.MutableLiveData; + import org.ntlab.acanthus_client.Acanthus; import org.ntlab.acanthus_client.R; import org.ntlab.acanthus_client.resources.accounts.InvitedRest; @@ -15,8 +19,7 @@ // public class InvitedConnectionModel { - private String successMessage; - + private final String TAG = "InvitedConnectionModel"; private Retrofit retrofit; private Acanthus acanthus; @@ -28,37 +31,18 @@ } //----------------------------------------------------------------- - // getter - public String getSuccessMessage() { - return successMessage; - } - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - // - public void init(Acanthus acanthus) { - this.acanthus = acanthus; - this.retrofit = new Retrofit.Builder() - .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") - .addConverterFactory(ScalarsConverterFactory.create()) - .addConverterFactory(JacksonConverterFactory.create()) - .build(); - } - - //----------------------------------------------------------------- // 招待確認 - public void checkInvited() { + public void checkInvited(MutableLiveData mText) { final InvitedRest invitedRest = retrofit.create(InvitedRest.class); - Integer uid = acanthus.getPreferenceUid(); - Integer aid = acanthus.getAid(); - - Call call = invitedRest.checkAccountInvited(uid, aid); - + Call call = invitedRest.checkAccountInvited(acanthus.getPreferenceUid(), acanthus.getAid()); call.enqueue(new Callback() { @Override public void onResponse(Call call, Response response) { - if (response.isSuccessful()) successMessage = "招待されています"; + if (response.isSuccessful()){ + Log.d(TAG, response.body().toString()); + mText.setValue(response.body().toString()); + } } @Override @@ -68,6 +52,18 @@ }); } + + //----------------------------------------------------------------- + //----------------------------------------------------------------- + // init + private void init(Acanthus acanthus) { + this.acanthus = acanthus; + this.retrofit = new Retrofit.Builder() + .baseUrl("http://nitta-lab-www.is.konan-u.ac.jp/acanthus/") + .addConverterFactory(ScalarsConverterFactory.create()) + .addConverterFactory(JacksonConverterFactory.create()) + .build(); + } //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java index 2adff03..c43fb32 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageFragment.java @@ -52,15 +52,16 @@ Acanthus acanthus = (Acanthus) getActivity().getApplication(); mypageViewModel = new ViewModelProvider(this).get(MyPageViewModel.class); mypageViewModel.init(acanthus); - startObserve(); + + mypageViewModel.checkInvitedRequest(); } //----------------------------------------------------------------- // private void startObserve() { final TextView textView = binding.textMypage; - mypageViewModel.getText().observe(getViewLifecycleOwner(), new Observer() { + mypageViewModel.getImmutableText().observe(getViewLifecycleOwner(), new Observer() { @Override public void onChanged(@Nullable String s) { textView.setText(s); diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java index b298612..4265072 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageModelContainer.java @@ -2,20 +2,27 @@ import org.ntlab.acanthus_client.Acanthus; +//----------------------------------------------------------------- +// public class MyPageModelContainer { private InvitedConnectionModel invitedConnectionModel; //----------------------------------------------------------------- - // - public void init(Acanthus acanthus) { - invitedConnectionModel = new InvitedConnectionModel(acanthus); + //----------------------------------------------------------------- + public MyPageModelContainer(Acanthus acanthus){ + init(acanthus); } - //----------------------------------------------------------------- // getter public InvitedConnectionModel getInvitedConnectionModel() { return invitedConnectionModel; } //----------------------------------------------------------------- + //----------------------------------------------------------------- + // init + private void init(Acanthus acanthus) { + invitedConnectionModel = new InvitedConnectionModel(acanthus); + } + //----------------------------------------------------------------- } diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java index d6c387f..dad604a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/main_menu_ui/mypage/MyPageViewModel.java @@ -1,5 +1,7 @@ package org.ntlab.acanthus_client.views.main_menu_ui.mypage; +import android.telephony.mbms.MbmsErrors; + import androidx.lifecycle.LiveData; import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModel; @@ -16,20 +18,12 @@ //----------------------------------------------------------------- // public class MyPageViewModel extends ViewModel { - private MyPageModelContainer myPageModelContainer; - private MutableLiveData mText; - - //----------------------------------------------------------------- - //----------------------------------------------------------------- - public MyPageViewModel() { - myPageModelContainer = new MyPageModelContainer(); - mText = new MutableLiveData<>(); - } + private MutableLiveData mText = new MutableLiveData<>(); //----------------------------------------------------------------- // getter - public LiveData getText() { + public LiveData getImmutableText() { return mText; } @@ -37,11 +31,15 @@ //----------------------------------------------------------------- // init public void init(Acanthus acanthus) { - myPageModelContainer.init(acanthus); - myPageModelContainer.getInvitedConnectionModel().checkInvited(); - mText.setValue(myPageModelContainer.getInvitedConnectionModel().getSuccessMessage()); + myPageModelContainer = new MyPageModelContainer(acanthus); + myPageModelContainer.getInvitedConnectionModel().checkInvited(mText); } + //----------------------------------------------------------------- + // + public void checkInvitedRequest() { + myPageModelContainer.getInvitedConnectionModel().checkInvited(mText); + } //----------------------------------------------------------------- } \ No newline at end of file diff --git a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java index d173367..b54769a 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java +++ b/app/src/main/java/org/ntlab/acanthus_client/views/paint/PaintActivity.java @@ -36,7 +36,7 @@ //----------------------------------------------------------------- // public void onClickInvite(View view) { - Integer dummy1Id = 2; + Integer dummy1Id = 1; paintViewModel.inviteNewUserRequest(dummy1Id); } diff --git a/app/src/main/res/layout/fragment_mypage.xml b/app/src/main/res/layout/fragment_mypage.xml index 252535f..a0d44e7 100644 --- a/app/src/main/res/layout/fragment_mypage.xml +++ b/app/src/main/res/layout/fragment_mypage.xml @@ -9,14 +9,16 @@ \ No newline at end of file