diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt b/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt deleted file mode 100644 index 032a77c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.xz.meterage.widgets - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.Paint -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - - -class TimeLineDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - - private var leftDotPaint: Paint = Paint() - private var leftLinePaint: Paint = Paint() - - //item左边距 - private val marginLeft = 150 - - init { - leftDotPaint.isAntiAlias = true - leftDotPaint.isDither = true - leftDotPaint.style = Paint.Style.FILL - - leftLinePaint.color = Color.LTGRAY - leftLinePaint.style = Paint.Style.FILL - } - - //可以实现类似绘制背景的效果,内容在上面 - override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDraw(c, parent, state) - - //画左边圆点 - val childCount: Int = parent.childCount - for (i in 0 until childCount) { - val childView = parent.getChildAt(i) - - /** - * 确定每个item里面dot的圆心位置 - * - * childView.top与outRect.top相等 - * item内部边距childView.paddingTop - * */ - val cx = marginLeft / 2 - - val index = parent.getChildAdapterPosition(childView) - var radius: Float - if (index == 0) { - radius = 25f - leftDotPaint.color = Color.RED -// if (childView.operatorNameView.text.contains("接收")) { -// -// }else if(childView.operatorNameView.text.contains("退回")){ -// -// } - - //竖线 -// c.drawLine(cx.toFloat(), y1, cx.toFloat(), y2, leftLinePaint) - } else { - radius = 15f - leftDotPaint.color = Color.LTGRAY - } - - val cy = childView.top + childView.height / 2 - c.drawCircle(cx.toFloat(), cy.toFloat(), radius, leftDotPaint) - } - } - - //可以绘制在内容的上面,覆盖内容 - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDrawOver(c, parent, state) - } - - //可以实现类似padding的效果 - override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - outRect.left = marginLeft - outRect.top = 1 - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt b/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt deleted file mode 100644 index 032a77c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.xz.meterage.widgets - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.Paint -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - - -class TimeLineDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - - private var leftDotPaint: Paint = Paint() - private var leftLinePaint: Paint = Paint() - - //item左边距 - private val marginLeft = 150 - - init { - leftDotPaint.isAntiAlias = true - leftDotPaint.isDither = true - leftDotPaint.style = Paint.Style.FILL - - leftLinePaint.color = Color.LTGRAY - leftLinePaint.style = Paint.Style.FILL - } - - //可以实现类似绘制背景的效果,内容在上面 - override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDraw(c, parent, state) - - //画左边圆点 - val childCount: Int = parent.childCount - for (i in 0 until childCount) { - val childView = parent.getChildAt(i) - - /** - * 确定每个item里面dot的圆心位置 - * - * childView.top与outRect.top相等 - * item内部边距childView.paddingTop - * */ - val cx = marginLeft / 2 - - val index = parent.getChildAdapterPosition(childView) - var radius: Float - if (index == 0) { - radius = 25f - leftDotPaint.color = Color.RED -// if (childView.operatorNameView.text.contains("接收")) { -// -// }else if(childView.operatorNameView.text.contains("退回")){ -// -// } - - //竖线 -// c.drawLine(cx.toFloat(), y1, cx.toFloat(), y2, leftLinePaint) - } else { - radius = 15f - leftDotPaint.color = Color.LTGRAY - } - - val cy = childView.top + childView.height / 2 - c.drawCircle(cx.toFloat(), cy.toFloat(), radius, leftDotPaint) - } - } - - //可以绘制在内容的上面,覆盖内容 - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDrawOver(c, parent, state) - } - - //可以实现类似padding的效果 - override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - outRect.left = marginLeft - outRect.top = 1 - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml new file mode 100644 index 0000000..bf6e735 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt b/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt deleted file mode 100644 index 032a77c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.xz.meterage.widgets - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.Paint -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - - -class TimeLineDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - - private var leftDotPaint: Paint = Paint() - private var leftLinePaint: Paint = Paint() - - //item左边距 - private val marginLeft = 150 - - init { - leftDotPaint.isAntiAlias = true - leftDotPaint.isDither = true - leftDotPaint.style = Paint.Style.FILL - - leftLinePaint.color = Color.LTGRAY - leftLinePaint.style = Paint.Style.FILL - } - - //可以实现类似绘制背景的效果,内容在上面 - override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDraw(c, parent, state) - - //画左边圆点 - val childCount: Int = parent.childCount - for (i in 0 until childCount) { - val childView = parent.getChildAt(i) - - /** - * 确定每个item里面dot的圆心位置 - * - * childView.top与outRect.top相等 - * item内部边距childView.paddingTop - * */ - val cx = marginLeft / 2 - - val index = parent.getChildAdapterPosition(childView) - var radius: Float - if (index == 0) { - radius = 25f - leftDotPaint.color = Color.RED -// if (childView.operatorNameView.text.contains("接收")) { -// -// }else if(childView.operatorNameView.text.contains("退回")){ -// -// } - - //竖线 -// c.drawLine(cx.toFloat(), y1, cx.toFloat(), y2, leftLinePaint) - } else { - radius = 15f - leftDotPaint.color = Color.LTGRAY - } - - val cy = childView.top + childView.height / 2 - c.drawCircle(cx.toFloat(), cy.toFloat(), radius, leftDotPaint) - } - } - - //可以绘制在内容的上面,覆盖内容 - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDrawOver(c, parent, state) - } - - //可以实现类似padding的效果 - override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - outRect.left = marginLeft - outRect.top = 1 - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml new file mode 100644 index 0000000..bf6e735 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml index 32da390..6961394 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -9,54 +9,6 @@ - - - - - - - - - - - - -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt b/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt deleted file mode 100644 index 032a77c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.xz.meterage.widgets - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.Paint -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - - -class TimeLineDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - - private var leftDotPaint: Paint = Paint() - private var leftLinePaint: Paint = Paint() - - //item左边距 - private val marginLeft = 150 - - init { - leftDotPaint.isAntiAlias = true - leftDotPaint.isDither = true - leftDotPaint.style = Paint.Style.FILL - - leftLinePaint.color = Color.LTGRAY - leftLinePaint.style = Paint.Style.FILL - } - - //可以实现类似绘制背景的效果,内容在上面 - override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDraw(c, parent, state) - - //画左边圆点 - val childCount: Int = parent.childCount - for (i in 0 until childCount) { - val childView = parent.getChildAt(i) - - /** - * 确定每个item里面dot的圆心位置 - * - * childView.top与outRect.top相等 - * item内部边距childView.paddingTop - * */ - val cx = marginLeft / 2 - - val index = parent.getChildAdapterPosition(childView) - var radius: Float - if (index == 0) { - radius = 25f - leftDotPaint.color = Color.RED -// if (childView.operatorNameView.text.contains("接收")) { -// -// }else if(childView.operatorNameView.text.contains("退回")){ -// -// } - - //竖线 -// c.drawLine(cx.toFloat(), y1, cx.toFloat(), y2, leftLinePaint) - } else { - radius = 15f - leftDotPaint.color = Color.LTGRAY - } - - val cy = childView.top + childView.height / 2 - c.drawCircle(cx.toFloat(), cy.toFloat(), radius, leftDotPaint) - } - } - - //可以绘制在内容的上面,覆盖内容 - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDrawOver(c, parent, state) - } - - //可以实现类似padding的效果 - override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - outRect.left = marginLeft - outRect.top = 1 - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml new file mode 100644 index 0000000..bf6e735 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml index 32da390..6961394 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -9,54 +9,6 @@ - - - - - - - - - - - - + + diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt deleted file mode 100644 index 92b06dc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CapabilityAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.CapabilityListModel - -class CapabilityAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt b/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt deleted file mode 100644 index 032a77c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.xz.meterage.widgets - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.Paint -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - - -class TimeLineDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - - private var leftDotPaint: Paint = Paint() - private var leftLinePaint: Paint = Paint() - - //item左边距 - private val marginLeft = 150 - - init { - leftDotPaint.isAntiAlias = true - leftDotPaint.isDither = true - leftDotPaint.style = Paint.Style.FILL - - leftLinePaint.color = Color.LTGRAY - leftLinePaint.style = Paint.Style.FILL - } - - //可以实现类似绘制背景的效果,内容在上面 - override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDraw(c, parent, state) - - //画左边圆点 - val childCount: Int = parent.childCount - for (i in 0 until childCount) { - val childView = parent.getChildAt(i) - - /** - * 确定每个item里面dot的圆心位置 - * - * childView.top与outRect.top相等 - * item内部边距childView.paddingTop - * */ - val cx = marginLeft / 2 - - val index = parent.getChildAdapterPosition(childView) - var radius: Float - if (index == 0) { - radius = 25f - leftDotPaint.color = Color.RED -// if (childView.operatorNameView.text.contains("接收")) { -// -// }else if(childView.operatorNameView.text.contains("退回")){ -// -// } - - //竖线 -// c.drawLine(cx.toFloat(), y1, cx.toFloat(), y2, leftLinePaint) - } else { - radius = 15f - leftDotPaint.color = Color.LTGRAY - } - - val cy = childView.top + childView.height / 2 - c.drawCircle(cx.toFloat(), cy.toFloat(), radius, leftDotPaint) - } - } - - //可以绘制在内容的上面,覆盖内容 - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDrawOver(c, parent, state) - } - - //可以实现类似padding的效果 - override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - outRect.left = marginLeft - outRect.top = 1 - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml new file mode 100644 index 0000000..bf6e735 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml index 32da390..6961394 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -9,54 +9,6 @@ - - - - - - - - - - - - + + diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml index c3fc8c3..f59647f 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -9,54 +9,6 @@ - - - - - - - - - - - - -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_capability_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.capabilityNameView.text = rowsBean.priceName - holder.categoryView.text = rowsBean.categoryName - holder.projectView.text = rowsBean.priceItem - holder.priceView.text = rowsBean.price.toString() - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var capabilityNameView: TextView = view.findViewById(R.id.capabilityNameView) - var categoryView: TextView = view.findViewById(R.id.categoryView) - var projectView: TextView = view.findViewById(R.id.projectView) - var priceView: TextView = view.findViewById(R.id.priceView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt deleted file mode 100644 index 9f5e040..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/CustomerAdapter.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class CustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_customer_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt deleted file mode 100644 index d2e2533..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EntrustAdapter.kt +++ /dev/null @@ -1,91 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -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.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class EntrustAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_entrust_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.customerNameView.text = rowsBean.customerName - - holder.entrustStateView.text = rowsBean.statusName - //未接收:1;已接收:2;已取消:3;检测完成:4 - val color = when (rowsBean.status) { - "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.backgroundTintList = ColorStateList.valueOf(color) - - holder.delivererView.text = rowsBean.deliverer - holder.customerPhoneView.text = rowsBean.customerPhone - - holder.sampleCountView.text = rowsBean.sampleCount - 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.itemView.setOnClickListener { - listener?.onItemClicked(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: QMUIRoundButton = view.findViewById(R.id.entrustStateView) - var delivererView: TextView = view.findViewById(R.id.delivererView) - var customerPhoneView: TextView = view.findViewById(R.id.customerPhoneView) - var sampleCountView: TextView = view.findViewById(R.id.sampleCountView) - var urgentView: TextView = view.findViewById(R.id.urgentView) - var remarkView: TextView = view.findViewById(R.id.remarkView) - var entrustDateView: TextView = view.findViewById(R.id.entrustDateView) - var entrustCodeView: TextView = view.findViewById(R.id.entrustCodeView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt deleted file mode 100644 index 37dbfeb..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/EquipmentAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.EquipmentListModel - -class EquipmentAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_equipment_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.equipmentNameView.text = rowsBean.equipmentName - holder.equipmentCodeView.text = rowsBean.equipmentNo - holder.equipmentDateView.text = rowsBean.enableDate - holder.equipmentLibView.text = rowsBean.useDeptName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var equipmentNameView: TextView = view.findViewById(R.id.equipmentNameView) - var equipmentCodeView: TextView = view.findViewById(R.id.equipmentCodeView) - var equipmentDateView: TextView = view.findViewById(R.id.equipmentDateView) - var equipmentLibView: TextView = view.findViewById(R.id.equipmentLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt deleted file mode 100644 index 81898ab..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/HomeGridAdapter.kt +++ /dev/null @@ -1,49 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.utils.LocaleConstant - -/** - * 主页功能,九宫格Adapter - * */ -class HomeGridAdapter(context: Context, private val dataRows: Array) : - RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_home_rv_g, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - holder.functionImageView.setImageResource(LocaleConstant.HOME_FUNC_IMAGE[position]) - holder.homeFunctionView.text = dataRows[position] - holder.itemView.setOnClickListener { - clickListener?.onItemClick(position) - } - } - - override fun getItemCount(): Int = dataRows.size - - private var clickListener: OnGridItemClickListener? = null - - interface OnGridItemClickListener { - fun onItemClick(position: Int) - } - - fun setOnGridItemClickListener(clickListener: OnGridItemClickListener?) { - this.clickListener = clickListener - } - - class ItemViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { - val functionImageView: ImageView = itemView.findViewById(R.id.functionImageView) - val homeFunctionView: TextView = itemView.findViewById(R.id.homeFunctionView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt deleted file mode 100644 index f6d466f..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/MeterageTrainAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.content.res.ColorStateList -import android.graphics.Color -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import cn.bertsir.zbar.utils.QRUtils -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.isEarlier -import com.casic.xz.meterage.extensions.isLater -import com.casic.xz.meterage.model.MeterageTrainListModel -import com.pengxh.kt.lite.extensions.convertColor -import com.pengxh.kt.lite.extensions.dp2px -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton - -class MeterageTrainAdapter( - private val context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_meterage_train_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.trainTitleView.text = rowsBean.planName - //根据创建时间和计划培训时间判断培训状态 - when { - rowsBean.createTime.isEarlier(rowsBean.trainTime) -> { - holder.trainStateView.text = "未进行" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.BLUE) - } - rowsBean.trainTime.isLater() -> { - holder.trainStateView.text = "已结束" - holder.trainStateView.backgroundTintList = ColorStateList.valueOf(Color.GRAY) - } - else -> { - holder.trainStateView.text = "培训中" - holder.trainStateView.backgroundTintList = - ColorStateList.valueOf(R.color.green.convertColor(context)) - } - } - holder.trainDescView.text = rowsBean.trainContent - holder.trainHourView.text = "${rowsBean.trainHour}课时" - - val codeBitmap = QRUtils.getInstance().createQRCode( - rowsBean.planNo, 100f.dp2px(context), 100f.dp2px(context) - ) - holder.qrCodeView.setImageBitmap(codeBitmap) - holder.trainTimeView.text = rowsBean.trainTime - holder.speakerNameView.text = rowsBean.director - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var trainTitleView: TextView = view.findViewById(R.id.trainTitleView) - var trainStateView: QMUIRoundButton = view.findViewById(R.id.trainStateView) - var trainDescView: TextView = view.findViewById(R.id.trainDescView) - var trainHourView: QMUIRoundButton = view.findViewById(R.id.trainHourView) - var qrCodeView: ImageView = view.findViewById(R.id.qrCodeView) - var trainTimeView: TextView = view.findViewById(R.id.trainTimeView) - var speakerNameView: TextView = view.findViewById(R.id.speakerNameView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt deleted file mode 100644 index 8df69b2..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/NoticeAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.NoticeListModel - -class NoticeAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_notice_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] -// holder.noticeTypeIconView.setImageResource() - holder.noticeTitleView.text = rowsBean.noticeTitle - holder.noticeDateView.text = rowsBean.noticeTime - holder.noticeContentView.text = rowsBean.noticeSketch - val state = if (rowsBean.isDel == 0) { - View.VISIBLE - } else { - View.INVISIBLE - } - holder.readStateView.visibility = state - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var noticeTypeIconView: ImageView = view.findViewById(R.id.noticeTypeIconView) - var readStateView: View = view.findViewById(R.id.readStateView) - var noticeTitleView: TextView = view.findViewById(R.id.noticeTitleView) - var noticeDateView: TextView = view.findViewById(R.id.noticeDateView) - var noticeContentView: TextView = view.findViewById(R.id.noticeContentView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt deleted file mode 100644 index a4c0a43..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectCustomerAdapter.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.extensions.toChineseGrade -import com.casic.xz.meterage.model.CustomerListModel - -class SelectCustomerAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - - //选择的位置 - private var selectedPosition = 0 - - //临时记录上次选择的位置 - private var temp = -1 - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_customer_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.customerNameView.text = rowsBean.customerName - holder.scaleView.text = rowsBean.companySizeName - holder.overallView.text = "公司规模:${rowsBean.evaluationName}" - holder.fullAddressView.text = "公司地址:${rowsBean.fullAddress}" - - holder.itemView.isSelected = holder.layoutPosition == selectedPosition - holder.itemView.setOnClickListener { - itemCheckedListener?.onItemChecked(rowsBean) - - holder.itemView.isSelected = true - temp = selectedPosition - //设置新的位置 - selectedPosition = holder.layoutPosition - //更新旧位置 - notifyItemChanged(temp) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - var overallView: TextView = view.findViewById(R.id.overallView) - var fullAddressView: TextView = view.findViewById(R.id.fullAddressView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(item: CustomerListModel.DataModel.RowsModel) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt deleted file mode 100644 index cbe8e8a..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SelectSampleAdapter.kt +++ /dev/null @@ -1,68 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SampleListModel - -class SelectSampleAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater = LayoutInflater.from(context) - private var multipleSelected = mutableSetOf() - private var sampleModes = ArrayList() - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_select_sample_lv, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.sampleNameView.text = "${rowsBean.sampleName}【${rowsBean.sampleModel}】" - holder.manufacturingCodeView.text = "出厂编号:${rowsBean.manufacturingNo}" - holder.sampleCodeView.text = "样品编号:${rowsBean.sampleNo}" - holder.validDateView.text = "有效期至:${rowsBean.validDeadline}" - - holder.checkImageView.isSelected = multipleSelected.contains(position) - holder.itemView.setOnClickListener { - if (multipleSelected.contains(position)) { - multipleSelected.remove(position) - sampleModes.remove(dataRows[position]) - holder.checkImageView.isSelected = false - } else { - multipleSelected.add(position) - sampleModes.add(dataRows[position]) - holder.checkImageView.isSelected = true - } - - itemCheckedListener?.onItemChecked(sampleModes) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var sampleNameView: TextView = view.findViewById(R.id.sampleNameView) - var manufacturingCodeView: TextView = view.findViewById(R.id.manufacturingCodeView) - var sampleCodeView: TextView = view.findViewById(R.id.sampleCodeView) - var validDateView: TextView = view.findViewById(R.id.validDateView) - var checkImageView: ImageView = view.findViewById(R.id.checkImageView) - } - - private var itemCheckedListener: OnItemCheckedListener? = null - - interface OnItemCheckedListener { - fun onItemChecked(items: ArrayList) - } - - fun setOnCheckedListener(listener: OnItemCheckedListener?) { - itemCheckedListener = listener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt deleted file mode 100644 index 1d29b6e..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StaffAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StaffListModel - -class StaffAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_staff_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.name.last().toString() - holder.userNameView.text = - rowsBean.name + "【${rowsBean.deptName}】" + rowsBean.staffNo - holder.certificateView.text = "证书编号:${rowsBean.verifierCertificateNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.certificateDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var userNameView: TextView = view.findViewById(R.id.userNameView) - var certificateView: TextView = view.findViewById(R.id.certificateView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt deleted file mode 100644 index 20f8754..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/StandardDeviceAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.StandardDeviceListModel - -class StandardDeviceAdapter( - context: Context, private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_standard_device_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.deviceNameView.text = rowsBean.standardName - holder.deviceCodeView.text = rowsBean.standardNo - holder.deviceDateView.text = rowsBean.preparationDate - holder.deviceLibView.text = rowsBean.standardLaboratoryName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var deviceDateView: TextView = view.findViewById(R.id.deviceDateView) - var deviceLibView: TextView = view.findViewById(R.id.deviceLibView) - } - - private var listener: OnItemClickListener? = null - - interface OnItemClickListener { - fun onItemClicked(position: Int) - } - - fun setOnItemClickListener(onClickListener: OnItemClickListener?) { - this.listener = onClickListener - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt deleted file mode 100644 index d4aaffc..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/unuse/SupportEquipmentAdapter.kt +++ /dev/null @@ -1,41 +0,0 @@ -package com.casic.xz.meterage.adapter.unuse - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.TextView -import androidx.recyclerview.widget.RecyclerView -import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentListModel - -class SupportEquipmentAdapter( - context: Context, - private val dataRows: MutableList -) : RecyclerView.Adapter() { - - private var layoutInflater: LayoutInflater = LayoutInflater.from(context) - - override fun getItemCount(): Int = dataRows.size - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int) = ItemViewHolder( - layoutInflater.inflate(R.layout.item_device_support_rv_l, parent, false) - ) - - override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { - //绑定数据 - val rowsBean = dataRows[position] - holder.nameTagView.text = rowsBean.equipmentName.last().toString() - holder.deviceNameView.text = - rowsBean.equipmentName + "【${rowsBean.useDeptName}】" + rowsBean.modelNo - holder.deviceCodeView.text = "设备编号:${rowsBean.equipmentNo}" - holder.expirationDateView.text = "有效期至:${rowsBean.validDate}" - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var nameTagView: TextView = view.findViewById(R.id.nameTagView) - var deviceNameView: TextView = view.findViewById(R.id.deviceNameView) - var deviceCodeView: TextView = view.findViewById(R.id.deviceCodeView) - var expirationDateView: TextView = view.findViewById(R.id.expirationDateView) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt index 7cc4935..2ee9631 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/entrust/LogRecordFragment.kt @@ -42,15 +42,19 @@ } it.data.size - 1 -> { viewHolder.setVisibility(R.id.bottomLineView, View.INVISIBLE) - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_bottom) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_bottom + ) } else -> { - viewHolder.setImageResource(R.id.tagImageView, R.drawable.dot_middle) + viewHolder.setImageResource( + R.id.tagImageView, R.drawable.dot_middle + ) } } viewHolder.setText(R.id.operatorNameView, item.createUserName) -// .setText(R.id.statusView, item.) + .setText(R.id.statusView, item.dealType) .setText(R.id.operateTimeView, item.createTime) .setText(R.id.remarkView, item.recordContent) } diff --git a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java index ee308ad..f4faf99 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/CapabilityListModel.java @@ -32,16 +32,15 @@ this.message = message; } - //TODO orders字段后期需要调整 public static class DataModel { private String countId; private String current; private String maxLimit; - private boolean optimizeCountSql; + private String optimizeCountSql; private List orders; private String pages; private List records; - private boolean searchCount; + private String searchCount; private String size; private String total; @@ -69,11 +68,11 @@ this.maxLimit = maxLimit; } - public boolean isOptimizeCountSql() { + public String isOptimizeCountSql() { return optimizeCountSql; } - public void setOptimizeCountSql(boolean optimizeCountSql) { + public void setOptimizeCountSql(String optimizeCountSql) { this.optimizeCountSql = optimizeCountSql; } @@ -101,11 +100,11 @@ this.records = records; } - public boolean isSearchCount() { + public String isSearchCount() { return searchCount; } - public void setSearchCount(boolean searchCount) { + public void setSearchCount(String searchCount) { this.searchCount = searchCount; } @@ -143,6 +142,7 @@ private String priceName; private String priceNo; private String priceStandard; + private String priceStandardName; private String priceType; private String remark; private String updateTime; @@ -283,6 +283,14 @@ this.priceStandard = priceStandard; } + public String getPriceStandardName() { + return priceStandardName; + } + + public void setPriceStandardName(String priceStandardName) { + this.priceStandardName = priceStandardName; + } + public String getPriceType() { return priceType; } diff --git a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java index a1d6627..aacd70b 100644 --- a/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java +++ b/app/src/main/java/com/casic/xz/meterage/model/LogDetailModel.java @@ -36,6 +36,7 @@ private String createTime; private String createUser; private String createUserName; + private String dealType; private String id; private String orderId; private String recordContent; @@ -65,6 +66,14 @@ this.createUserName = createUserName; } + public String getDealType() { + return dealType; + } + + public void setDealType(String dealType) { + this.dealType = dealType; + } + public String getId() { return id; } diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt index aca77b4..2e11464 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityActivity.kt @@ -132,24 +132,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt index ac1caa8..e16a0bf 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCapabilityResultActivity.kt @@ -134,24 +134,20 @@ position: Int, item: CapabilityListModel.DataModel.RecordsModel ) { - viewHolder.setText(R.id.capabilityNameView, item.priceName) + viewHolder.setText(R.id.checkTypeView, item.checkType) .setText(R.id.categoryView, item.categoryName) - .setText(R.id.projectView, item.priceItem) - .setText(R.id.priceView, item.price.toString()) + .setText(R.id.priceStandardNameView, item.priceStandardName) + .setText(R.id.priceView, "¥ ${item.price}") + + viewHolder.setOnClickListener(R.id.showDetailButton) { + navigatePageTo(item.id) + } } } capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) capabilityRecyclerView.adapter = capabilityAdapter - capabilityAdapter.setOnItemClickedListener(object : - NormalRecyclerAdapter.OnItemClickedListener { - override fun onItemClicked( - position: Int, t: CapabilityListModel.DataModel.RecordsModel - ) { - navigatePageTo(t.id) - } - }) } } } diff --git a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt b/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt deleted file mode 100644 index 032a77c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/widgets/TimeLineDecoration.kt +++ /dev/null @@ -1,82 +0,0 @@ -package com.casic.xz.meterage.widgets - -import android.content.Context -import android.graphics.Canvas -import android.graphics.Color -import android.graphics.Paint -import android.graphics.Rect -import android.view.View -import androidx.recyclerview.widget.RecyclerView - - -class TimeLineDecoration(private val context: Context) : RecyclerView.ItemDecoration() { - - private var leftDotPaint: Paint = Paint() - private var leftLinePaint: Paint = Paint() - - //item左边距 - private val marginLeft = 150 - - init { - leftDotPaint.isAntiAlias = true - leftDotPaint.isDither = true - leftDotPaint.style = Paint.Style.FILL - - leftLinePaint.color = Color.LTGRAY - leftLinePaint.style = Paint.Style.FILL - } - - //可以实现类似绘制背景的效果,内容在上面 - override fun onDraw(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDraw(c, parent, state) - - //画左边圆点 - val childCount: Int = parent.childCount - for (i in 0 until childCount) { - val childView = parent.getChildAt(i) - - /** - * 确定每个item里面dot的圆心位置 - * - * childView.top与outRect.top相等 - * item内部边距childView.paddingTop - * */ - val cx = marginLeft / 2 - - val index = parent.getChildAdapterPosition(childView) - var radius: Float - if (index == 0) { - radius = 25f - leftDotPaint.color = Color.RED -// if (childView.operatorNameView.text.contains("接收")) { -// -// }else if(childView.operatorNameView.text.contains("退回")){ -// -// } - - //竖线 -// c.drawLine(cx.toFloat(), y1, cx.toFloat(), y2, leftLinePaint) - } else { - radius = 15f - leftDotPaint.color = Color.LTGRAY - } - - val cy = childView.top + childView.height / 2 - c.drawCircle(cx.toFloat(), cy.toFloat(), radius, leftDotPaint) - } - } - - //可以绘制在内容的上面,覆盖内容 - override fun onDrawOver(c: Canvas, parent: RecyclerView, state: RecyclerView.State) { - super.onDrawOver(c, parent, state) - } - - //可以实现类似padding的效果 - override fun getItemOffsets( - outRect: Rect, view: View, parent: RecyclerView, state: RecyclerView.State - ) { - super.getItemOffsets(outRect, view, parent, state) - outRect.left = marginLeft - outRect.top = 1 - } -} \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml new file mode 100644 index 0000000..bf6e735 --- /dev/null +++ b/app/src/main/res/drawable/bg_solid_layout_smoke_radius_15.xml @@ -0,0 +1,8 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_capability.xml b/app/src/main/res/layout/activity_capability.xml index 32da390..6961394 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -9,54 +9,6 @@ - - - - - - - - - - - - + + diff --git a/app/src/main/res/layout/activity_search_capability_reasult.xml b/app/src/main/res/layout/activity_search_capability_reasult.xml index c3fc8c3..f59647f 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -9,54 +9,6 @@ - - - - - - - - - - - - + android:layout_height="@dimen/dp_100" + android:background="@color/white" + android:orientation="vertical" + android:padding="@dimen/dp_7"> + + + + + + + + + - - - + - + + + + \ No newline at end of file