diff --git a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt index aaa89bc..f6cfb38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt +++ b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt @@ -49,7 +49,7 @@ } Glide.with(context) .load(images[position]) - .apply(RequestOptions().error(R.drawable.ic_load_error)) + .apply(RequestOptions().error(R.drawable.ic_load_imag_error)) .into(holder.imageView) if (isVisible) { holder.deleteView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt index aaa89bc..f6cfb38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt +++ b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt @@ -49,7 +49,7 @@ } Glide.with(context) .load(images[position]) - .apply(RequestOptions().error(R.drawable.ic_load_error)) + .apply(RequestOptions().error(R.drawable.ic_load_imag_error)) .into(holder.imageView) if (isVisible) { holder.deleteView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index fe37dc3..0579c02 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -32,26 +32,33 @@ descriptionView.text = intent.getStringExtra("description") val data = intent.getIntExtra("data", -1) if (data == -1) { - noImageLayout.visibility = View.GONE - val images = intent.getStringExtra("images") - /** - * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg - * images: - * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg - * */ - val urls: ArrayList = ArrayList() - if (images == null) { + dataView.text = "0.0" + } else { + dataView.text = "$data.0" + } + val images = intent.getStringExtra("images") + /** + * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg + * images: + * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg + * */ + val urls: ArrayList = ArrayList() + if (images == null) { + urls.add("") + } else { + if (images.isEmpty()) { urls.add("") } else { - if (images.isEmpty()) { - urls.add("") - } else { - val imageArray = images.split(",") - imageArray.forEach { - urls.add(it.combineImagePath()) - } + val imageArray = images.split(",") + imageArray.forEach { + urls.add(it.combineImagePath()) } } + } + if (urls.size == 0) { + imageLayout.visibility = View.GONE + } else { + imageLayout.visibility = View.VISIBLE //绑定图片 val imageAdapter = ImageGridViewAdapter(this) imageAdapter.setImageList(imageUrls = urls) @@ -64,9 +71,6 @@ OtherUtils.showBigImage(this@EventDetailActivity, position, urls) } } - } else { - hasImageLayout.visibility = View.GONE - dataView.text = "$data.0" } } diff --git a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt index aaa89bc..f6cfb38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt +++ b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt @@ -49,7 +49,7 @@ } Glide.with(context) .load(images[position]) - .apply(RequestOptions().error(R.drawable.ic_load_error)) + .apply(RequestOptions().error(R.drawable.ic_load_imag_error)) .into(holder.imageView) if (isVisible) { holder.deleteView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index fe37dc3..0579c02 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -32,26 +32,33 @@ descriptionView.text = intent.getStringExtra("description") val data = intent.getIntExtra("data", -1) if (data == -1) { - noImageLayout.visibility = View.GONE - val images = intent.getStringExtra("images") - /** - * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg - * images: - * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg - * */ - val urls: ArrayList = ArrayList() - if (images == null) { + dataView.text = "0.0" + } else { + dataView.text = "$data.0" + } + val images = intent.getStringExtra("images") + /** + * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg + * images: + * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg + * */ + val urls: ArrayList = ArrayList() + if (images == null) { + urls.add("") + } else { + if (images.isEmpty()) { urls.add("") } else { - if (images.isEmpty()) { - urls.add("") - } else { - val imageArray = images.split(",") - imageArray.forEach { - urls.add(it.combineImagePath()) - } + val imageArray = images.split(",") + imageArray.forEach { + urls.add(it.combineImagePath()) } } + } + if (urls.size == 0) { + imageLayout.visibility = View.GONE + } else { + imageLayout.visibility = View.VISIBLE //绑定图片 val imageAdapter = ImageGridViewAdapter(this) imageAdapter.setImageList(imageUrls = urls) @@ -64,9 +71,6 @@ OtherUtils.showBigImage(this@EventDetailActivity, position, urls) } } - } else { - hasImageLayout.visibility = View.GONE - dataView.text = "$data.0" } } diff --git a/app/src/main/res/drawable/ic_load_imag_error.xml b/app/src/main/res/drawable/ic_load_imag_error.xml new file mode 100644 index 0000000..7cca49b --- /dev/null +++ b/app/src/main/res/drawable/ic_load_imag_error.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt index aaa89bc..f6cfb38 100644 --- a/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt +++ b/app/src/main/java/com/casic/birmm/inspect/adapter/ImageGridViewAdapter.kt @@ -49,7 +49,7 @@ } Glide.with(context) .load(images[position]) - .apply(RequestOptions().error(R.drawable.ic_load_error)) + .apply(RequestOptions().error(R.drawable.ic_load_imag_error)) .into(holder.imageView) if (isVisible) { holder.deleteView.visibility = View.VISIBLE diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt index fe37dc3..0579c02 100644 --- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt +++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt @@ -32,26 +32,33 @@ descriptionView.text = intent.getStringExtra("description") val data = intent.getIntExtra("data", -1) if (data == -1) { - noImageLayout.visibility = View.GONE - val images = intent.getStringExtra("images") - /** - * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg - * images: - * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg - * */ - val urls: ArrayList = ArrayList() - if (images == null) { + dataView.text = "0.0" + } else { + dataView.text = "$data.0" + } + val images = intent.getStringExtra("images") + /** + * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg + * images: + * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg + * */ + val urls: ArrayList = ArrayList() + if (images == null) { + urls.add("") + } else { + if (images.isEmpty()) { urls.add("") } else { - if (images.isEmpty()) { - urls.add("") - } else { - val imageArray = images.split(",") - imageArray.forEach { - urls.add(it.combineImagePath()) - } + val imageArray = images.split(",") + imageArray.forEach { + urls.add(it.combineImagePath()) } } + } + if (urls.size == 0) { + imageLayout.visibility = View.GONE + } else { + imageLayout.visibility = View.VISIBLE //绑定图片 val imageAdapter = ImageGridViewAdapter(this) imageAdapter.setImageList(imageUrls = urls) @@ -64,9 +71,6 @@ OtherUtils.showBigImage(this@EventDetailActivity, position, urls) } } - } else { - hasImageLayout.visibility = View.GONE - dataView.text = "$data.0" } } diff --git a/app/src/main/res/drawable/ic_load_imag_error.xml b/app/src/main/res/drawable/ic_load_imag_error.xml new file mode 100644 index 0000000..7cca49b --- /dev/null +++ b/app/src/main/res/drawable/ic_load_imag_error.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_event_detail.xml b/app/src/main/res/layout/activity_event_detail.xml index 1eefc6e..618e332 100644 --- a/app/src/main/res/layout/activity_event_detail.xml +++ b/app/src/main/res/layout/activity_event_detail.xml @@ -79,56 +79,57 @@ android:layout_marginTop="@dimen/margin_10dp" app:cardCornerRadius="5dp"> + + + + + + + + + + - + android:text="图片:" + android:textColor="@color/black" + android:textSize="@dimen/textFontSize" /> - - - - - - - - - - - + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/margin_10dp" + android:horizontalSpacing="@dimen/margin_10dp" + android:numColumns="3" + android:scrollbars="none" + android:verticalSpacing="@dimen/margin_10dp" />