diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 91e56cf..bb30aee 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -1,17 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/nemophila/ShopActivity.java b/app/src/main/java/com/example/nemophila/ShopActivity.java
index b0a0650..9e27397 100644
--- a/app/src/main/java/com/example/nemophila/ShopActivity.java
+++ b/app/src/main/java/com/example/nemophila/ShopActivity.java
@@ -20,6 +20,7 @@
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
+import android.widget.LinearLayout;
import android.widget.TextView;
import com.example.nemophila.entities.Account;
@@ -168,12 +169,12 @@
data.setComment(post.getComment());
//アイコン仮セット
- String iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg";
+// String iconUrlStr = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test01.jpg";
//本来はuidからurl作る
-// String iconUrlString = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon" + myUid + ".jpg";
+ String iconUrlStr = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/icon" + uid + ".jpg";
executor.execute(() -> {
try{
- URL iconUrl = new URL(iconUrlString);
+ URL iconUrl = new URL(iconUrlStr);
HttpURLConnection con = (HttpURLConnection) iconUrl.openConnection();
con.connect();
@@ -192,8 +193,44 @@
});
//画像がなければViewの表示をgoneに、あればvisibleにして画像をセット
-// if(post.get) {
-// }
+ executor.execute(() -> {
+// LinearLayout imageArea = findViewById(R.id.postImageArea);
+ String[] imageUrls = new String[3];
+ Bitmap[] bitmaps = new Bitmap[3];
+ for(int i=1; i<=3; i++) {
+ imageUrls[i-1] = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/post_image"+ uid +"-" + post.getPid() +"-" + i +".jpg";
+
+ //ダミーでまわしてみる
+// imageUrls[i-1] = "http://nitta-lab-www.is.konan-u.ac.jp/nemophila-data/test0" + i +".jpg";
+
+ try {
+ URL image1Url = new URL(imageUrls[i - 1]);
+ HttpURLConnection con = (HttpURLConnection) image1Url.openConnection();
+ con.connect();
+
+ InputStream is = con.getInputStream();
+ bitmaps[i - 1] = BitmapFactory.decodeStream(is);
+ is.close();
+ con.disconnect();
+ } catch (Exception e) {
+ e.printStackTrace();
+ bitmaps [i-1] = null;
+ }
+ }
+
+ handler.post(() -> {
+ for(int i=1; i<=3; i++) {
+ if (i == 1) {
+ data.setImage1(bitmaps[i - 1]);
+ } else if (i == 2) {
+ data.setImage2(bitmaps[i - 1]);
+ } else if (i == 3) {
+ data.setImage3(bitmaps[i - 1]);
+ }
+ }
+ adapter.notifyDataSetChanged();
+ });
+ }); //excutorおわり
//投稿一つの情報がdataに全部セットされたらDatasetに追加
postsDataset.add(0, data);
@@ -241,6 +278,25 @@
holder.genreView.setText(list.get(position).getGenre());
holder.commentView.setText(list.get(position).getComment());
holder.iconView.setImageBitmap(list.get(position).getIcon());
+ if(list.get(position).getImage1() == null) {
+ holder.imageArea.setVisibility(View.GONE);
+ }else{
+ holder.imageArea.setVisibility(View.VISIBLE);
+ holder.image1View.setImageBitmap(list.get(position).getImage1());
+ holder.image1View.setVisibility(View.VISIBLE);
+ }
+ if(list.get(position).getImage2() == null) {
+ holder.image2View.setVisibility(View.INVISIBLE);
+ }else{
+ holder.image2View.setImageBitmap(list.get(position).getImage2());
+ holder.image2View.setVisibility(View.VISIBLE);
+ }
+ if(list.get(position).getImage3() == null) {
+ holder.image3View.setVisibility(View.INVISIBLE);
+ }else{
+ holder.image3View.setImageBitmap(list.get(position).getImage3());
+ holder.image3View.setVisibility(View.VISIBLE);
+ }
}
@Override
@@ -260,6 +316,7 @@
public ImageView image1View;
public ImageView image2View;
public ImageView image3View;
+ public LinearLayout imageArea;
public ShopAcViewHolder(@NonNull View itemView) {
super(itemView);
@@ -272,6 +329,8 @@
image1View = (ImageView) itemView.findViewById(R.id.shopAcImage1);
image2View = (ImageView) itemView.findViewById(R.id.shopAcImage2);
image3View = (ImageView) itemView.findViewById(R.id.shopAcImage3);
+ imageArea = (LinearLayout) itemView.findViewById(R.id.postImageArea);
+
}
}
diff --git a/app/src/main/res/layout/layout_shop_activity_posts.xml b/app/src/main/res/layout/layout_shop_activity_posts.xml
index 5e4d9f1..44c790b 100644
--- a/app/src/main/res/layout/layout_shop_activity_posts.xml
+++ b/app/src/main/res/layout/layout_shop_activity_posts.xml
@@ -63,7 +63,7 @@
android:id="@+id/postImageArea"
android:layout_width="match_parent"
android:layout_height="100dp"
- android:visibility="gone"
+ android:visibility="visible"
android:orientation="horizontal">