diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index d12fce1..7cc4935 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,11 +1,11 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel -import com.casic.xz.meterage.widgets.TimeLineDecoration import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -28,15 +28,25 @@ position: Int, item: LogDetailModel.DataModel ) { - if (position == 0) { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) - } else { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_top) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + } + else -> { + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + } } viewHolder.setText(R.id.operatorNameView, item.createUserName) @@ -45,7 +55,6 @@ .setText(R.id.remarkView, item.recordContent) } } - logRecyclerView.addItemDecoration(TimeLineDecoration(requireContext())) logRecyclerView.adapter = logAdapter } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index d12fce1..7cc4935 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,11 +1,11 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel -import com.casic.xz.meterage.widgets.TimeLineDecoration import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -28,15 +28,25 @@ position: Int, item: LogDetailModel.DataModel ) { - if (position == 0) { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) - } else { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_top) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + } + else -> { + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + } } viewHolder.setText(R.id.operatorNameView, item.createUserName) @@ -45,7 +55,6 @@ .setText(R.id.remarkView, item.recordContent) } } - logRecyclerView.addItemDecoration(TimeLineDecoration(requireContext())) logRecyclerView.adapter = logAdapter } } diff --git a/app/src/main/res/drawable/dot_bottom.xml b/app/src/main/res/drawable/dot_bottom.xml new file mode 100644 index 0000000..2b18622 --- /dev/null +++ b/app/src/main/res/drawable/dot_bottom.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index d12fce1..7cc4935 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,11 +1,11 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel -import com.casic.xz.meterage.widgets.TimeLineDecoration import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -28,15 +28,25 @@ position: Int, item: LogDetailModel.DataModel ) { - if (position == 0) { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) - } else { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_top) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + } + else -> { + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + } } viewHolder.setText(R.id.operatorNameView, item.createUserName) @@ -45,7 +55,6 @@ .setText(R.id.remarkView, item.recordContent) } } - logRecyclerView.addItemDecoration(TimeLineDecoration(requireContext())) logRecyclerView.adapter = logAdapter } } diff --git a/app/src/main/res/drawable/dot_bottom.xml b/app/src/main/res/drawable/dot_bottom.xml new file mode 100644 index 0000000..2b18622 --- /dev/null +++ b/app/src/main/res/drawable/dot_bottom.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dot_middle.xml b/app/src/main/res/drawable/dot_middle.xml new file mode 100644 index 0000000..26ecfb9 --- /dev/null +++ b/app/src/main/res/drawable/dot_middle.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index d12fce1..7cc4935 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,11 +1,11 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel -import com.casic.xz.meterage.widgets.TimeLineDecoration import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -28,15 +28,25 @@ position: Int, item: LogDetailModel.DataModel ) { - if (position == 0) { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) - } else { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_top) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + } + else -> { + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + } } viewHolder.setText(R.id.operatorNameView, item.createUserName) @@ -45,7 +55,6 @@ .setText(R.id.remarkView, item.recordContent) } } - logRecyclerView.addItemDecoration(TimeLineDecoration(requireContext())) logRecyclerView.adapter = logAdapter } } diff --git a/app/src/main/res/drawable/dot_bottom.xml b/app/src/main/res/drawable/dot_bottom.xml new file mode 100644 index 0000000..2b18622 --- /dev/null +++ b/app/src/main/res/drawable/dot_bottom.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dot_middle.xml b/app/src/main/res/drawable/dot_middle.xml new file mode 100644 index 0000000..26ecfb9 --- /dev/null +++ b/app/src/main/res/drawable/dot_middle.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dot_top.xml b/app/src/main/res/drawable/dot_top.xml new file mode 100644 index 0000000..abc1a8d --- /dev/null +++ b/app/src/main/res/drawable/dot_top.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index d12fce1..7cc4935 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -1,11 +1,11 @@ package com.casic.xz.meterage.fragment.entrust import android.graphics.Color +import android.view.View import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.model.LogDetailModel import com.casic.xz.meterage.vm.EntrustViewModel -import com.casic.xz.meterage.widgets.TimeLineDecoration import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment @@ -28,15 +28,25 @@ position: Int, item: LogDetailModel.DataModel ) { - if (position == 0) { - //最后一项 - viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) - viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) - .setTextColor(R.id.statusView, Color.BLACK) - .setTextColor(R.id.operateTimeView, Color.BLACK) - .setTextColor(R.id.remarkView, Color.BLACK) - } else { + when (position) { + 0 -> { + //最后一项 + viewHolder.setBackgroundColor(R.id.dotView, Color.BLACK) + viewHolder.setTextColor(R.id.operatorNameView, Color.BLACK) + .setTextColor(R.id.statusView, Color.BLACK) + .setTextColor(R.id.operateTimeView, Color.BLACK) + .setTextColor(R.id.remarkView, Color.BLACK) + viewHolder.setVisibility(R.id.topLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_top) + } + it.data.size - 1 -> { + viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + } + else -> { + viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + } } viewHolder.setText(R.id.operatorNameView, item.createUserName) @@ -45,7 +55,6 @@ .setText(R.id.remarkView, item.recordContent) } } - logRecyclerView.addItemDecoration(TimeLineDecoration(requireContext())) logRecyclerView.adapter = logAdapter } } diff --git a/app/src/main/res/drawable/dot_bottom.xml b/app/src/main/res/drawable/dot_bottom.xml new file mode 100644 index 0000000..2b18622 --- /dev/null +++ b/app/src/main/res/drawable/dot_bottom.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dot_middle.xml b/app/src/main/res/drawable/dot_middle.xml new file mode 100644 index 0000000..26ecfb9 --- /dev/null +++ b/app/src/main/res/drawable/dot_middle.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/dot_top.xml b/app/src/main/res/drawable/dot_top.xml new file mode 100644 index 0000000..abc1a8d --- /dev/null +++ b/app/src/main/res/drawable/dot_top.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_entrust_log_rv_l.xml b/app/src/main/res/layout/item_entrust_log_rv_l.xml index 5925c41..95106e9 100644 --- a/app/src/main/res/layout/item_entrust_log_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_log_rv_l.xml @@ -1,57 +1,91 @@ + android:layout_height="@dimen/dp_80" + android:gravity="center_vertical" + android:orientation="horizontal"> - - + android:layout_width="@dimen/dp_50" + android:layout_height="match_parent" + android:gravity="center_horizontal" + android:orientation="vertical"> + + + + + + + + + + + + + + + + + + - - - - - \ No newline at end of file +