diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt index 2ddb65c..402fada 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt @@ -7,18 +7,14 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.FragmentHiddenTroubleBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache -import com.casic.br.ar.app.view.BigImageActivity import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show - class HiddenTroubleFragment : KotlinBaseFragment() { private lateinit var inspectionViewModel: InspectionViewModel @@ -49,22 +45,9 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) + viewHolder.setText(R.id.troubleNameView, item.name) .setOnClickListener(R.id.deleteTroubleView) { - //TODO 删除隐患 - } - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(requireContext()) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - requireContext().navigatePageTo(0, images) + "您没有删除隐患的权限".show(requireContext()) } } } @@ -75,8 +58,7 @@ } override fun initViewBinding( - inflater: LayoutInflater, - container: ViewGroup? + inflater: LayoutInflater, container: ViewGroup? ): FragmentHiddenTroubleBinding { return FragmentHiddenTroubleBinding.inflate(inflater, container, false) } diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt index 2ddb65c..402fada 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt @@ -7,18 +7,14 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.FragmentHiddenTroubleBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache -import com.casic.br.ar.app.view.BigImageActivity import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show - class HiddenTroubleFragment : KotlinBaseFragment() { private lateinit var inspectionViewModel: InspectionViewModel @@ -49,22 +45,9 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) + viewHolder.setText(R.id.troubleNameView, item.name) .setOnClickListener(R.id.deleteTroubleView) { - //TODO 删除隐患 - } - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(requireContext()) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - requireContext().navigatePageTo(0, images) + "您没有删除隐患的权限".show(requireContext()) } } } @@ -75,8 +58,7 @@ } override fun initViewBinding( - inflater: LayoutInflater, - container: ViewGroup? + inflater: LayoutInflater, container: ViewGroup? ): FragmentHiddenTroubleBinding { return FragmentHiddenTroubleBinding.inflate(inflater, container, false) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt index a525a0f..f9fa398 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt @@ -6,14 +6,12 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityCheckResultBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.LoadState @@ -21,7 +19,6 @@ class CheckResultActivity : KotlinBaseActivity() { private val kTag = "CheckResultActivity" - private val context = this private lateinit var inspectionViewModel: InspectionViewModel override fun initEvent() { @@ -49,20 +46,7 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(context) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - context.navigatePageTo(0, images) - } + viewHolder.setText(R.id.troubleNameView, item.name) } } binding.recyclerView.adapter = troublesAdapter diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt index 2ddb65c..402fada 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt @@ -7,18 +7,14 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.FragmentHiddenTroubleBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache -import com.casic.br.ar.app.view.BigImageActivity import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show - class HiddenTroubleFragment : KotlinBaseFragment() { private lateinit var inspectionViewModel: InspectionViewModel @@ -49,22 +45,9 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) + viewHolder.setText(R.id.troubleNameView, item.name) .setOnClickListener(R.id.deleteTroubleView) { - //TODO 删除隐患 - } - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(requireContext()) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - requireContext().navigatePageTo(0, images) + "您没有删除隐患的权限".show(requireContext()) } } } @@ -75,8 +58,7 @@ } override fun initViewBinding( - inflater: LayoutInflater, - container: ViewGroup? + inflater: LayoutInflater, container: ViewGroup? ): FragmentHiddenTroubleBinding { return FragmentHiddenTroubleBinding.inflate(inflater, container, false) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt index a525a0f..f9fa398 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt @@ -6,14 +6,12 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityCheckResultBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.LoadState @@ -21,7 +19,6 @@ class CheckResultActivity : KotlinBaseActivity() { private val kTag = "CheckResultActivity" - private val context = this private lateinit var inspectionViewModel: InspectionViewModel override fun initEvent() { @@ -49,20 +46,7 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(context) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - context.navigatePageTo(0, images) - } + viewHolder.setText(R.id.troubleNameView, item.name) } } binding.recyclerView.adapter = troublesAdapter diff --git a/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml b/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml index dab55e6..dce0db8 100644 --- a/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml +++ b/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml @@ -1,37 +1,15 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt index 2ddb65c..402fada 100644 --- a/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt +++ b/app/src/main/java/com/casic/br/ar/app/fragment/HiddenTroubleFragment.kt @@ -7,18 +7,14 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.FragmentHiddenTroubleBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache -import com.casic.br.ar.app.view.BigImageActivity import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show - class HiddenTroubleFragment : KotlinBaseFragment() { private lateinit var inspectionViewModel: InspectionViewModel @@ -49,22 +45,9 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) + viewHolder.setText(R.id.troubleNameView, item.name) .setOnClickListener(R.id.deleteTroubleView) { - //TODO 删除隐患 - } - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(requireContext()) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - requireContext().navigatePageTo(0, images) + "您没有删除隐患的权限".show(requireContext()) } } } @@ -75,8 +58,7 @@ } override fun initViewBinding( - inflater: LayoutInflater, - container: ViewGroup? + inflater: LayoutInflater, container: ViewGroup? ): FragmentHiddenTroubleBinding { return FragmentHiddenTroubleBinding.inflate(inflater, container, false) } diff --git a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt index a525a0f..f9fa398 100644 --- a/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt +++ b/app/src/main/java/com/casic/br/ar/app/view/CheckResultActivity.kt @@ -6,14 +6,12 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.ar.app.R import com.casic.br.ar.app.databinding.ActivityCheckResultBinding -import com.casic.br.ar.app.extensions.combineFilePath import com.casic.br.ar.app.model.HiddenTroubleListResultModel import com.casic.br.ar.app.utils.RuntimeCache import com.casic.br.ar.app.vm.InspectionViewModel import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseActivity -import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.extensions.timestampToCompleteDate import com.pengxh.kt.lite.utils.LoadState @@ -21,7 +19,6 @@ class CheckResultActivity : KotlinBaseActivity() { private val kTag = "CheckResultActivity" - private val context = this private lateinit var inspectionViewModel: InspectionViewModel override fun initEvent() { @@ -49,20 +46,7 @@ viewHolder: ViewHolder, position: Int, item: HiddenTroubleListResultModel.DataModel ) { - viewHolder.setText(R.id.troubleIndexView, "${position + 1}、") - .setText(R.id.troubleNameView, item.name) - .setOnClickListener(R.id.showImageView) { - if (item.imageList.isEmpty()) { - "此隐患暂无图片".show(context) - return@setOnClickListener - } - - val images = ArrayList() - item.imageList.forEach { imageModel -> - images.add(imageModel.alarmImage.combineFilePath()) - } - context.navigatePageTo(0, images) - } + viewHolder.setText(R.id.troubleNameView, item.name) } } binding.recyclerView.adapter = troublesAdapter diff --git a/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml b/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml index dab55e6..dce0db8 100644 --- a/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml +++ b/app/src/main/res/layout/item_hidden_trouble_by_id_l.xml @@ -1,37 +1,15 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_hidden_trouble_by_id_l_2.xml b/app/src/main/res/layout/item_hidden_trouble_by_id_l_2.xml index 13b3669..2024c40 100644 --- a/app/src/main/res/layout/item_hidden_trouble_by_id_l_2.xml +++ b/app/src/main/res/layout/item_hidden_trouble_by_id_l_2.xml @@ -1,53 +1,25 @@ - - - - - - - - - - - + android:paddingHorizontal="@dimen/dp_5" + android:singleLine="true" + android:text="移除" + android:textColor="@color/red" /> \ No newline at end of file