diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java index 6aa69fa..53c5ff9 100644 --- a/app/src/main/java/com/example/nemophila/ShopActivity.java +++ b/app/src/main/java/com/example/nemophila/ShopActivity.java @@ -79,7 +79,7 @@ //PostViewModelを宣言し、LiveDataへの購読 PostsViewModel postsViewModel = new ViewModelProvider(this).get(PostsViewModel.class); //通信テスト用データ(本来currentShopのsidをPostJsonに送る) - postsViewModel.getShopPostJson("151347fa-2c90-44d7-ba48-f23f475b910d"); + postsViewModel.loadShopPost("151347fa-2c90-44d7-ba48-f23f475b910d"); //LiveDataへの購読 postsViewModel.getShopPostLiveData().observe(this, new Observer>() { @@ -91,6 +91,7 @@ PostDataModel data = new PostDataModel(); data.setName(post.getName()); data.setDate(post.getDate()); + //intで受け取った評価を対応した星の数のStringに変換 int intRate = post.getRate(); String strRate = ""; @@ -108,12 +109,9 @@ postsDataset.add(data); } //RecyclerViewをonChangedが呼ばれるたび表示 -// ShopActivityAdapter adapter = new ShopActivityAdapter(postsDataset); adapter.setList(postsDataset); rv.setAdapter(adapter); } }); - } - } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/TestActivity.java b/app/src/main/java/com/example/nemophila/TestActivity.java index c38422c..f299ae1 100644 --- a/app/src/main/java/com/example/nemophila/TestActivity.java +++ b/app/src/main/java/com/example/nemophila/TestActivity.java @@ -1,7 +1,6 @@ package com.example.nemophila; import androidx.appcompat.app.AppCompatActivity; -import androidx.lifecycle.MutableLiveData; import androidx.lifecycle.ViewModelProvider; import android.os.Bundle; @@ -64,7 +63,7 @@ //accountViewModel.getAccount("1111"); break; case 2: - postsViewModel.getShopPostJson("151347fa-2c90-44d7-ba48-f23f475b910d"); + postsViewModel.loadShopPost("151347fa-2c90-44d7-ba48-f23f475b910d"); break; } } diff --git a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java index dd8e411..51bd9d6 100644 --- a/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java +++ b/app/src/main/java/com/example/nemophila/viewmodels/PostsViewModel.java @@ -48,7 +48,7 @@ //AccountのpostJsonを取得 - public void getAccountPosts(String uid) { + public void loadAccountPosts(String uid) { Call> call = postsRest.getAccountPosts(uid); call.enqueue(new Callback>() { @Override @@ -78,7 +78,7 @@ } //ShopのPostJsonを取得 - public void getShopPostJson(String sid) { + public void loadShopPost(String sid) { Call> call = postsRest.getShopPosts(sid); call.enqueue(new Callback>() { @Override @@ -94,8 +94,6 @@ @Override public void onFailure(Call> call, Throwable t) { System.out.println("ShopPosts NetWorkError: " + t); - System.out.println(t); - //通信エラー } }); }