diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 44d3480..3dd26a8 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" - android:text="客户级别：重要潜在" + android:text="整体评价：重要潜在" android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 44d3480..3dd26a8 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" - android:text="客户级别：重要潜在" + android:text="整体评价：重要潜在" android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml index c0f5b9a..68d435c 100644 --- a/app/src/main/res/layout/activity_entrust.xml +++ b/app/src/main/res/layout/activity_entrust.xml @@ -50,15 +50,11 @@ android:src="@drawable/ic_search" /> - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 44d3480..3dd26a8 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" - android:text="客户级别：重要潜在" + android:text="整体评价：重要潜在" android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml index c0f5b9a..68d435c 100644 --- a/app/src/main/res/layout/activity_entrust.xml +++ b/app/src/main/res/layout/activity_entrust.xml @@ -50,15 +50,11 @@ android:src="@drawable/ic_search" /> - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml index 0a53bb2..f982028 100644 --- a/app/src/main/res/layout/activity_search_entrust_reasult.xml +++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml @@ -9,15 +9,11 @@ - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 44d3480..3dd26a8 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" - android:text="客户级别：重要潜在" + android:text="整体评价：重要潜在" android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml index c0f5b9a..68d435c 100644 --- a/app/src/main/res/layout/activity_entrust.xml +++ b/app/src/main/res/layout/activity_entrust.xml @@ -50,15 +50,11 @@ android:src="@drawable/ic_search" /> - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml index 0a53bb2..f982028 100644 --- a/app/src/main/res/layout/activity_search_entrust_reasult.xml +++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml @@ -9,15 +9,11 @@ - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/item_customer_rv_l.xml b/app/src/main/res/layout/item_customer_rv_l.xml index e6941be..b1c7ee0 100644 --- a/app/src/main/res/layout/item_customer_rv_l.xml +++ b/app/src/main/res/layout/item_customer_rv_l.xml @@ -50,7 +50,7 @@ android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_5" android:paddingHorizontal="@dimen/dp_5" - android:text="进行中" + android:text="小微企业" android:textColor="@color/white" android:textSize="@dimen/sp_12" app:qmui_backgroundColor="@color/themeColor" diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 44d3480..3dd26a8 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" - android:text="客户级别：重要潜在" + android:text="整体评价：重要潜在" android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml index c0f5b9a..68d435c 100644 --- a/app/src/main/res/layout/activity_entrust.xml +++ b/app/src/main/res/layout/activity_entrust.xml @@ -50,15 +50,11 @@ android:src="@drawable/ic_search" /> - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml index 0a53bb2..f982028 100644 --- a/app/src/main/res/layout/activity_search_entrust_reasult.xml +++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml @@ -9,15 +9,11 @@ - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/item_customer_rv_l.xml b/app/src/main/res/layout/item_customer_rv_l.xml index e6941be..b1c7ee0 100644 --- a/app/src/main/res/layout/item_customer_rv_l.xml +++ b/app/src/main/res/layout/item_customer_rv_l.xml @@ -50,7 +50,7 @@ android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_5" android:paddingHorizontal="@dimen/dp_5" - android:text="进行中" + android:text="小微企业" android:textColor="@color/white" android:textSize="@dimen/sp_12" app:qmui_backgroundColor="@color/themeColor" diff --git a/app/src/main/res/layout/item_entrust_rv_l.xml b/app/src/main/res/layout/item_entrust_rv_l.xml index 3166615..da01ed3 100644 --- a/app/src/main/res/layout/item_entrust_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_rv_l.xml @@ -1,16 +1,20 @@ + android:paddingVertical="@dimen/dp_10"> - + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingHorizontal="@dimen/dp_7"> + + @@ -35,16 +53,16 @@ android:id="@+id/rightView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:src="@drawable/ic_right" /> - + + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_14" /> @@ -191,15 +211,18 @@ android:id="@+id/entrustDateView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingHorizontal="@dimen/dp_7" android:text="委托日期：2023-02-21 12:30:21" - android:textColor="@color/gray" - android:textSize="@dimen/sp_12" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt index ed4de3e..88c4419 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EntrustAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R import com.casic.xz.meterage.model.EntrustListModel +import com.pengxh.kt.lite.extensions.convertColor import com.pengxh.kt.lite.extensions.show class EntrustAdapter( @@ -27,40 +28,50 @@ //绑定数据 val rowsBean = dataRows[position] holder.customerNameView.text = rowsBean.customerName - holder.entrustStateView.text = rowsBean.statusName - //未接收:0;已接收:1;已取消:2;检测完成:3 + holder.entrustStateView.text = rowsBean.statusName + //未接收:1;已接收:2;已取消:3;检测完成:4 val textColor = when (rowsBean.status) { - "0" -> R.color.red - "1" -> R.color.blue - "2" -> R.color.gray - else -> R.color.green + "1" -> R.color.red.convertColor(context) + "2" -> R.color.blue.convertColor(context) + "3" -> R.color.gray.convertColor(context) + else -> R.color.green.convertColor(context) } holder.entrustStateView.setTextColor(textColor) + holder.delivererView.text = rowsBean.deliverer holder.customerPhoneView.text = rowsBean.customerPhone + holder.sampleCountView.text = rowsBean.sampleCount - holder.urgentView.text = rowsBean.isUrgent - holder.remarkView.text = rowsBean.remark - holder.entrustDateView.text = rowsBean.orderTime - holder.entrustCodeView.text = rowsBean.orderCode + if (rowsBean.isUrgent == "0") { + holder.urgentView.text = "否" + holder.urgentView.setTextColor(R.color.gray.convertColor(context)) + } else { + holder.urgentView.text = "是" + holder.urgentView.setTextColor(R.color.red.convertColor(context)) + } + + holder.remarkView.text = if (rowsBean.remark.isNullOrBlank()) { + "客户没添加任何备注信息" + } else { + "【备注】${rowsBean.remark}" + } + holder.entrustDateView.text = "委托时间：${rowsBean.orderTime}" + holder.entrustCodeView.text = "委托编号：${rowsBean.orderCode}" //绑定事件 holder.entrustStateView.setOnClickListener { - if (rowsBean.status == "1" || rowsBean.status == "3") { + if (rowsBean.status == "2" || rowsBean.status == "4") { "当前状态不可编辑".show(context) } else { listener?.onStateViewClicked(position) } } - - holder.customerPhoneView.setOnClickListener { - listener?.onPhoneViewClicked(position) - } } inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var evaluationView: TextView = view.findViewById(R.id.evaluationView) var entrustStateView: TextView = view.findViewById(R.id.entrustStateView) var delivererView: TextView = view.findViewById(R.id.delivererView) var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) @@ -75,8 +86,6 @@ interface OnItemClickListener { fun onStateViewClicked(position: Int) - - fun onPhoneViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt index 8d2223b..28f70d8 100644 --- a/app/src/main/java/com/casic/xz/meterage/extensions/String.kt +++ b/app/src/main/java/com/casic/xz/meterage/extensions/String.kt @@ -2,12 +2,12 @@ import android.app.Activity import android.content.Context +import android.graphics.Color import android.graphics.drawable.Drawable -import android.text.Editable -import android.text.Html -import android.text.Spanned +import android.text.* import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan +import android.text.style.ForegroundColorSpan import android.text.style.ImageSpan import android.view.View import android.widget.TextView @@ -179,6 +179,16 @@ } } +//TextView分段颜色 +fun String.segmentedColorText(start: Int, end: Int): SpannableString { + val updateDateString = SpannableString(this) + val foregroundColorSpan = ForegroundColorSpan(Color.BLACK) + updateDateString.setSpan( + foregroundColorSpan, start, end, Spannable.SPAN_INCLUSIVE_INCLUSIVE + ) + return updateDateString +} + fun String.compressImage(context: Context, listener: OnImageCompressListener) { Luban.with(context) .load(this) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt index 4f39ed9..87d7ccf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerDetailActivity.kt @@ -5,6 +5,7 @@ import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar +import com.casic.xz.meterage.extensions.segmentedColorText import com.casic.xz.meterage.fragment.customer.* import com.casic.xz.meterage.utils.LoadingDialogHub import com.casic.xz.meterage.vm.CustomerViewModel @@ -30,9 +31,15 @@ val data = it.data!! customerNameView.text = data.customerName - updateTimeView.text = "最后更新时间：${data.updateTime}" - directorView.text = "负责人：${data.director}" - evaluationView.text = data.evaluationName + + val updateDate = "最后更新时间：${data.updateTime}" + updateTimeView.text = updateDate.segmentedColorText(7, updateDate.length) + + val director = "负责人：${data.director}" + directorView.text = director.segmentedColorText(4, director.length) + + val evaluation = "整体评价：${data.evaluationName}" + evaluationView.text = evaluation.segmentedColorText(4, evaluation.length) fragmentPages.add(BasicInformationFragment(data)) fragmentPages.add(PersonnelFragment()) @@ -70,6 +77,6 @@ override fun setupTopBarLayout() { ImmersionBar.with(this).statusBarDarkFont(true).init() initLayoutImmersionBar(rootView) - titleView.text = "客户列表" + titleView.text = "客户详情" } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt index 286992f..0b5aa9d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EntrustActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -135,9 +134,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -145,10 +141,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt index 8c0d597..763a6fb 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEntrustResultActivity.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.EntrustAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -132,9 +131,6 @@ } else { emptyView!!.hide() entrustAdapter = EntrustAdapter(this, dataBeans) - entrustRecyclerView.addItemDecoration( - DividerItemDecoration(this, DividerItemDecoration.VERTICAL) - ) entrustRecyclerView.adapter = entrustAdapter entrustAdapter.setOnItemClickListener(object : EntrustAdapter.OnItemClickListener { @@ -142,10 +138,6 @@ val rowsModel = dataBeans[position] // navigatePageTo(rowsModel.id) } - - override fun onPhoneViewClicked(position: Int) { - - } }) } } diff --git a/app/src/main/res/layout/activity_customer_detail.xml b/app/src/main/res/layout/activity_customer_detail.xml index 44d3480..3dd26a8 100644 --- a/app/src/main/res/layout/activity_customer_detail.xml +++ b/app/src/main/res/layout/activity_customer_detail.xml @@ -45,7 +45,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/dp_5" - android:text="客户级别：重要潜在" + android:text="整体评价：重要潜在" android:textColor="@color/gray" android:textSize="@dimen/sp_14" /> diff --git a/app/src/main/res/layout/activity_entrust.xml b/app/src/main/res/layout/activity_entrust.xml index c0f5b9a..68d435c 100644 --- a/app/src/main/res/layout/activity_entrust.xml +++ b/app/src/main/res/layout/activity_entrust.xml @@ -50,15 +50,11 @@ android:src="@drawable/ic_search" /> - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/activity_search_entrust_reasult.xml b/app/src/main/res/layout/activity_search_entrust_reasult.xml index 0a53bb2..f982028 100644 --- a/app/src/main/res/layout/activity_search_entrust_reasult.xml +++ b/app/src/main/res/layout/activity_search_entrust_reasult.xml @@ -9,15 +9,11 @@ - - + android:layout_weight="1" + android:background="@color/mainBackground"> diff --git a/app/src/main/res/layout/item_customer_rv_l.xml b/app/src/main/res/layout/item_customer_rv_l.xml index e6941be..b1c7ee0 100644 --- a/app/src/main/res/layout/item_customer_rv_l.xml +++ b/app/src/main/res/layout/item_customer_rv_l.xml @@ -50,7 +50,7 @@ android:layout_height="@dimen/dp_20" android:layout_marginStart="@dimen/dp_5" android:paddingHorizontal="@dimen/dp_5" - android:text="进行中" + android:text="小微企业" android:textColor="@color/white" android:textSize="@dimen/sp_12" app:qmui_backgroundColor="@color/themeColor" diff --git a/app/src/main/res/layout/item_entrust_rv_l.xml b/app/src/main/res/layout/item_entrust_rv_l.xml index 3166615..da01ed3 100644 --- a/app/src/main/res/layout/item_entrust_rv_l.xml +++ b/app/src/main/res/layout/item_entrust_rv_l.xml @@ -1,16 +1,20 @@ + android:paddingVertical="@dimen/dp_10"> - + android:layout_height="wrap_content" + android:gravity="center_vertical" + android:orientation="horizontal" + android:paddingHorizontal="@dimen/dp_7"> + + @@ -35,16 +53,16 @@ android:id="@+id/rightView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" android:src="@drawable/ic_right" /> - + + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_12" /> + android:textSize="@dimen/sp_14" /> @@ -191,15 +211,18 @@ android:id="@+id/entrustDateView" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingHorizontal="@dimen/dp_7" android:text="委托日期：2023-02-21 12:30:21" - android:textColor="@color/gray" - android:textSize="@dimen/sp_12" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> + android:textColor="@color/black" + android:textSize="@dimen/sp_14" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index fdf0bac..232daac 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -13,6 +13,7 @@ #008CFF #803d7eff #F0F0F0 + #F7F7F7 #CCCCCC #E4E4E4 \ No newline at end of file