diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_standard.xml b/app/src/main/res/drawable/ic_library_standard.xml new file mode 100644 index 0000000..f4c6590 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_standard.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_standard.xml b/app/src/main/res/drawable/ic_library_standard.xml new file mode 100644 index 0000000..f4c6590 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_standard.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_trouble.xml b/app/src/main/res/drawable/ic_library_trouble.xml new file mode 100644 index 0000000..d2c629d --- /dev/null +++ b/app/src/main/res/drawable/ic_library_trouble.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_standard.xml b/app/src/main/res/drawable/ic_library_standard.xml new file mode 100644 index 0000000..f4c6590 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_standard.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_trouble.xml b/app/src/main/res/drawable/ic_library_trouble.xml new file mode 100644 index 0000000..d2c629d --- /dev/null +++ b/app/src/main/res/drawable/ic_library_trouble.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_library_video.xml b/app/src/main/res/drawable/ic_library_video.xml new file mode 100644 index 0000000..b7a0728 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_video.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_standard.xml b/app/src/main/res/drawable/ic_library_standard.xml new file mode 100644 index 0000000..f4c6590 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_standard.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_trouble.xml b/app/src/main/res/drawable/ic_library_trouble.xml new file mode 100644 index 0000000..d2c629d --- /dev/null +++ b/app/src/main/res/drawable/ic_library_trouble.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_library_video.xml b/app/src/main/res/drawable/ic_library_video.xml new file mode 100644 index 0000000..b7a0728 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_video.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_pdf.xml b/app/src/main/res/drawable/ic_pdf.xml new file mode 100644 index 0000000..a1a11db --- /dev/null +++ b/app/src/main/res/drawable/ic_pdf.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_standard.xml b/app/src/main/res/drawable/ic_library_standard.xml new file mode 100644 index 0000000..f4c6590 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_standard.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_trouble.xml b/app/src/main/res/drawable/ic_library_trouble.xml new file mode 100644 index 0000000..d2c629d --- /dev/null +++ b/app/src/main/res/drawable/ic_library_trouble.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_library_video.xml b/app/src/main/res/drawable/ic_library_video.xml new file mode 100644 index 0000000..b7a0728 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_video.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_pdf.xml b/app/src/main/res/drawable/ic_pdf.xml new file mode 100644 index 0000000..a1a11db --- /dev/null +++ b/app/src/main/res/drawable/ic_pdf.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index bb73873..b54c408 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -28,8 +28,7 @@ + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt index 1f3a4f0..afe4899 100644 --- a/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/CheckManifestActivity.kt @@ -165,8 +165,7 @@ viewHolder: ViewHolder, position: Int, item: CheckManifestModel.DataModel.RowsModel ) { - viewHolder.setText(R.id.indexView, "${position + 1}") - .setText(R.id.checkItemsView, item.checkItem) + viewHolder.setText(R.id.checkItemsView, item.checkItem) .setText(R.id.checkStandardView, item.checkStandard) .setText(R.id.checkMethodView, item.checkMethod) } diff --git a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt index d8aeb4f..0fcc91b 100644 --- a/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/HiddenTroubleDetailActivity.kt @@ -4,12 +4,14 @@ import android.widget.AdapterView import androidx.lifecycle.ViewModelProvider import com.casic.br.app.R +import com.casic.br.app.adapter.ImageGridAdapter import com.casic.br.app.databinding.ActivityHiddenTroubleDetailBinding import com.casic.br.app.extensions.combineFilePath import com.casic.br.app.extensions.initImmersionBar import com.casic.br.app.vm.HiddenTroubleViewModel -import com.pengxh.kt.lite.adapter.ReadOnlyImageAdapter import com.pengxh.kt.lite.base.KotlinBaseActivity +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 @@ -29,6 +31,8 @@ override fun initOnCreate(savedInstanceState: Bundle?) { val id = intent.getStringExtra(Constant.INTENT_PARAM) as String + val viewWidth = getScreenWidth() - 75.dp2px(context) + hiddenTroubleViewModel = ViewModelProvider(this)[HiddenTroubleViewModel::class.java] hiddenTroubleViewModel.getHiddenTroubleDetail(this, id) hiddenTroubleViewModel.troubleDetailResult.observe(this) { @@ -45,7 +49,7 @@ alarmImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.troubleImageGridView.adapter = imageAdapter binding.troubleImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> @@ -59,7 +63,7 @@ normalImageList.forEach { imageModel -> images.add(imageModel.imagePath.combineFilePath()) } - val imageAdapter = ReadOnlyImageAdapter(context, images) + val imageAdapter = ImageGridAdapter(context, images, viewWidth, 3) binding.normalImageGridView.adapter = imageAdapter binding.normalImageGridView.onItemClickListener = AdapterView.OnItemClickListener { _, _, index, _ -> diff --git a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt index 62396a4..4655e28 100644 --- a/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/LibraryActivity.kt @@ -31,17 +31,7 @@ private var sceneModels: MutableList = ArrayList() override fun initEvent() { - binding.standardButton.setOnClickListener { - navigatePageTo() - } - binding.troubleButton.setOnClickListener { - navigatePageTo() - } - - binding.manifestButton.setOnClickListener { - navigatePageTo(sceneModels.toJson()) - } } override fun initOnCreate(savedInstanceState: Bundle?) { @@ -49,24 +39,52 @@ libraryViewModel.getLibraryList(this) libraryViewModel.libraryListResult.observe(this) { if (it.code == 200) { + val result = it.data + + val dataModel1 = LibraryModel.DataModel() + dataModel1.name = "标准规范" + result.add(0, dataModel1) + + val dataModel2 = LibraryModel.DataModel() + dataModel2.name = "隐患目录" + result.add(1, dataModel2) + + val dataModel3 = LibraryModel.DataModel() + dataModel3.name = "检查清单" + result.add(2, dataModel3) + val libraryAdapter = object : NormalRecyclerAdapter( - R.layout.item_library_g, it.data + R.layout.item_library_g, result ) { override fun convertView( viewHolder: ViewHolder, position: Int, item: LibraryModel.DataModel ) { - viewHolder.setText(R.id.typeButton, item.name) + val imageSource = when (item.name) { + "标准规范" -> R.drawable.ic_library_standard + "隐患目录" -> R.drawable.ic_library_trouble + "检查清单" -> R.drawable.ic_library_manifest + "指导视频" -> R.drawable.ic_library_video + else -> 0 + } + + viewHolder.setImageResource(R.id.imageView, imageSource) + .setText(R.id.textView, item.name) } } binding.recyclerView.adapter = libraryAdapter binding.recyclerView.addItemDecoration( - RecyclerViewItemOffsets(marginOffset, marginOffset, marginOffset, marginOffset) + RecyclerViewItemOffsets( + marginOffset, marginOffset * 3, marginOffset, marginOffset * 3 + ) ) libraryAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked(position: Int, t: LibraryModel.DataModel) { when (position) { - 0 -> navigatePageTo(t.id) + 0 -> navigatePageTo() + 1 -> navigatePageTo() + 2 -> navigatePageTo(sceneModels.toJson()) + 3 -> navigatePageTo(t.id) else -> "未实现".show(context) } } diff --git a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt index f296917..f46356a 100644 --- a/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt +++ b/app/src/main/java/com/casic/br/app/view/StandardFileActivity.kt @@ -1,6 +1,5 @@ package com.casic.br.app.view -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -14,6 +13,7 @@ import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.divider.RecyclerViewItemDivider +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.LoadState @@ -103,7 +103,9 @@ } } binding.recyclerView.adapter = standardFileAdapter - binding.recyclerView.addItemDecoration(RecyclerViewItemDivider(1, Color.WHITE)) + binding.recyclerView.addItemDecoration( + RecyclerViewItemDivider(1, R.color.hintColor.convertColor(this)) + ) standardFileAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { override fun onItemClicked( diff --git a/app/src/main/res/drawable/bg_stroke_white_1.xml b/app/src/main/res/drawable/bg_stroke_white_1.xml index 3d2a469..566c64f 100644 --- a/app/src/main/res/drawable/bg_stroke_white_1.xml +++ b/app/src/main/res/drawable/bg_stroke_white_1.xml @@ -3,5 +3,5 @@ + android:color="@color/hintColor" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_manifest.xml b/app/src/main/res/drawable/ic_library_manifest.xml new file mode 100644 index 0000000..880fa3a --- /dev/null +++ b/app/src/main/res/drawable/ic_library_manifest.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_standard.xml b/app/src/main/res/drawable/ic_library_standard.xml new file mode 100644 index 0000000..f4c6590 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_standard.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_library_trouble.xml b/app/src/main/res/drawable/ic_library_trouble.xml new file mode 100644 index 0000000..d2c629d --- /dev/null +++ b/app/src/main/res/drawable/ic_library_trouble.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_library_video.xml b/app/src/main/res/drawable/ic_library_video.xml new file mode 100644 index 0000000..b7a0728 --- /dev/null +++ b/app/src/main/res/drawable/ic_library_video.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_pdf.xml b/app/src/main/res/drawable/ic_pdf.xml new file mode 100644 index 0000000..a1a11db --- /dev/null +++ b/app/src/main/res/drawable/ic_pdf.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/layout/activity_check_history.xml b/app/src/main/res/layout/activity_check_history.xml index bb73873..b54c408 100644 --- a/app/src/main/res/layout/activity_check_history.xml +++ b/app/src/main/res/layout/activity_check_history.xml @@ -28,8 +28,7 @@ + android:layout_height="wrap_content" /> + android:layout_height="wrap_content" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_check_manifest.xml b/app/src/main/res/layout/activity_check_manifest.xml index 7283c01..3e5faf0 100644 --- a/app/src/main/res/layout/activity_check_manifest.xml +++ b/app/src/main/res/layout/activity_check_manifest.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"> + android:textColorHint="@color/hintColor" />