diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 1e378e6..5cdd4f2 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentCompletedBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -153,9 +141,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.completedRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 1e378e6..5cdd4f2 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentCompletedBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -153,9 +141,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.completedRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 44586c8..3c4c892 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentNotStartBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -154,9 +142,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.notStartRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 1e378e6..5cdd4f2 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentCompletedBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -153,9 +141,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.completedRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 44586c8..3c4c892 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentNotStartBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -154,9 +142,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.notStartRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 319ffe2..de71d2e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentWorkingBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -137,15 +134,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -154,9 +142,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.workingRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt index 1e378e6..5cdd4f2 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/CompletedFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentCompletedBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -153,9 +141,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.completedRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.completedRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt index 44586c8..3c4c892 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/NotStartFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentNotStartBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -136,15 +133,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -154,9 +142,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.notStartRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.notStartRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt index 319ffe2..de71d2e 100644 --- a/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt +++ b/app/src/main/java/com/casic/br/operationsite/fragment/WorkingFragment.kt @@ -3,7 +3,6 @@ import android.content.BroadcastReceiver import android.content.Context import android.content.Intent -import android.graphics.Color import android.os.Bundle import android.os.Handler import android.os.Message @@ -12,7 +11,6 @@ import androidx.lifecycle.ViewModelProvider import com.casic.br.operationsite.R import com.casic.br.operationsite.databinding.FragmentWorkingBinding -import com.casic.br.operationsite.extensions.combineImagePath import com.casic.br.operationsite.model.BroadcastDataModel import com.casic.br.operationsite.model.WorkSiteListModel import com.casic.br.operationsite.utils.LocaleConstant @@ -24,7 +22,6 @@ 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.divider.RecyclerViewItemDivider import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.utils.BroadcastManager @@ -137,15 +134,6 @@ viewHolder: ViewHolder, position: Int, item: WorkSiteListModel.DataModel.RowsModel ) { - if (item.imageUrl.isNullOrBlank()) { - viewHolder.setImageResource( - R.id.workSiteImageView, R.mipmap.ic_launcher - ) - } else { - viewHolder.setImageResource( - R.id.workSiteImageView, item.imageUrl.combineImagePath() - ) - } viewHolder.setText(R.id.workTitleView, item.workTitle) .setText(R.id.workPersonView, "现场负责人:${item.workPersonName}") .setText( @@ -154,9 +142,6 @@ .setText(R.id.workSiteView, "现场描述:${item.workSiteDesc}") } } - binding.workingRecyclerView.addItemDecoration( - RecyclerViewItemDivider(1, Color.LTGRAY) - ) binding.workingRecyclerView.adapter = workingListAdapter workingListAdapter.setOnItemClickedListener(object : NormalRecyclerAdapter.OnItemClickedListener { diff --git a/app/src/main/res/layout/item_working_rv.xml b/app/src/main/res/layout/item_working_rv.xml index 58f8ab1..3c78580 100644 --- a/app/src/main/res/layout/item_working_rv.xml +++ b/app/src/main/res/layout/item_working_rv.xml @@ -1,24 +1,17 @@ - - - + app:cardCornerRadius="@dimen/dp_10"> - \ No newline at end of file + \ No newline at end of file