diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") 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 f69b2c2..c10b460 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 @@ -6,7 +6,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity 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 @@ -31,18 +30,12 @@ val data = it.data!! customerNameView.text = data.customerName - - 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) + updateTimeView.text = "最后更新时间：${data.updateTime}" + directorView.text = "负责人：${data.director}" + evaluationView.text = "整体评价：${data.evaluationName}" fragmentPages.add(BasicInformationFragment(data)) - fragmentPages.add(PersonnelFragment()) + fragmentPages.add(PersonnelFragment(data.customerUserList)) fragmentPages.add(SampleRecordFragment()) fragmentPages.add(ContractRecordFragment()) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") 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 f69b2c2..c10b460 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 @@ -6,7 +6,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity 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 @@ -31,18 +30,12 @@ val data = it.data!! customerNameView.text = data.customerName - - 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) + updateTimeView.text = "最后更新时间：${data.updateTime}" + directorView.text = "负责人：${data.director}" + evaluationView.text = "整体评价：${data.evaluationName}" fragmentPages.add(BasicInformationFragment(data)) - fragmentPages.add(PersonnelFragment()) + fragmentPages.add(PersonnelFragment(data.customerUserList)) fragmentPages.add(SampleRecordFragment()) fragmentPages.add(ContractRecordFragment()) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 3e0a290..43f2894 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -25,6 +25,7 @@ fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) + //TODO 周检记录 检定证书 接口未定 val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") equipmentViewPager.adapter = SubViewPagerAdapter( diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") 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 f69b2c2..c10b460 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 @@ -6,7 +6,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity 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 @@ -31,18 +30,12 @@ val data = it.data!! customerNameView.text = data.customerName - - 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) + updateTimeView.text = "最后更新时间：${data.updateTime}" + directorView.text = "负责人：${data.director}" + evaluationView.text = "整体评价：${data.evaluationName}" fragmentPages.add(BasicInformationFragment(data)) - fragmentPages.add(PersonnelFragment()) + fragmentPages.add(PersonnelFragment(data.customerUserList)) fragmentPages.add(SampleRecordFragment()) fragmentPages.add(ContractRecordFragment()) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 3e0a290..43f2894 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -25,6 +25,7 @@ fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) + //TODO 周检记录 检定证书 接口未定 val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") equipmentViewPager.adapter = SubViewPagerAdapter( diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 3728533..f697017 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,7 +1,15 @@ - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") 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 f69b2c2..c10b460 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 @@ -6,7 +6,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity 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 @@ -31,18 +30,12 @@ val data = it.data!! customerNameView.text = data.customerName - - 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) + updateTimeView.text = "最后更新时间：${data.updateTime}" + directorView.text = "负责人：${data.director}" + evaluationView.text = "整体评价：${data.evaluationName}" fragmentPages.add(BasicInformationFragment(data)) - fragmentPages.add(PersonnelFragment()) + fragmentPages.add(PersonnelFragment(data.customerUserList)) fragmentPages.add(SampleRecordFragment()) fragmentPages.add(ContractRecordFragment()) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 3e0a290..43f2894 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -25,6 +25,7 @@ fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) + //TODO 周检记录 检定证书 接口未定 val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") equipmentViewPager.adapter = SubViewPagerAdapter( diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 3728533..f697017 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,7 +1,15 @@ - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_customer_personnel_rv_l.xml b/app/src/main/res/layout/item_customer_personnel_rv_l.xml new file mode 100644 index 0000000..9bcab5e --- /dev/null +++ b/app/src/main/res/layout/item_customer_personnel_rv_l.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") 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 f69b2c2..c10b460 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 @@ -6,7 +6,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity 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 @@ -31,18 +30,12 @@ val data = it.data!! customerNameView.text = data.customerName - - 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) + updateTimeView.text = "最后更新时间：${data.updateTime}" + directorView.text = "负责人：${data.director}" + evaluationView.text = "整体评价：${data.evaluationName}" fragmentPages.add(BasicInformationFragment(data)) - fragmentPages.add(PersonnelFragment()) + fragmentPages.add(PersonnelFragment(data.customerUserList)) fragmentPages.add(SampleRecordFragment()) fragmentPages.add(ContractRecordFragment()) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 3e0a290..43f2894 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -25,6 +25,7 @@ fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) + //TODO 周检记录 检定证书 接口未定 val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") equipmentViewPager.adapter = SubViewPagerAdapter( diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 3728533..f697017 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,7 +1,15 @@ - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_customer_personnel_rv_l.xml b/app/src/main/res/layout/item_customer_personnel_rv_l.xml new file mode 100644 index 0000000..9bcab5e --- /dev/null +++ b/app/src/main/res/layout/item_customer_personnel_rv_l.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_standard_device_rv_l.xml b/app/src/main/res/layout/item_standard_device_rv_l.xml index 21b1d86..140a4f0 100644 --- a/app/src/main/res/layout/item_standard_device_rv_l.xml +++ b/app/src/main/res/layout/item_standard_device_rv_l.xml @@ -31,7 +31,6 @@ android:id="@+id/transmitRangeView" style="@style/BorderTagStyle" android:layout_gravity="end|center_vertical" - android:layout_marginHorizontal="@dimen/dp_5" android:text="国家级" android:textColor="@color/themeColor" app:qmui_borderColor="@color/themeColor" /> @@ -40,6 +39,7 @@ android:id="@+id/measureMajorView" style="@style/BorderTagStyle" android:layout_gravity="end|center_vertical" + android:layout_marginHorizontal="@dimen/dp_5" android:text="电离辐射" android:textColor="@color/red" app:qmui_borderColor="@color/red" /> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt index 4af3f8d..c43f019 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/ViewPagerAdapter.kt @@ -4,11 +4,9 @@ import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter -class ViewPagerAdapter(list: ArrayList, manager: FragmentManager) : +class ViewPagerAdapter(private val pages: ArrayList, manager: FragmentManager) : FragmentPagerAdapter(manager) { - private var pages: List = list - override fun getItem(position: Int) = pages[position] override fun getCount() = pages.size 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 a771463..b1d5916 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 @@ -3,13 +3,13 @@ import android.app.Activity import android.content.Context import android.content.Intent -import android.graphics.Color import android.graphics.drawable.Drawable import android.net.Uri -import android.text.* +import android.text.Editable +import android.text.Html +import android.text.Spanned 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 @@ -231,16 +231,6 @@ } } -//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/fragment/customer/PersonnelFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt index a9e9f86..68e1b85 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/PersonnelFragment.kt @@ -1,12 +1,58 @@ package com.casic.xz.meterage.fragment.customer import com.casic.xz.meterage.R +import com.casic.xz.meterage.extensions.generateColor +import com.casic.xz.meterage.extensions.showEmptyPage +import com.casic.xz.meterage.model.CustomerDetailModel +import com.casic.xz.meterage.utils.DividerItemDecoration +import com.pengxh.kt.lite.adapter.NormalRecyclerAdapter +import com.pengxh.kt.lite.adapter.ViewHolder import com.pengxh.kt.lite.base.KotlinBaseFragment +import com.pengxh.kt.lite.extensions.dp2px +import kotlinx.android.synthetic.main.fragment_customer_personnel.* +import kotlinx.android.synthetic.main.include_empty_view.* -class PersonnelFragment : KotlinBaseFragment() { +class PersonnelFragment(private val customerUsers: List) : + KotlinBaseFragment() { override fun initData() { + if (customerUsers.isEmpty()) { + emptyView.showEmptyPage("无客户人员") + } else { + emptyView.hide() + val stateLogAdapter = + object : NormalRecyclerAdapter( + R.layout.item_customer_personnel_rv_l, customerUsers + ) { + override fun convertView( + viewHolder: ViewHolder, + position: Int, + item: CustomerDetailModel.DataModel.CustomerUserListModel + ) { + //设置随机颜色 + val color = requireContext().generateColor() + viewHolder.setBackgroundColor(R.id.nameTagView, color[0]) + viewHolder.setTextColor(R.id.nameTagView, color[1]) + val name = if (item.name.isNullOrBlank()) { + "无" + } else { + item.name + } + + viewHolder.setText(R.id.nameTagView, name.last().toString()) + .setText(R.id.userNameView, name) + .setText(R.id.userPhoneView, item.phone) + .setText( + R.id.userDeptView, "部门：${item.department}" + ).setText(R.id.userJobView, item.job) + } + } + customPersonRecyclerView.addItemDecoration( + DividerItemDecoration(70f.dp2px(requireContext()).toFloat(), 0f) + ) + customPersonRecyclerView.adapter = stateLogAdapter + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt index b2440b9..71e90a1 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/model/kt/CertificateDetailModel.kt @@ -62,7 +62,7 @@ @SerializedName("printApprovalStatus") val printApprovalStatus: String?, @SerializedName("printNum") - val printNum: Int?, + val printNum: String?, @SerializedName("printStatus") val printStatus: String?, @SerializedName("processId") @@ -195,9 +195,9 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isUrgent") - val isUrgent: Int?, + val isUrgent: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("orderCode") @@ -243,7 +243,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -329,7 +329,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isExistSample") val isExistSample: String?, @SerializedName("labelBind") @@ -448,15 +448,15 @@ @SerializedName("intactState") val intactState: String?, @SerializedName("isCalibrationTestEquipment") - val isCalibrationTestEquipment: Int?, + val isCalibrationTestEquipment: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("isFixedAssets") - val isFixedAssets: Int?, + val isFixedAssets: String?, @SerializedName("isMeasureAccount") - val isMeasureAccount: Int?, + val isMeasureAccount: String?, @SerializedName("isStandardSupportEquipment") - val isStandardSupportEquipment: Int?, + val isStandardSupportEquipment: String?, @SerializedName("labelBind") val labelBind: String?, @SerializedName("majorCategory") @@ -480,7 +480,7 @@ @SerializedName("manufacturingNo") val manufacturingNo: String?, @SerializedName("mesureCycle") - val mesureCycle: Int?, + val mesureCycle: String?, @SerializedName("mesureDate") val mesureDate: String?, @SerializedName("mesureDept") @@ -530,7 +530,7 @@ @SerializedName("validDate") val validDate: String?, @SerializedName("version") - val version: Int?, + val version: String?, @SerializedName("weight") val weight: String? ) @@ -565,7 +565,7 @@ @SerializedName("id") val id: String?, @SerializedName("isDel") - val isDel: Int?, + val isDel: String?, @SerializedName("minioFileName") val minioFileName: String?, @SerializedName("processId") 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 f69b2c2..c10b460 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 @@ -6,7 +6,6 @@ import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.base.ApplicationBaseActivity 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 @@ -31,18 +30,12 @@ val data = it.data!! customerNameView.text = data.customerName - - 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) + updateTimeView.text = "最后更新时间：${data.updateTime}" + directorView.text = "负责人：${data.director}" + evaluationView.text = "整体评价：${data.evaluationName}" fragmentPages.add(BasicInformationFragment(data)) - fragmentPages.add(PersonnelFragment()) + fragmentPages.add(PersonnelFragment(data.customerUserList)) fragmentPages.add(SampleRecordFragment()) fragmentPages.add(ContractRecordFragment()) fragmentPages.add(CertificateFragment()) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt index 3e0a290..43f2894 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentDetailActivity.kt @@ -25,6 +25,7 @@ fragmentPages.add(UsageRecordFragment(equipmentId)) fragmentPages.add(CertificateFragment()) + //TODO 周检记录 检定证书 接口未定 val equipmentPageTitles = arrayOf("基础信息", "周检记录", "状态变更记录", "使用记录", "检定证书") equipmentViewPager.adapter = SubViewPagerAdapter( diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 3728533..f697017 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,7 +1,15 @@ - - \ No newline at end of file + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_customer_personnel_rv_l.xml b/app/src/main/res/layout/item_customer_personnel_rv_l.xml new file mode 100644 index 0000000..9bcab5e --- /dev/null +++ b/app/src/main/res/layout/item_customer_personnel_rv_l.xml @@ -0,0 +1,84 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_standard_device_rv_l.xml b/app/src/main/res/layout/item_standard_device_rv_l.xml index 21b1d86..140a4f0 100644 --- a/app/src/main/res/layout/item_standard_device_rv_l.xml +++ b/app/src/main/res/layout/item_standard_device_rv_l.xml @@ -31,7 +31,6 @@ android:id="@+id/transmitRangeView" style="@style/BorderTagStyle" android:layout_gravity="end|center_vertical" - android:layout_marginHorizontal="@dimen/dp_5" android:text="国家级" android:textColor="@color/themeColor" app:qmui_borderColor="@color/themeColor" /> @@ -40,6 +39,7 @@ android:id="@+id/measureMajorView" style="@style/BorderTagStyle" android:layout_gravity="end|center_vertical" + android:layout_marginHorizontal="@dimen/dp_5" android:text="电离辐射" android:textColor="@color/red" app:qmui_borderColor="@color/red" /> diff --git a/app/src/main/res/layout/item_train_student_rv_l.xml b/app/src/main/res/layout/item_train_student_rv_l.xml index 13e16cd..915951d 100644 --- a/app/src/main/res/layout/item_train_student_rv_l.xml +++ b/app/src/main/res/layout/item_train_student_rv_l.xml @@ -32,6 +32,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/dp_5" android:gravity="center" + android:singleLine="true" android:text="张三" android:textColor="@color/black" android:textSize="@dimen/sp_16" />