diff --git a/app/src/main/java/com/example/nemophila/FriendActivity.java b/app/src/main/java/com/example/nemophila/FriendActivity.java index 5852875..5850825 100644 --- a/app/src/main/java/com/example/nemophila/FriendActivity.java +++ b/app/src/main/java/com/example/nemophila/FriendActivity.java @@ -131,10 +131,11 @@ data.setId(friend.getUid()); //url作る - friendIconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg"; + friendIconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon" + friend.getUid() + ".jpg"; + data.setUrl(friendIconUrlString); executor.execute(() -> { try{ - URL url = new URL(friendIconUrlString); + URL url = new URL(data.getUrl()); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.connect(); @@ -257,10 +258,11 @@ data.setId(user.getUid()); //url作る - requestingIconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg"; + requestingIconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon" + user.getUid() + ".jpg"; + data.setUrl(requestingIconUrlString); executor.execute(() -> { try{ - URL url = new URL(requestingIconUrlString); + URL url = new URL(data.getUrl()); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.connect(); @@ -393,6 +395,7 @@ private String name; private String id; private Bitmap icon; + private String url; public String getName() { return name; @@ -401,12 +404,14 @@ return id; } public Bitmap getIcon() { return icon; } + public String getUrl() { return url; } public void setName(String name) { this.name = name; } public void setId(String id) { this.id = id;} public void setIcon(Bitmap icon){ this.icon = icon; } + public void setUrl(String url) { this.url = url; } } // ----------- RequestingのRecyclerView用の内部クラス ------------// @@ -469,7 +474,7 @@ public RequestingViewHolder(@NonNull View itemView) { super(itemView); - nameView = (TextView) itemView.findViewById(R.id.requestingName); + nameView = itemView.findViewById(R.id.requestingName); iconView = itemView.findViewById(R.id.requestingIcon); deleteButton = itemView.findViewById(R.id.requestingDeleteButton); } @@ -480,6 +485,7 @@ private String name; private String id; private Bitmap icon; + private String url; public String getName() { return name; @@ -488,6 +494,7 @@ return id; } public Bitmap getIcon() { return icon; } + public String getUrl() { return url; } public void setName(String name) { this.name = name; @@ -496,6 +503,7 @@ this.id = id; } public void setIcon(Bitmap icon) { this.icon = icon; } + public void setUrl(String url) { this.url = url; } } //ダイアログでOKを押した時に呼び出される　フレンド申請を送るメソッド diff --git a/app/src/main/java/com/example/nemophila/MapsActivity.java b/app/src/main/java/com/example/nemophila/MapsActivity.java index 658f065..56f2391 100644 --- a/app/src/main/java/com/example/nemophila/MapsActivity.java +++ b/app/src/main/java/com/example/nemophila/MapsActivity.java @@ -264,7 +264,7 @@ //自分のアイコンを取得 String uid = nemophila.getUid(); - iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon"+uid+".jpg";; + iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon"+uid+".jpg"; // 一度リストのデータを取り除いてから追加する listData.clear(); diff --git a/app/src/main/java/com/example/nemophila/MyPageActivity.java b/app/src/main/java/com/example/nemophila/MyPageActivity.java index 4f786e9..75a2f79 100644 --- a/app/src/main/java/com/example/nemophila/MyPageActivity.java +++ b/app/src/main/java/com/example/nemophila/MyPageActivity.java @@ -159,7 +159,7 @@ for (Post post: Posts){ MyPageActDataModel data = new MyPageActDataModel(); data.setDate(post.getDate()); - data.setName(post.getShopName()); + data.setShopName(post.getShopName()); data.setGenre(post.getGenre()); //rateはintで受け取った評価に対応した星の数のStringに変換してセット int intRate = post.getRate(); @@ -266,7 +266,7 @@ @Override public void onBindViewHolder(@NonNull MyPageActViewHolder holder, int position) { - holder.nameView.setText(list.get(position).getName()); + holder.shopNameView.setText(list.get(position).getShopName()); holder.dateView.setText(list.get(position).getDate()); holder.rateView.setText(list.get(position).getRate()); holder.genreView.setText(list.get(position).getGenre()); @@ -284,7 +284,7 @@ // ViewHolder public class MyPageActViewHolder extends RecyclerView.ViewHolder { - public TextView nameView; + public TextView shopNameView; public TextView dateView; public TextView rateView; public TextView genreView; @@ -296,7 +296,7 @@ public MyPageActViewHolder(@NonNull View view) { super(view); - nameView = (TextView) view.findViewById(R.id.nameOfShop); + shopNameView = (TextView) view.findViewById(R.id.nameOfShop); dateView = (TextView) view.findViewById(R.id.date); rateView = (TextView) view.findViewById(R.id.rate); genreView = (TextView) view.findViewById(R.id.genre); @@ -310,7 +310,7 @@ // DataModel public static class MyPageActDataModel { - private String name; + private String shopName; private String date; private String rate; private String genre; @@ -320,8 +320,8 @@ private Bitmap image2; private Bitmap image3; - public String getName() { return name; } - public void setName(String name) { this.name = name; } + public String getShopName() { return shopName; } + public void setShopName(String shopName) { this.shopName = shopName; } public String getDate() { return date; diff --git a/app/src/main/java/com/example/nemophila/RequestedActivity.java b/app/src/main/java/com/example/nemophila/RequestedActivity.java index 1ef29da..582da5b 100644 --- a/app/src/main/java/com/example/nemophila/RequestedActivity.java +++ b/app/src/main/java/com/example/nemophila/RequestedActivity.java @@ -23,7 +23,6 @@ import android.widget.TextView; import android.widget.Toast; -import com.example.nemophila.entities.Account; import com.example.nemophila.entities.AccountNameJson; import com.example.nemophila.viewmodels.FriendViewModel; @@ -40,7 +39,7 @@ private final ExecutorService executor = Executors.newSingleThreadExecutor(); private final Handler handler = new Handler(); - private String IconUrlString; + private String iconUrlString; @Override protected void onCreate(Bundle savedInstanceState) { @@ -120,10 +119,11 @@ data.setName(acj.getName()); requestedDataSet.add(data); - IconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg"; + iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon" + data.getId() + ".jpg"; + data.setUrl(iconUrlString); executor.execute(() -> { try { - URL url = new URL(IconUrlString); + URL url = new URL(data.getUrl()); HttpURLConnection con = (HttpURLConnection) url.openConnection(); con.connect(); @@ -221,6 +221,7 @@ private String name; private String id; private Bitmap icon; + private String url; public String getName() { return name; @@ -231,6 +232,9 @@ public Bitmap getIcon() { return icon; } + public String getUrl() { + return url; + } public void setName(String name) { this.name = name; @@ -239,5 +243,8 @@ public void setIcon(Bitmap icon) { this.icon = icon; } + public void setUrl(String url) { + this.url = url; + } } } \ No newline at end of file diff --git a/app/src/main/java/com/example/nemophila/entities/PostJson.java b/app/src/main/java/com/example/nemophila/entities/PostJson.java index 496ac50..19e34e6 100644 --- a/app/src/main/java/com/example/nemophila/entities/PostJson.java +++ b/app/src/main/java/com/example/nemophila/entities/PostJson.java @@ -1,8 +1,8 @@ package com.example.nemophila.entities; public class PostJson { + private String shop; private String id; - private String shopName; private String genre; private String date; private String image1; @@ -11,12 +11,16 @@ private int rate; private String comment; private AccountJson owner; + private String shopName; //Getter + + public String getShop() { + return shop; + } public String getId() { return id; } - public String getShopName() { return shopName; } public String getGenre() { return genre; } @@ -41,12 +45,16 @@ public AccountJson getOwner() { return owner; } + public String getShopName() { return shopName; } //Setter + + public void setShop(String shop) { + this.shop = shop; + } public void setId(String id) { this.id = id; } - public void setShopName(String shopName) { this.shopName = shopName; } public void setGenre(String genre) { this.genre = genre; } @@ -71,4 +79,5 @@ public void setOwner(AccountJson owner) { this.owner = owner; } + public void setShopName(String shopName) { this.shopName = shopName; } }