diff --git a/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt new file mode 100644 index 0000000..10f8378 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.br.app.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.BaseAdapter +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.core.view.marginEnd +import androidx.core.view.marginStart +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import com.casic.br.app.R + +class ImageGridAdapter( + private val context: Context, private val images: List, + private val viewWidth: Int, private val spanCount: Int +) : BaseAdapter() { + + override fun getItemId(position: Int): Long = position.toLong() + + override fun getCount(): Int = images.size + + override fun getItem(position: Int): Any = images[position] + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val holder: ItemViewHolder + if (convertView == null) { + view = LayoutInflater.from(context).inflate(R.layout.item_readonly_gv, null) + holder = ItemViewHolder() + holder.imageView = view.findViewById(R.id.imageView) + view.tag = holder + } else { + view = convertView + holder = view.tag as ItemViewHolder + } + Glide.with(context) + .load(images[position]) + .apply(RequestOptions().error(R.mipmap.load_image_error)) + .into(holder.imageView) + + //动态设置图片高度，和图片宽度保持一致 + val margin = (view.marginStart + view.marginEnd) * spanCount + val imageSize = (viewWidth - margin) / spanCount + val params = LinearLayout.LayoutParams(imageSize, imageSize) + holder.imageView.layoutParams = params + return view + } + + private class ItemViewHolder { + lateinit var imageView: ImageView + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt new file mode 100644 index 0000000..10f8378 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.br.app.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.BaseAdapter +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.core.view.marginEnd +import androidx.core.view.marginStart +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import com.casic.br.app.R + +class ImageGridAdapter( + private val context: Context, private val images: List, + private val viewWidth: Int, private val spanCount: Int +) : BaseAdapter() { + + override fun getItemId(position: Int): Long = position.toLong() + + override fun getCount(): Int = images.size + + override fun getItem(position: Int): Any = images[position] + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val holder: ItemViewHolder + if (convertView == null) { + view = LayoutInflater.from(context).inflate(R.layout.item_readonly_gv, null) + holder = ItemViewHolder() + holder.imageView = view.findViewById(R.id.imageView) + view.tag = holder + } else { + view = convertView + holder = view.tag as ItemViewHolder + } + Glide.with(context) + .load(images[position]) + .apply(RequestOptions().error(R.mipmap.load_image_error)) + .into(holder.imageView) + + //动态设置图片高度，和图片宽度保持一致 + val margin = (view.marginStart + view.marginEnd) * spanCount + val imageSize = (viewWidth - margin) / spanCount + val params = LinearLayout.LayoutParams(imageSize, imageSize) + holder.imageView.layoutParams = params + return view + } + + private class ItemViewHolder { + lateinit var imageView: ImageView + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index 9b714d0..0b0dfbc 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -5,6 +5,7 @@ import android.widget.GridView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityCheckHistoryDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar @@ -14,11 +15,11 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -72,7 +73,8 @@ item.imageList.forEach { imageModel -> images.add(imageModel.alarmImage.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val viewWidth = getScreenWidth() - 75.dp2px(context) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) gridView.adapter = imageAdapter gridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt new file mode 100644 index 0000000..10f8378 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.br.app.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.BaseAdapter +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.core.view.marginEnd +import androidx.core.view.marginStart +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import com.casic.br.app.R + +class ImageGridAdapter( + private val context: Context, private val images: List, + private val viewWidth: Int, private val spanCount: Int +) : BaseAdapter() { + + override fun getItemId(position: Int): Long = position.toLong() + + override fun getCount(): Int = images.size + + override fun getItem(position: Int): Any = images[position] + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val holder: ItemViewHolder + if (convertView == null) { + view = LayoutInflater.from(context).inflate(R.layout.item_readonly_gv, null) + holder = ItemViewHolder() + holder.imageView = view.findViewById(R.id.imageView) + view.tag = holder + } else { + view = convertView + holder = view.tag as ItemViewHolder + } + Glide.with(context) + .load(images[position]) + .apply(RequestOptions().error(R.mipmap.load_image_error)) + .into(holder.imageView) + + //动态设置图片高度，和图片宽度保持一致 + val margin = (view.marginStart + view.marginEnd) * spanCount + val imageSize = (viewWidth - margin) / spanCount + val params = LinearLayout.LayoutParams(imageSize, imageSize) + holder.imageView.layoutParams = params + return view + } + + private class ItemViewHolder { + lateinit var imageView: ImageView + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index 9b714d0..0b0dfbc 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -5,6 +5,7 @@ import android.widget.GridView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityCheckHistoryDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar @@ -14,11 +15,11 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -72,7 +73,8 @@ item.imageList.forEach { imageModel -> images.add(imageModel.alarmImage.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val viewWidth = getScreenWidth() - 75.dp2px(context) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) gridView.adapter = imageAdapter gridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index 3953460..bb73873 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/backgroundColor" android:orientation="vertical"> , + private val viewWidth: Int, private val spanCount: Int +) : BaseAdapter() { + + override fun getItemId(position: Int): Long = position.toLong() + + override fun getCount(): Int = images.size + + override fun getItem(position: Int): Any = images[position] + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val holder: ItemViewHolder + if (convertView == null) { + view = LayoutInflater.from(context).inflate(R.layout.item_readonly_gv, null) + holder = ItemViewHolder() + holder.imageView = view.findViewById(R.id.imageView) + view.tag = holder + } else { + view = convertView + holder = view.tag as ItemViewHolder + } + Glide.with(context) + .load(images[position]) + .apply(RequestOptions().error(R.mipmap.load_image_error)) + .into(holder.imageView) + + //动态设置图片高度，和图片宽度保持一致 + val margin = (view.marginStart + view.marginEnd) * spanCount + val imageSize = (viewWidth - margin) / spanCount + val params = LinearLayout.LayoutParams(imageSize, imageSize) + holder.imageView.layoutParams = params + return view + } + + private class ItemViewHolder { + lateinit var imageView: ImageView + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index 9b714d0..0b0dfbc 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -5,6 +5,7 @@ import android.widget.GridView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityCheckHistoryDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar @@ -14,11 +15,11 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -72,7 +73,8 @@ item.imageList.forEach { imageModel -> images.add(imageModel.alarmImage.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val viewWidth = getScreenWidth() - 75.dp2px(context) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) gridView.adapter = imageAdapter gridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index 3953460..bb73873 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/backgroundColor" android:orientation="vertical"> @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查时间" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查地点" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="发现隐患" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="记录人员" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" android:text="隐患列表（" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -157,7 +157,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" android:text="）" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> diff --git a/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt new file mode 100644 index 0000000..10f8378 --- /dev/null +++ b/app/src/main/java/com/casic/br/app/adapter/ImageGridAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.br.app.adapter + +import android.content.Context +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.widget.BaseAdapter +import android.widget.ImageView +import android.widget.LinearLayout +import androidx.core.view.marginEnd +import androidx.core.view.marginStart +import com.bumptech.glide.Glide +import com.bumptech.glide.request.RequestOptions +import com.casic.br.app.R + +class ImageGridAdapter( + private val context: Context, private val images: List, + private val viewWidth: Int, private val spanCount: Int +) : BaseAdapter() { + + override fun getItemId(position: Int): Long = position.toLong() + + override fun getCount(): Int = images.size + + override fun getItem(position: Int): Any = images[position] + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val holder: ItemViewHolder + if (convertView == null) { + view = LayoutInflater.from(context).inflate(R.layout.item_readonly_gv, null) + holder = ItemViewHolder() + holder.imageView = view.findViewById(R.id.imageView) + view.tag = holder + } else { + view = convertView + holder = view.tag as ItemViewHolder + } + Glide.with(context) + .load(images[position]) + .apply(RequestOptions().error(R.mipmap.load_image_error)) + .into(holder.imageView) + + //动态设置图片高度，和图片宽度保持一致 + val margin = (view.marginStart + view.marginEnd) * spanCount + val imageSize = (viewWidth - margin) / spanCount + val params = LinearLayout.LayoutParams(imageSize, imageSize) + holder.imageView.layoutParams = params + return view + } + + private class ItemViewHolder { + lateinit var imageView: ImageView + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index 9b714d0..0b0dfbc 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -5,6 +5,7 @@ import android.widget.GridView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityCheckHistoryDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar @@ -14,11 +15,11 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -72,7 +73,8 @@ item.imageList.forEach { imageModel -> images.add(imageModel.alarmImage.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val viewWidth = getScreenWidth() - 75.dp2px(context) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) gridView.adapter = imageAdapter gridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index 3953460..bb73873 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/backgroundColor" android:orientation="vertical"> @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查时间" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查地点" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="发现隐患" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="记录人员" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" android:text="隐患列表（" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -157,7 +157,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" android:text="）" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/item_check_history_detail_l.xml b/app/src/main/res/layout/item_check_history_detail_l.xml index 2e8deeb..00b8057 100644 --- a/app/src/main/res/layout/item_check_history_detail_l.xml +++ b/app/src/main/res/layout/item_check_history_detail_l.xml @@ -2,7 +2,7 @@ @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患类别" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患名称" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患内容" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患图片" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> , + private val viewWidth: Int, private val spanCount: Int +) : BaseAdapter() { + + override fun getItemId(position: Int): Long = position.toLong() + + override fun getCount(): Int = images.size + + override fun getItem(position: Int): Any = images[position] + + override fun getView(position: Int, convertView: View?, parent: ViewGroup?): View { + val view: View + val holder: ItemViewHolder + if (convertView == null) { + view = LayoutInflater.from(context).inflate(R.layout.item_readonly_gv, null) + holder = ItemViewHolder() + holder.imageView = view.findViewById(R.id.imageView) + view.tag = holder + } else { + view = convertView + holder = view.tag as ItemViewHolder + } + Glide.with(context) + .load(images[position]) + .apply(RequestOptions().error(R.mipmap.load_image_error)) + .into(holder.imageView) + + //动态设置图片高度，和图片宽度保持一致 + val margin = (view.marginStart + view.marginEnd) * spanCount + val imageSize = (viewWidth - margin) / spanCount + val params = LinearLayout.LayoutParams(imageSize, imageSize) + holder.imageView.layoutParams = params + return view + } + + private class ItemViewHolder { + lateinit var imageView: ImageView + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt index 9b714d0..0b0dfbc 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckHistoryDetailActivity.kt @@ -5,6 +5,7 @@ import android.widget.GridView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityCheckHistoryDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar @@ -14,11 +15,11 @@ import com.google.gson.Gson import com.google.gson.reflect.TypeToken import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemOffsets import com.pengxh.kt.lite.extensions.dp2px +import com.pengxh.kt.lite.extensions.getScreenWidth import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.Constant @@ -72,7 +73,8 @@ item.imageList.forEach { imageModel -> images.add(imageModel.alarmImage.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val viewWidth = getScreenWidth() - 75.dp2px(context) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) gridView.adapter = imageAdapter gridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index 3953460..bb73873 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/themeColor" + android:background="@color/backgroundColor" android:orientation="vertical"> @@ -39,7 +39,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查时间" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -65,7 +65,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查地点" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="发现隐患" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -122,7 +122,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="记录人员" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -148,7 +148,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" android:text="隐患列表（" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -157,7 +157,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="0" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> @@ -166,7 +166,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_10" android:text="）" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_18" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/item_check_history_detail_l.xml b/app/src/main/res/layout/item_check_history_detail_l.xml index 2e8deeb..00b8057 100644 --- a/app/src/main/res/layout/item_check_history_detail_l.xml +++ b/app/src/main/res/layout/item_check_history_detail_l.xml @@ -2,7 +2,7 @@ @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患类别" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患名称" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -66,7 +66,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患内容" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -90,7 +90,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="隐患图片" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -17,7 +17,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查时间" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -43,7 +43,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="巡查地点" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="发现隐患" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> @@ -100,7 +100,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:text="记录人员" - android:textColor="@color/white" + android:textColor="@color/black" android:textSize="@dimen/sp_14" /> \ No newline at end of file